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

 #ifndef INCLUDE_FS_H
 #include "../lib/obj/fs.h"
+#endif
-#endif
+#define DEFAULT_FONT "/sys/fonts/Tahoma.kf"
 :struct __OFFSET_FONT
+{
 	signed x,y;
 	byte TMP_WEIGHT;
 };
 :struct FONT
+{
 	__SIZE size;
-	byte r,g,b,weight,italic, smooth;
-	byte width,height;
+	int left,top,width,height;
-	byte use_smooth;
+	byte bold,italic,smooth;
-	int left,top;
+	byte no_bg_copy;
-	byte encoding;
+	dword bg_color;
 	dword color;
 	dword file_size;
 	dword buffer;
 	dword buffer_size;
 	word block;
 	void show();
 	byte textcenter(word x,y,w,h;dword txt);
 	dword getsize(dword text1);
 	byte changeSIZE();
 	void PixelRGB(dword x,y);
-	//dword GetPixel(word x,y);
-	byte no_bg_copy;
-	dword bg_color;
 };
 FONT font = 0;
-/*
-:dword FONT::GetPixel(word x,y)
-{
-	dword tmp = y*size.width*3;
-	tmp += x*3 + buffer;
-	r = DSBYTE[tmp]; tmp++;
-	g = DSBYTE[tmp]; tmp++;
-	b = DSBYTE[tmp];
-}*/
 :void FONT::PixelRGB(dword x,y)
+{
 	dword offs = y*size.width+x*3 + buffer;
-	DSBYTE[offs] = r; offs++;
-	DSBYTE[offs] = g; offs++;
+	DSDWORD[offs] = DSDWORD[offs] & 0xFF000000 | color;
-	DSBYTE[offs] = b;
+}
 :byte FONT::changeSIZE()
