Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

Update lib font.h support italic

Browse Source 
git-svn-id: svn://kolibrios.org@5757 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
pavelyakov 2015-08-21 11:03:08 +00:00
parent 07b6f857d7
commit dd4c9d80fd
1 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
programs/cmm/lib/font.h
View File

@ -13,13 +13,14 @@
{ {
word width,height; word width,height;
signed offset_x,offset_y; signed offset_x,offset_y;
float offset_i,w_italic;
byte text; byte text;
byte TMP_WEIGHT; byte TMP_WEIGHT;
}; };
:struct FONT :struct FONT
{ {
__SIZE size; __SIZE size;
byte width,height,offsetLine,r,g,b,weight; byte width,height,offsetLine,r,g,b,weight,italic;
dword color; dword color;
dword file_size; dword file_size;
dword buffer; dword buffer;
@ -32,16 +33,30 @@
byte symbol(word x;byte s;dword c); byte symbol(word x;byte s;dword c);
byte symbol_size(byte s); byte symbol_size(byte s);
dword text(word x,y;dword text1); dword text(word x,y;dword text1);
byte textcenter(word x,y,w,h;dword txt);
dword getsize(dword text1); dword getsize(dword text1);
dword textarea(word x,y;dword text,c); dword textarea(word x,y;dword text,c);
byte changeSIZE(); byte changeSIZE();
void PixelRGB(word x,y); void PixelRGB(word x,y);
dword GetPixel(word x,y);
dword tmp_y,tmp_height,tmp_x; dword tmp_y,tmp_height,tmp_x;
byte no_bg_copy; byte no_bg_copy;
dword bg_color; dword bg_color;
}; };
FONT font = 0; FONT font = 0;
:dword FONT::GetPixel(word x,y)
{
dword tmp;
tmp = y*size.width*3;
tmp += x*3;
tmp += buffer;
r = DSBYTE[tmp];
tmp++;
g = DSBYTE[tmp];
tmp++;
b = DSBYTE[tmp];
}
:void FONT::PixelRGB(dword x,y) :void FONT::PixelRGB(dword x,y)
{ {
dword tmp; dword tmp;
@ -80,7 +95,15 @@ FONT font = 0;
return true; return true;
} }
:proc_info Form_SELF_FONTS; :proc_info Form_SELF_FONTS;
:byte FONT::textcenter(word x,y,w,h;dword txt)
{
getsize(txt);
EDX = w/2;
ECX = size.width/2;
EDX -= ECX;
x += EDX;
return text(x,y,txt);
}
:dword FONT::getsize(dword text1) :dword FONT::getsize(dword text1)
{ {
size.height = size.width = 0; size.height = size.width = 0;
@ -97,6 +120,13 @@ FONT font = 0;
size.height += size.offset_y; size.height += size.offset_y;
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.offset_x+=size.w_italic;
size.width += math.ceil(size.w_italic+4);
}
return size.width; return size.width;
} }
:byte FONT::symbol_size(byte s) :byte FONT::symbol_size(byte s)
@ -197,7 +227,7 @@ FONT font = 0;
} }
} }
ELSE CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),size.width,size.height); ELSE 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]) WHILE(DSBYTE[text1])
{ {
IF(DSBYTE[text1]=='_') len--; IF(DSBYTE[text1]=='_') len--;
@ -218,11 +248,11 @@ FONT font = 0;
dword xi,yi; dword xi,yi;
dword tmp,_; dword tmp,_;
dword iii; dword iii;
float ital = -size.w_italic;
dword ___x; dword ___x;
word TMP; word TMP;
byte _TMP_WEIGHT; byte _TMP_WEIGHT;
byte rw=0; byte rw=0;
x += size.offset_x;
IF(s==32)return width/4; IF(s==32)return width/4;
IF(s==9)return width; IF(s==9)return width;
yi = 0; yi = 0;
@ -245,7 +275,8 @@ FONT font = 0;
{ {
IF(xi>rw)rw=xi; IF(xi>rw)rw=xi;
___x = x+xi; ___x = x+xi;
IF(___x<Form_SELF_FONTS.cwidth)&&(tmp_y+yi<Form_SELF_FONTS.cheight) IF(italic)___x+=math.ceil(ital);
if(___x<Form_SELF_FONTS.cwidth)&&(tmp_y+yi<Form_SELF_FONTS.cheight)
{ {
PixelRGB(___x,TMP); PixelRGB(___x,TMP);
_TMP_WEIGHT = size.TMP_WEIGHT; _TMP_WEIGHT = size.TMP_WEIGHT;
@ -260,6 +291,7 @@ FONT font = 0;
iii++; iii++;
} }
yi++; yi++;
IF(italic) ital-=size.offset_i;
} }
return rw; return rw;
} }
@ -268,15 +300,13 @@ FONT font = 0;
dword tmp; dword tmp;
buffer_size = 0; buffer_size = 0;
IF(data)free(data); IF(data)free(data);
if (!io.readKPACK(path)) if (!io.read(path))
{ {
debug("Error while loading font: "); debug("Error while loading font: ");
debugln(path); debugln(path);
return false; return false;
} }
data = io.buffer_data; begin = tmp = data = io.buffer_data;
tmp = data;
begin = data;
size_file = io.FILES_SIZE; size_file = io.FILES_SIZE;
tmp +=size_file; tmp +=size_file;
tmp--; tmp--;