/programs/other/calc/trunk/calc.asm |
---|
676,6 → 676,8 |
jbe newbutton |
mcall , <253, 36>, <55, 22>, 2, 0xF0969D ; 'C' |
mcall , <236,53>, <DISPLAY_Y,DISPLAY_H>, 3, [sc.work] ; 'dec-bin-hex' |
mov esi, [sc.work_button] |
mov ecx, [sc.work_button_text] |
716,19 → 718,19 |
mcall 38, < DISPLAY_X+1, DISPLAY_W+DISPLAY_X-1>, <DISPLAY_Y+1, DISPLAY_Y+1>, 0xE0E0E0 ; internal shadow |
mcall , < DISPLAY_X+1, DISPLAY_X+1>, <DISPLAY_Y+2, DISPLAY_Y+DISPLAY_H-1>, ; internal shadow |
mcall 13, < DISPLAY_X+2, DISPLAY_W-2>, <DISPLAY_Y+2, DISPLAY_H-2>, 0xFFFfff ; background |
mcall 8, <236,53>, <DISPLAY_Y,DISPLAY_H>, 3, [sc.work] ; 'dec-bin-hex' |
mov ecx, [sc.work_text] |
or ecx, 0x40000000 |
mcall 4, <135,6>,,calc,1,[sc.work] |
mov ebx, 250 shl 16 + DISPLAY_Y+(DISPLAY_H-14)/2 |
mov edx, [display_type] |
shl edx, 2 |
add edx, display_type_text |
mov esi, 3 |
mov ecx, [sc.work_text] |
mov edi, [sc.work] |
or ecx, 0x10000000 |
mcall 4,<250,DISPLAY_Y+(DISPLAY_H-14)/2> |
mcall |
cmp [dsign], byte '+' |
je positive |
/programs/cmm/lib/patterns/http_downloader.h |
---|
105,12 → 105,12 |
_in++; |
if(!strncmp(_in,"rd/",3)) return true; |
if(!strncmp(_in,"fd/",3)) return true; |
if(!strncmp(_in,"hd",2)) return true; |
if(!strncmp(_in,"bd",2)) return true; |
if(!strncmp(_in,"cd",2)) return true; |
if(!strncmp(_in,"hd/",3)) return true; |
if(!strncmp(_in,"bd/",3)) return true; |
if(!strncmp(_in,"cd/",3)) return true; |
if(!strncmp(_in,"sys/",4)) return true; |
if(!strncmp(_in,"tmp/",4)) return true; |
if(!strncmp(_in,"usbhd",5)) return true; |
if(!strncmp(_in,"usbhd",6)) return true; |
if(!strncmp(_in,"kolibrios",10)) return true; |
return false; |
} |
/programs/cmm/lib/font.h |
---|
224,7 → 224,7 |
// wb |
if(b24(i)!=background) && (b24(i+3)==background) && (b24(i+line_w)==background) && (b24(i+3+line_w)!=background) |
{ |
dark_background = MixColors(background,b24(i),210); |
dark_background = MixColors(background,b24(i),200); |
DSDWORD[i+3] = DSDWORD[i+3] & 0xFF000000 | dark_background; |
DSDWORD[i+line_w] = DSDWORD[i+line_w] & 0xFF000000 | dark_background; |
} |
232,7 → 232,7 |
// bw |
else if(b24(i)==background) && (b24(i+3)!=background) && (b24(i+line_w)!=background) && (b24(i+3+line_w)==background) |
{ |
dark_background = MixColors(background,b24(i+3),210); |
dark_background = MixColors(background,b24(i+3),200); |
DSDWORD[i] = DSDWORD[i] & 0xFF000000 | dark_background; |
DSDWORD[i+3+line_w] = DSDWORD[i+3+line_w] & 0xFF000000 | dark_background; |
} |
/programs/cmm/aelia/tag.h |
---|
File deleted |
\ No newline at end of file |
/programs/cmm/aelia/aelia.c |
---|
61,7 → 61,6 |
#include "favicon.h" |
#include "ini.h" |
#include "tag.h" |
#include "gui.h" |
#include "label.h" |
#include "link.h" |
/programs/cmm/aelia/prepare_page.h |
---|
68,6 → 68,68 |
= = |
========================================================*/ |
/* <title> <meta encoding> <a hrf=""> <img src="" alt=""> <h1>..<h6> <b> <u> <s> <pre> */ |
struct _DOM { |
dword start; |
dword end; |
dword len; |
}; |
struct _style { |
bool b, u, i, s; |
bool h1, h2, h3, h4, h5, h6; |
bool a; |
bool pre; |
bool ignore; |
dword color; |
void clear(); |
} style; |
void _style::clear() |
{ |
b=u=i=s=0; |
h1=h2=h3=h4=h5=h6=0; |
a=0; |
pre=0; |
ignore=0; |
color=0; |
} |
struct _text { |
dword start; |
int x, y; |
}; |
struct _tag { |
dword start; |
dword name; |
dword param[10]; |
dword value[10]; |
void parce(); |
int nameis(); |
void clear(); |
}; |
void _tag::parce() |
{ |
dword o = name = start; |
while (ESBYTE[o]!=' ') && (ESBYTE[o]) o++; //searching for a space after tag name |
ESBYTE[o] = '\0'; |
strlwr(name); |
} |
int _tag::nameis(dword _in_tag_name) |
{ |
if (name) && (strcmp(_in_tag_name, name)==0) return true; |
return false; |
} |
void _tag::clear() |
{ |
start=name=0; |
} |
#define HTML_PADDING_X 8; |
#define HTML_PADDING_Y 5; |
74,27 → 136,30 |
void ParceHtml(byte draw) |
{ |
dword DOM_start, DOM_end, DOM_len, DOM_pos; |
int stroka_x = HTML_PADDING_X; |
int stroka_y = HTML_PADDING_Y; |
dword line_break; |
byte ch, zeroch; |
_DOM DOM; |
_text text; |
_tag tag; |
dword DOM_pos; |
tag.clear(); |
style.clear(); |
/* Create DOM */ |
debugln("creating DOM"); |
DOM_len = strlen(io.buffer_data); |
DOM_start = malloc(DOM_len); |
DOM_end = DOM_start + DOM_len; |
strlcpy(DOM_start, io.buffer_data, DOM_len); |
DOM.len = strlen(io.buffer_data); |
DOM.start = malloc(DOM.len); |
DOM.end = DOM.start + DOM.len; |
strlcpy(DOM.start, io.buffer_data, DOM.len); |
//RemoveSpecialSymbols(DOM.start, DOM.len); |
//DOM.len = strlen(DOM.start); |
/* Parce DOM */ |
debugln("starting DOM parce..."); |
text.start = DOM_start; |
for (DOM_pos=DOM_start; DOM_pos<DOM_end; DOM_pos++) |
text.start = DOM.start; |
for (DOM_pos=DOM.start; DOM_pos<DOM.end; DOM_pos++) |
{ |
if (ESBYTE[DOM_pos]==0x0D) || (ESBYTE[DOM_pos]==0x0A) ESBYTE[DOM_pos]=' '; |
ch = ESBYTE[DOM_pos]; |
169,5 → 234,5 |
label.size.height = list.count+5*list.item_h; |
label.raw_size = 0; |
} |
free(DOM_start); |
free(DOM.start); |
} |