WebSVN – Kolibri OS – Diff – /programs/cmm/lib/font.h

 #ifndef INCLUDE_IO_H
 #include "../lib/io.h"
+#endif
+:struct __SIZE
+{
+	word width,height;
+	signed offset_x,offset_y;
-#endif
+	byte text;
 };
+:struct FONT
-:struct FONT
+{
-{
+	__SIZE size;
-	byte width,height,offsetLine,r,g,b;
+	byte width,height,offsetLine,r,g,b,weight;
-	word width_buffer;
+	dword color;
 	dword file_size;
 	dword buffer;
 	dword buffer_size;
 	word block;
 	dword data;
 	dword begin;
 	dword size_file;
 	byte load(...);
 	byte symbol(word x;byte s;dword c);
 	byte symbol_size(byte s);
-	dword text(word x,y;dword text1,c;byte size);
+	dword text(word x,y;dword text1,c);
-	dword text_width(dword text1;byte size);
+	dword getsize(dword text1);
-	dword textarea(word x,y;dword text,c;byte size);
+	dword textarea(word x,y;dword text,c);
-	byte changeSIZE(byte size);
+	byte changeSIZE();
 	void PixelRGB(word x,y);
 	dword tmp_y,tmp_height,tmp_x;
 	byte no_bg_copy;
 	dword bg_color;
 };
 FONT font = 0;
 :void FONT::PixelRGB(dword x,y)
+{
 	dword tmp;
-	tmp = y*width_buffer*3;
+	tmp = y*size.width*3;
 	tmp += x*3;
 	tmp += buffer;
 	DSBYTE[tmp] = r;
 	tmp++;
 	DSBYTE[tmp] = g;
 	tmp++;
 	DSBYTE[tmp] = b;
+}
-:byte FONT::changeSIZE(byte size)
+:byte FONT::changeSIZE()
 {
 	dword TMP_DATA;
 	dword ofs;
 	byte s;
-	IF(size<9) size = 8;
+	IF(size.text<9) size.text = 8;
-	IF(size>45)size = 45;
+	IF(size.text>45)size.text = 45;
-		s = size-8;
+		s = size.text-8;
 		data = begin;
 		block = math.ceil(height*width/32);
 		return true;
+}
 :proc_info Form_SELF_FONTS;
-:dword FONT::text_width(dword text1;byte size)
+:dword FONT::getsize(dword text1)
 {
+	size.height = size.width = 0;
-	dword len=0;
+	size.offset_x = size.offset_y = -1;
-	IF(size)IF(!changeSIZE(size))return 0;
+	IF(size.text)IF(!changeSIZE())return 0;
 	WHILE(DSBYTE[text1])
 	{
-		len += symbol_size(DSBYTE[text1]);
+		symbol_size(DSBYTE[text1]);
 		text1++;
+	}
+	$neg size.offset_y
+	$neg size.offset_x
+	size.height++;
+	size.height += size.offset_y;
+	size.width += size.offset_x;
-	}
+	size.width++;
-	return len;
+	return size.width;
+}
 :byte FONT::symbol_size(byte s)
+{
         dword xi,yi;
         dword tmp,_;
         dword iii;
+        byte rw=0;
-        byte rw=0;
+		byte X;
+        IF(s==32)
+		{
+			size.width += width/4;
+			IF(weight) size.width++;
+			return;
+		}
+		IF(s==9)
-        IF(s==32)return width/4;
+		{
+			size.width += width;
+			IF(weight) size.width++;
+			return;
 		IF(s==9)return width;
         yi = 0;
         iii = 0;
         tmp = 4*block*s;
         tmp +=data;
-        WHILE(yi
+        while(yi
+        {
                 xi = 0;
                 WHILE(xi
+                {
                         IF(iii%32) _ >>= 1;
 						ELSE
+						{
                                 tmp += 4;
                                 _ = DSDWORD[tmp];
                         }
+                        IF(_&1)
+						{
+							IF(xi>rw)rw=xi;
+							IF(size.height
+							IF(size.offset_y<0)size.offset_y = yi;
+							ELSE IF(yi
+							IF(!X) X = xi;
+							ELSE IF(X>xi)X = xi;
                         IF(_&1) IF(xi>rw)rw=xi;
                         xi++;
                         iii++;
+                }
                 yi++;
         }
+		size.width += rw;
+		IF(weight) size.width++;
+		IF(s=='_') size.width--;
-        return rw;
+		IF(size.offset_x<0)size.offset_x = X;
 }
-:dword FONT::text(word x,y;dword text1,c;byte size)
+:dword FONT::text(word x,y;dword text1)
+{
+	signed len=0;
+	dword c;
+	word _tmp_h;
-	signed len=0;
+	c = color;
-	IF(size)IF(!changeSIZE(size))return 0;
+	IF(size.text)IF(!changeSIZE())return 0;
 	GetProcessInfo(#Form_SELF_FONTS, SelfInfo);
 	IF(y>Form_SELF_FONTS.cheight) return 0;
 	IF(x>Form_SELF_FONTS.cwidth) return 0;
 	tmp_y = y;
 	AX = c;
 	r = AL;
 	g = AH;
 	c>>=16;
 	AX = c;
-	b = AL;
-	width_buffer = text_width(text1,size);
+	b = AL;
-	//width_buffer *= strlen(text1);
+	getsize(text1);
 	IF(!buffer_size)
 	{
-		buffer_size = width_buffer*height*3;
+		buffer_size = size.width*size.height*3;
 		buffer = malloc(buffer_size);
 	}
 	ELSE IF(buffer_size
 	{
-		buffer_size = width_buffer*height*3;
+		buffer_size = size.width*size.height*3;
 		buffer = realloc(buffer,buffer_size);
+	}
 	IF (no_bg_copy)
+	{
+		{
 			ESDWORD[EDI] = EBX;
 			$add edi,3
+		}
+	}
-	ELSE CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),width_buffer,height);
+	ELSE CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),size.width,size.height);
-	//width_buffer = text_width(text1);
 	WHILE(DSBYTE[text1])
+	{
+		IF(DSBYTE[text1]=='_') len--;
-		symbol(len,DSBYTE[text1],c);
+		len+=symbol(len,DSBYTE[text1],c);
-		len+=EAX;
+		IF(weight)len++;
 		text1++;
+	}
-	_PutImage(x,y,width_buffer,height,buffer);
+	_PutImage(x,y-size.offset_y,size.width,size.height,buffer);
 	return len;
+}
 :dword FONT::textarea(word x,y;dword text1,c;byte size)
+{
         dword xi,yi;
         dword tmp,_;
         dword iii;
 		dword ___x;
         byte rw=0;
-		x -= 2;
+		x += size.offset_x;
         IF(s==32)return width/4;
 		IF(s==9)return width;
         yi = 0;
         iii = 0;
         tmp = 4*block*s;
         tmp +=data;
         while(yi
+        {
                 xi = 0;
-                WHILE(xi
+                while(xi
+                {
                         IF(iii%32) _ >>= 1;
 						ELSE
+						{
                                 tmp += 4;
+                        }
                         IF(_&1)
+                        {
                                 IF(xi>rw)rw=xi;
 								___x = x+xi;
 								IF(___x
+								{
+									PixelRGB(___x,size.offset_y+yi);
+									IF(weight) PixelRGB(___x+1,size.offset_y+yi);
+								}
+                        }
                         xi++;
                         iii++;
+                }
                 yi++;

Subversion Repositories Kolibri OS

(root)/programs/cmm/lib/font.h – Rev 5751 → 5753