Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

font.h:(fixed offset y, read file KPACK format or original)

Browse Source 
io.h:(io.read function update ver. KPACK format.)

git-svn-id: svn://kolibrios.org@5800 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
pavelyakov 2015-09-05 09:16:38 +00:00
parent ac7c51f03e
commit 2f9a6991c4
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,10 +9,14 @@
#include "../lib/io.h" #include "../lib/io.h"
#endif #endif
:struct __OFFSET_FONT
{
signed x,y;
};
:struct __SIZE :struct __SIZE
{ {
word width,height; word width,height;
signed offset_x,offset_y; __OFFSET_FONT offset;
float offset_i,w_italic; float offset_i,w_italic;
byte text; byte text;
byte TMP_WEIGHT; byte TMP_WEIGHT;
@ -93,17 +97,17 @@ FONT font = 0;
:dword FONT::getsize(dword text1) :dword FONT::getsize(dword text1)
{ {
size.height = size.width = 0; size.height = size.width = 0;
size.offset_x = size.offset_y = -1; size.offset.x = size.offset.y = -1;
IF(size.text)IF(!changeSIZE())return 0; IF(size.text)IF(!changeSIZE())return 0;
WHILE(DSBYTE[text1]) WHILE(DSBYTE[text1])
{ {
symbol_size(DSBYTE[text1]); symbol_size(DSBYTE[text1]);
text1++; text1++;
} }
$neg size.offset_y $neg size.offset.y
$neg size.offset_x $neg size.offset.x
size.height += size.offset_y; size.height++; size.height += size.offset.y; size.height++;
size.width += size.offset_x; size.width++; size.width += size.offset.x; size.width++;
IF(italic) IF(italic)
{ {
size.w_italic = size.height/3; size.w_italic = size.height/3;
@ -155,8 +159,8 @@ FONT font = 0;
{ {
IF(xi>rw)rw=xi; IF(xi>rw)rw=xi;
IF(size.height<yi)size.height = yi; IF(size.height<yi)size.height = yi;
IF(size.offset_y<0)size.offset_y = yi; IF(size.offset.y<0)size.offset.y = yi;
ELSE IF(yi<size.offset_y)size.offset_y = yi; ELSE IF(yi<size.offset.y)size.offset.y = yi;
IF(!X) X = xi; IF(!X) X = xi;
ELSE IF(X>xi)X = xi; ELSE IF(X>xi)X = xi;
} }
@ -166,7 +170,7 @@ FONT font = 0;
size.width += rw; size.width += rw;
IF(weight) size.width+=size.TMP_WEIGHT; IF(weight) size.width+=size.TMP_WEIGHT;
IF(s=='_') size.width--; IF(s=='_') size.width--;
IF(size.offset_x<0)size.offset_x = X; IF(size.offset.x<0)size.offset.x = X;
} }
:dword FONT::prepare(word x,y;dword text1) :dword FONT::prepare(word x,y;dword text1)
{ {
@ -178,7 +182,7 @@ FONT font = 0;
IF(size.text)IF(!changeSIZE())return false; IF(size.text)IF(!changeSIZE())return false;
AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL; AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL;
getsize(text1); getsize(text1);
y -= size.offset_y; y -= size.offset.y;
EDX = size.width*size.height*3; EDX = size.width*size.height*3;
IF(!buffer_size) IF(!buffer_size)
@ -205,9 +209,10 @@ FONT font = 0;
ELSE ELSE
{ {
GetProcessInfo(#Form_SELF_FONTS, SelfInfo); GetProcessInfo(#Form_SELF_FONTS, SelfInfo);
y-=size.offset.y;
CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),size.width,size.height); CopyScreen(buffer,x+Form_SELF_FONTS.left+5,y+Form_SELF_FONTS.top+GetSkinHeight(),size.width,size.height);
} }
len = size.offset_x; len = size.offset.x;
WHILE(DSBYTE[text1]) WHILE(DSBYTE[text1])
{ {
IF(DSBYTE[text1]=='_') len--; IF(DSBYTE[text1]=='_') len--;
@ -220,6 +225,7 @@ FONT font = 0;
} }
:void FONT::show(word x,y) :void FONT::show(word x,y)
{ {
y-=size.offset.y;
_PutImage(x,y,size.width,size.height,buffer); _PutImage(x,y,size.width,size.height,buffer);
} }
inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; } inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
@ -266,7 +272,7 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
tmp = 4*block*s + data; tmp = 4*block*s + data;
for(yi=0; yi<height; yi++) for(yi=0; yi<height; yi++)
{ {
TMP = size.offset_y+yi+y; TMP = size.offset.y+yi+y;
for(xi=0; xi<width; xi++) for(xi=0; xi<width; xi++)
{ {
IF(iii%32) _ >>= 1; IF(iii%32) _ >>= 1;
@ -296,7 +302,7 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
{ {
buffer_size = 0; buffer_size = 0;
IF(data)free(data); IF(data)free(data);
if (!io.readKPACK(path)) { debug("Error while loading font: "); debugln(path); return false; } if (!io.read(path)) { debug("Error while loading font: "); debugln(path); return false; }
begin = data = io.buffer_data; begin = data = io.buffer_data;
EBX = begin + io.FILES_SIZE; EBX = begin + io.FILES_SIZE;
height = DSBYTE[EBX - 1]; height = DSBYTE[EBX - 1];
@ -313,7 +319,7 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
IF(size.text)IF(!changeSIZE())return; IF(size.text)IF(!changeSIZE())return;
AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL; AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL;
getsize(text1); getsize(text1);
y -= size.offset_y; y -= size.offset.y;
size.width = w; size.width = w;
size.height = h; size.height = h;

5
programs/cmm/lib/io.h
View File

@ -313,11 +313,14 @@
{ {
file.write(0,strlen(data),data,PATH); file.write(0,strlen(data),data,PATH);
} }
:char BYTE_HEAD_FILE_KPCK[4];
:dword IO::read(dword PATH) :dword IO::read(dword PATH)
{ {
int result; int result;
___GetFileInfo(PATH, #BDVK); ___GetFileInfo(PATH, #BDVK);
if(BDVK.isfolder)return 0; if(BDVK.isfolder)return false;
file.read(0,4,#BYTE_HEAD_FILE_KPCK,PATH);
IF(DSDWORD[#BYTE_HEAD_FILE_KPCK]=='KCPK')return readKPACK(PATH);
FILES_SIZE = BDVK.sizelo; FILES_SIZE = BDVK.sizelo;
buffer_data = malloc(FILES_SIZE+1); buffer_data = malloc(FILES_SIZE+1);
result = file.read(0,FILES_SIZE,buffer_data,PATH); result = file.read(0,FILES_SIZE,buffer_data,PATH);