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

 	byte TMP_WEIGHT;
 };
 :struct FONT
+{
 	__SIZE size;
-	byte r,g,b,weight,italic;
+	byte r,g,b,weight,italic, smooth;
 	byte width,height;
 	byte encoding;
 	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(word x,y;byte s;dword c);
 	byte symbol_size(byte s);
 	dword prepare(word x,y;dword text1);
 	void prepare_buf(word x,y,w,h;dword text1);
 	void show(word x,y);
 	byte textcenter(word x,y,w,h;dword txt);
 		symbol_size(DSBYTE[text1]);
 		text1++;
+	}
 	$neg size.offset_y
 	$neg size.offset_x
-	size.height++;
-	size.height += size.offset_y;
+	size.height += size.offset_y; size.height++;
-	size.width += size.offset_x;
+	size.width += size.offset_x; size.width++;
-	size.width++;
 	IF(italic)
+	{
 		size.w_italic = size.height/3;
 		size.offset_i = size.w_italic/size.height;
 		size.width += size.w_italic;
 			IF(s>=128)&&(s<=175)s+=64;
 			ELSE IF(s>=224)&&(s<=239)s+=16;
 			ELSE IF(s==241)s=184; //yo
 			ELSE IF(s==240)s=168; //YO
+		}
-        yi = 0;
         iii = 0;
         tmp = 4*block*s + data;
-        while(yi
+        for(yi=0; yi
+        {
-                xi = 0;
-                WHILE(xi
+            for(xi=0; xi
+            {
-                        IF(iii%32) _ >>= 1;
+                IF(iii%32) _ >>= 1;
-						ELSE
+				ELSE
+				{
-                                tmp += 4;
+                        tmp += 4;
-							IF(size.offset_y<0)size.offset_y = yi;
+					IF(size.offset_y<0)size.offset_y = yi;
-							ELSE IF(yi
+					ELSE IF(yi
-							IF(!X) X = xi;
+					IF(!X) X = xi;
-							ELSE IF(X>xi)X = xi;
+					ELSE IF(X>xi)X = xi;
+				}
-                        xi++;
-                        iii++;
+                iii++;
+            }
-                yi++;
+        }
 		size.width += rw;
 		IF(weight) size.width+=size.TMP_WEIGHT;
 		IF(s=='_') size.width--;
 		IF(size.offset_x<0)size.offset_x = X;
+	}
 	len = size.offset_x;
 	WHILE(DSBYTE[text1])
+	{
 		IF(DSBYTE[text1]=='_') len--;
-		len+=symbol(len,DSBYTE[text1]);
+		len+=symbol(len,0,DSBYTE[text1]);
 		IF(weight)len+=math.ceil(size.text/17);
 		text1++;
+	}
 	IF (no_bg_copy) && (!color) SmoothFont(buffer, size.width, size.height);
 	return len;
 			ShadowImage(i, 1, 1, 2);
 			ShadowImage(i+3+line_w, 1, 1, 2);
+		}
+	}
+}
-:byte FONT::symbol(signed x;byte s)
+:byte FONT::symbol(signed x,y;byte s)
+{
         dword xi,yi;
         dword tmp,_;
         dword iii;
 		float ital = -size.w_italic;
 			IF(s>=128)&&(s<=175)s+=64;
 			ELSE IF(s>=224)&&(s<=239)s+=16;
 			ELSE IF(s==241)s=184; //yo
 			ELSE IF(s==240)s=168; //YO
+		}
-        yi = 0;
         iii = 0;
-        tmp = 4*block*s;
+        tmp = 4*block*s + data;
-        tmp +=data;
-        while(yi
+        for(yi=0; yi
         {
-            xi = 0;
-			TMP = size.offset_y+yi;
+			TMP = size.offset_y+yi+y;
-            while(xi
+            for(xi=0; xi
+            {
 				IF(iii%32) _ >>= 1;
 				ELSE
+				{
 						tmp += 4;
+				{
 						IF(xi>rw)rw=xi;
 						___x = x+xi;
 						IF(italic)___x+=math.ceil(ital);
 						PixelRGB(___x,TMP);
-						_TMP_WEIGHT = size.TMP_WEIGHT;
+						for(_TMP_WEIGHT=size.TMP_WEIGHT; _TMP_WEIGHT; _TMP_WEIGHT--)
-						WHILE(_TMP_WEIGHT)
+						{
 							IF(weight) PixelRGB(___x+_TMP_WEIGHT,TMP);
-							_TMP_WEIGHT--;
+						}
+				}
-				xi++;
 				iii++;
+            }
-            yi++;
 			IF(italic) ital-=size.offset_i;
+        }
         return rw;
+}
 :byte FONT::load(dword path)
+{
 	buffer_size = 0;
 	IF(data)free(data);
 	if (!io.readKPACK(path)) { debug("Error while loading font: "); debugln(path); return false; }
 	begin = data = io.buffer_data;
-	size_file = io.FILES_SIZE;
+	EBX = begin + io.FILES_SIZE;
-	EBX = begin + size_file;
 	height = DSBYTE[EBX - 1];
 	width = DSBYTE[EBX - 2];
 	block = math.ceil(height*width/32);
 	return true;
+}
 :void FONT::prepare_buf(word x,y,w,h; dword text1)
-{
 	signed len=0;
 	dword c;
 	c = color;
 	IF(!text1)return;
 	IF(size.text)IF(!changeSIZE())return;
 	AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL;
 	getsize(text1);
 	y -= size.offset_y;
+	size.width = w;
-	size.width = w;
+	size.height = h;
-	size.height = h;
 	EDX = size.width*size.height*3;
-	IF(!buffer_size)
+	if(buffer_size!=EDX)
+	{
 		buffer_size = EDX;
-		buffer_size = EDX;
+		free(buffer);
 		buffer = malloc(buffer_size);
-		EBX = bg_color;
+		EBX = font.bg_color;
-		EDI = buffer;
+		EDI = font.buffer;
-		EAX = buffer_size+EDI;
+		EAX = font.buffer_size+font.buffer;
 		WHILE (EDI
+		{
 			ESDWORD[EDI] = EBX;
 			$add edi,3
+		}
+	}
 	WHILE(DSBYTE[text1])
+	{
-		x+=symbol(x,DSBYTE[text1]);
+		x+=symbol(x,y,DSBYTE[text1]);
 		IF(weight)x+=math.ceil(size.text/17);
 		text1++;
+	}
-	return;
 	return;
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/lib/font.h – Rev 5783 → 5784