+{
 	dword TMP_DATA;
 	dword ofs;
 		byte X;
 		size.TMP_WEIGHT = math.ceil(size.text/17);
-        IF(s==32)
+		IF(s==32)
+		{
 			size.width += width/4;
-			IF(weight) size.width+=size.TMP_WEIGHT;
+			IF(bold) size.width+=size.TMP_WEIGHT;
 			return;
+		}
 		IF(s==9)
+		{
 			size.width += width;
-			IF(weight) size.width+=size.TMP_WEIGHT;
+			IF(bold) size.width+=size.TMP_WEIGHT;
 			return;
+		}
-		IF(!encoding){
+		s = AnsiToCp866(s);
-			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
-		}
-        iii = 0;
+		iii = 0;
-        tmp = 4*block*s + data;
+		tmp = 4*block*s + data;
-        for(yi=0; yi
+		for(yi=0; yi
+		{
-            for(xi=0; xi
+			for(xi=0; xi
+				}
-                iii++;
+				iii++;
+			}
+		}
 		size.width += rw;
-		IF(weight) size.width+=size.TMP_WEIGHT;
+		IF(bold) size.width+=size.TMP_WEIGHT;
 		IF(s=='_') size.width--;
 		IF(size.offset.x<0)size.offset.x = X;
+}
-:dword FONT::prepare(int x,y;dword text1)
+:byte FONT::symbol(signed x,y;byte s)
-{
-	signed len=0;
-	proc_info Form_SELF_FONTS;
-	dword c;
-	c = color;
-	left = x;
-	IF(!text1)return false;
-	IF(size.text)IF(!changeSIZE())return false;
-	AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL;
-	getsize(text1);
-	y -= size.offset.y;
-	top = y;
-	EDX = size.width*size.height*3;
-	IF(!buffer_size)
-	{
-		buffer_size = EDX;
-		buffer = malloc(buffer_size);
-	}
-	ELSE IF(buffer_size
+{
-		buffer_size = EDX;
+		dword xi,yi;
+		dword iii;
-		buffer = realloc(buffer,buffer_size);
+		float ital = -size.w_italic;
+		dword ___x;
-	}
+		byte rw=0;
+		IF(s==32)return width/4;
+		IF(s==9)return width;
-	IF (no_bg_copy)
+		s = AnsiToCp866(s);
+		iii = 0;
+		EBX = block*s << 2 + data;
+		for(yi=0; yi
+		{
-		EBX = bg_color;
-		EDI = buffer;
+			EDI = size.offset.y + yi + y;
-		EAX = buffer_size+EDI;
+			for(xi=0; xi
-		WHILE (EDI
+			{
-			ESDWORD[EDI] = EBX;
+				IF(iii%32) $shr ecx,1
-			$add edi,3
-		}
-	}
-	ELSE
+				ELSE
+				{
+						EBX += 4;
-		GetProcessInfo(#Form_SELF_FONTS, SelfInfo);
+						ECX = DSDWORD[EBX];
-		CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),size.width,size.height);
+				}
-	len = size.offset.x;
-	WHILE(DSBYTE[text1])
+				IF(ECX&true)
+				{
-		IF(DSBYTE[text1]=='_') len--;
+						IF(xi>rw)rw=xi;
-		len+=symbol(len,0,DSBYTE[text1]);
+						___x = x+xi;
-		IF(weight)len+=math.ceil(size.text/17);
+						IF(italic)___x+=math.ceil(ital);
-		text1++;
+						PixelRGB(___x,EDI);
+						IF(bold) PixelRGB(___x+1,EDI);
+				}
-	IF (use_smooth) SmoothFont(buffer, size.width, size.height);
-	return len;
+				iii++;
+			}
+			if (italic) ital-=size.offset_i;
+		}
-:void FONT::show()
+		return rw;
-{
+}
+:void FONT::show(){
 	_PutImage(left,top,size.width,size.height,buffer);
+}
+byte AnsiToCp866(byte s) {
+	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
+	return s;
+}
 inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
 :void SmoothFont(dword image, w, h)
+{
-	byte rr,gg,bb;
-	dword i,line_w,to, pixel;
+	dword i,line_w,to;
 	line_w = w * 3;
 	to = w*h*3 + image - line_w - 3;
 	for(i = image; i < to; i+=3)	{
 		IF(i-image%line_w +3 == line_w) continue;
 		IF(b24(i)==0x000000) && (b24(i+3)!=0x000000) && (b24(i+line_w)!=0x000000) && (b24(i+3+line_w)==0x000000)
 			ShadowImage(i, 1, 1, 2);
 			ShadowImage(i+3+line_w, 1, 1, 2);
+		}
+	}
+}
-:byte FONT::symbol(signed x,y;byte s)
-{
-        dword xi,yi;
-        dword iii;
-		float ital = -size.w_italic;
-		dword ___x;
-		//byte _TMP_WEIGHT;
-        byte rw=0;
-		//_TMP_WEIGHT=2;
-        IF(s==32)return width/4;
-		IF(s==9)return width;
-		IF(!encoding)
-		{
-			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
-		}
-        iii = 0;
-        EBX = block*s;
-		$shl ebx,2
-		$add ebx,data
-		yi = 0;
-        while(yi
-        {
-			EDI = size.offset.y;
-			$add edi,yi
-			$add edi,y
-            for(xi=0; xi
-            {
-				IF(iii%32) $shr ecx,1
-				ELSE
-				{
-						$add ebx,4
-						ECX = DSDWORD[EBX];
-				}
-				IF(ECX&true)
-				{
-						IF(xi>rw)rw=xi;
-						___x = x+xi;
-						IF(italic)___x+=math.ceil(ital);
-						PixelRGB(___x,EDI);
-						//_TMP_WEIGHT = 2;
-						//WHILE(_TMP_WEIGHT)
-						//{
-						//	_TMP_WEIGHT--;
-							IF(weight) PixelRGB(___x+1,EDI);
-						//}
-				}
-				iii++;
-            }
-			IF(italic) ital-=size.offset_i;
-			$inc yi
-        }
-        return rw;
-}
 :byte FONT::load(dword path)
+{
 	lib_init_fs();
 	buffer_size = 0;
-	use_smooth = true;
+	smooth = true;
 	IF(data)free(data);
 	IF(!fs.read(path)) { debug("Error while loading font: "); debugln(path); return false; }
 	begin = data = EAX;
 	EBX = begin + ECX;
-	$dec ebx
-	height = DSBYTE[EBX];
+	height = DSBYTE[EBX-1];
-	$dec ebx
-	width = DSBYTE[EBX];
+	width = DSBYTE[EBX-2];
 	block = math.ceil(height*width/32);
 	return true;
+}
+:dword FONT::prepare(int x,y;dword text1)
+{
+	signed len=0;
+	proc_info Form_SELF_FONTS;
+	dword c;
+	IF(!text1)return false;
+	IF(size.text)IF(!changeSIZE())return false;
+	left = x;
+	getsize(text1);
+	y -= size.offset.y;
+	top = y;
+	EDX = size.width*size.height*3;
+	IF(!buffer_size)
+	{
+		buffer_size = EDX;
+		buffer = malloc(buffer_size);
+	}
+	ELSE IF(buffer_size
+	{
+		buffer_size = EDX;
+		buffer = realloc(buffer,buffer_size);
+	}
+	IF (no_bg_copy)
+	{
+		EBX = bg_color;
+		EAX = buffer_size+buffer;
+		for (EDI=buffer; EDI
+	}
+	ELSE
+	{
+		GetProcessInfo(#Form_SELF_FONTS, SelfInfo);
+		CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),size.width,size.height);
+	}
+	len = size.offset.x;
+	WHILE(DSBYTE[text1])
+	{
+		IF(DSBYTE[text1]=='_') len--;
+		len+=symbol(len,0,DSBYTE[text1]);
+		IF(bold)len+=math.ceil(size.text/17);
+		text1++;
+	}
+	IF (smooth) SmoothFont(buffer, size.width, size.height);
+	return len;
+}
 :void FONT::prepare_buf(int x,y,w,h; dword text1)
+{
-	dword c, new_buffer_size;
-	c = color;
-	//left = x;
+	dword c, new_buffer_size;
 	IF(!text1)return;
-	IF(size.text)IF(!changeSIZE())return;
-	AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL;
+	IF(size.text)IF(!changeSIZE())return;
 	getsize(text1);
 	y -= size.offset.y;
 	//top = y;
 	size.width = w;
 	size.height = h;
 	new_buffer_size = w*h*3;
-	IF(buffer_size!=new_buffer_size)
+	IF(buffer_size != w*h*3)
+	{
 		buffer_size = new_buffer_size;
 		free(buffer);
-		buffer = malloc(buffer_size);
-		EBX = bg_color;
+		buffer = malloc(buffer_size);
-		EDI = buffer;
-		EAX = buffer_size+buffer;
-		WHILE (EDI
+		EBX = bg_color;
-		{
-			ESDWORD[EDI] = EBX;
-			$add edi,3
+		EAX = buffer_size+buffer;
 		for (EDI=buffer; EDI
+	}
 	WHILE(DSBYTE[text1])
 	{
 		x+=symbol(x,y,DSBYTE[text1]);
-		IF(weight)x+=math.ceil(size.text/17);
+		IF(bold)x+=math.ceil(size.text/17);
 		text1++;
+	}

Subversion Repositories Kolibri OS

(root)/programs/cmm/lib/font.h – Rev 5933 → 5981