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

 :struct FONT
+{
 	__SIZE size;
 	int left,top,width,height;
 	byte bold,italic,smooth;
-	byte no_bg_copy;
 	dword bg_color;
 	dword color;
 	dword file_size;
 	dword buffer;
 	dword buffer_size;
 	word block;
 	dword data;
 	dword begin;
 	byte load(...);
+	byte changeSIZE();
-	byte symbol(word x,y;byte s;dword c);
+	byte symbol(signed x,y;byte s;dword c);
 	byte symbol_size(byte s);
-	dword prepare(word x,y;dword text1);
-	void prepare_buf(dword x,y,w,h, text1);
-	void show();
-	byte textcenter(word x,y,w,h;dword txt);
 	dword getsize(dword text1);
-	byte changeSIZE();
+	void apply_smooth();
+	int write_center(dword x,y,w,h;dword txt);
-	void PixelRGB(dword x,y);
+	int write(int x,y;dword text1);
+	void write_buf(int x,y,w,h, text1);
+	void show_buf();
 };
 FONT font = 0;
-:void FONT::PixelRGB(dword x,y)
-{
-	dword offs = y*size.width+x*3 + buffer;
-	DSDWORD[offs] = DSDWORD[offs] & 0xFF000000 | color;
 :byte FONT::changeSIZE()
+{
 	dword TMP_DATA;
 	dword ofs;
 	height = DSBYTE[TMP_DATA - 1];
 	width =  DSBYTE[TMP_DATA - 2];
 	block = math.ceil(height*width/32);
 	return true;
+}
-:byte FONT::textcenter(word x,y,w,h;dword txt)
-{
-	getsize(txt);
-	EDX = w/2;
-	ECX = size.width/2;
-	EDX -= ECX;
-	x += EDX;
-	prepare(x,y,txt);
-}
 :dword FONT::getsize(dword text1)
+{
 	size.height = size.width = 0;
 	size.offset.x = size.offset.y = -1;
 	IF(size.text)IF(!changeSIZE())return 0;
+}
 :byte FONT::symbol_size(byte s)
+{
 		dword xi,yi;
 		dword tmp,_;
-		dword iii;
+		dword iii = 0;
 		byte rw=0;
 		byte X;
 		size.TMP_WEIGHT = math.ceil(size.text/17);
 		IF(s==32)
+		{
 			size.width += width;
 			IF(bold) size.width+=size.TMP_WEIGHT;
 			return;
+		}
 		s = AnsiToCp866(s);
-		iii = 0;
 		tmp = 4*block*s + data;
 		for(yi=0; yi
+		{
 			for(xi=0; xi
+			{
 		IF(size.offset.x<0)size.offset.x = X;
+}
 :byte FONT::symbol(signed x,y;byte s)
+{
 		dword xi,yi;
-		dword iii;
+		dword iii = 0;
+		dword offs;
 		float ital = -size.w_italic;
 		dword ___x;
 		byte rw=0;
 		IF(s==32)return width/4;
 		IF(s==9)return width;
 		s = AnsiToCp866(s);
-		iii = 0;
 		EBX = block*s << 2 + data;
 		for(yi=0; yi
+		{
-			EDI = size.offset.y + yi + y;
+			EDI = size.offset.y + yi + y * size.width * 3 + buffer;
 			for(xi=0; xi
+			{
 				IF(iii%32) $shr ecx,1
 				ELSE
+				{
 				IF(ECX&true)
+				{
 						IF(xi>rw)rw=xi;
 						___x = x+xi;
 						IF(italic)___x+=math.ceil(ital);
-						PixelRGB(___x,EDI);
+						offs = ___x*3 + EDI;
+						DSDWORD[offs] = DSDWORD[offs] & 0xFF000000 | color;
-						IF(bold) PixelRGB(___x+1,EDI);
+						IF(bold) DSDWORD[offs+3] = DSDWORD[offs+3] & 0xFF000000 | color;
+				}
 				iii++;
+			}
 			if (italic) ital-=size.offset_i;
+		}
 		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)
+:void FONT::apply_smooth()
 {
 	dword i,line_w,to;
-	line_w = w * 3;
+	line_w = font.size.width * 3;
+	to = font.size.height - 1 * line_w + font.buffer - 3;
-	to = w*h*3 + image - line_w - 3;
+	for(i=font.buffer; i < to; i+=3)
 	for(i = image; i < to; i+=3)	{
-		IF(i-image%line_w +3 == line_w) continue;
+		IF(i-font.buffer%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+3, 1, 1, 2);
+			ShadowPixel(i+3, 2);
-			ShadowImage(i+line_w, 1, 1, 2);
+			ShadowPixel(i+line_w, 2);
+		}
 		ELSE IF(b24(i)!=0x000000) && (b24(i+3)==0x000000) && (b24(i+line_w)==0x000000) && (b24(i+3+line_w)!=0x000000)
 		{
-			ShadowImage(i, 1, 1, 2);
+			ShadowPixel(i, 2);
-			ShadowImage(i+3+line_w, 1, 1, 2);
+			ShadowPixel(i+3+line_w, 2);
+		}
+	}
+}
 	width = DSBYTE[EBX-2];
 	block = math.ceil(height*width/32);
 	return true;
+}
+:int FONT::write_center(dword x,y,w,h;dword txt)
+{
+	getsize(txt);
+	return write(w-size.width/2+x,y,txt);
+}
-:dword FONT::prepare(int x,y;dword text1)
+:int FONT::write(int x,y; dword text1)
+{
-	signed len=0;
-	proc_info Form_SELF_FONTS;
-	dword c;
+	signed len=0;
 	IF(!text1)return false;
 	IF(size.text)IF(!changeSIZE())return false;
 	left = x;
 	getsize(text1);
 	ELSE IF(buffer_size
+	{
 		buffer_size = EDX;
 		buffer = realloc(buffer,buffer_size);
+	}
-	IF (no_bg_copy)
+	// Fill background color {
-	{
-		EBX = bg_color;
+	EBX = bg_color;
-		EAX = buffer_size+buffer;
+	EAX = buffer_size+buffer;
-		for (EDI=buffer; EDI
+	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);
+	IF (smooth) apply_smooth();
+	show_buf(left,top);
 	return len;
+}
-:void FONT::prepare_buf(int x,y,w,h; dword text1)
+:void FONT::write_buf(int x,y,w,h; dword text1)
 {
-	dword c, new_buffer_size;
+	dword new_buffer_size;
 	IF(!text1)return;
 	IF(size.text)IF(!changeSIZE())return;
 	getsize(text1);
 	IF(buffer_size != w*h*3)
+	{
 		buffer_size = new_buffer_size;
 		free(buffer);
 		buffer = malloc(buffer_size);
+		// Fill background color
 		EBX = bg_color;
 		EAX = buffer_size+buffer;
 		for (EDI=buffer; EDI
+	}
 	WHILE(DSBYTE[text1])
 		text1++;
+	}
 	return;
+}
+:void FONT::show_buf(dword left1, top1){
+	_PutImage(left1,top1,size.width,size.height,buffer);
+}
 #endif

Subversion Repositories Kolibri OS

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