Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2825 → Rev 2839

/programs/network/htmlv/browser/include/colors.h
317,10 → 317,7
ELSE
FOR (ii=0; color_names[ii]!=0; ii++)
{
IF(!strcmp(color_str, color_names[ii]))
{
return colors[ii];
IF(!strcmp(color_str, color_names[ii])) return colors[ii];
}
}
return text_colors[0];
}
/programs/network/htmlv/browser/include/history.h
23,6 → 23,7
 
void UrlsHistory::AddUrl() //òóò íóæåí ââîäèìûé ýëåìåíò - äëÿ óíèâåðñàëüíîñòè
{
int i;
if (history_num>0) && (strcmp(#URL,#history_list[history_current].Item)==0) return;
 
if (history_current>=MAX_HISTORY_NUM-1)
/programs/network/htmlv/browser/include/menu_rmb.h
4,13 → 4,14
#define ITEM_WIDTH 138
 
char *ITEMS_LIST[]={
"View in Tinypad F3",
"View in TextEdit F4",
"-",
"KOI-8 Ctrl+K",
"UTF Ctrl+U",
"View in Tinypad F3",52,
"View in TextEdit F4",53,
"-",0,
"KOI-8 Ctrl+K",11,
"UTF Ctrl+U",21,
0};
 
 
proc_info MenuForm;
 
19,7 → 20,7
 
mouse mm;
int items_num, items_cur;
int id1, key;
int id1, key, i;
SetEventMask(100111b);
43,7 → 44,9
break;
case evButton:
ItemProcess(GetButtonID());
id1=GetButtonID()-10;
WB1.Scan(ITEMS_LIST[id1*2+1]);
ExitProcess();
break;
case evKey:
61,12 → 64,13
}
if (key==13)
{
ItemProcess(items_cur+10);
WB1.Scan(ITEMS_LIST[items_cur*2+1]);
ExitProcess();
}
break;
case evReDraw:
for (items_num=0; ITEMS_LIST[items_num]<>0; items_num++;) {};
while (ITEMS_LIST[items_num*2]) items_num++;
DefineAndDrawWindow(Form.left+m.x,Form.top+m.y+GetSkinWidth()+3,ITEM_WIDTH,items_num*ITEM_HEIGHT+1,0x01,0x10FFFFFF,0,0,0);
 
DrawRegion(0,0,ITEM_WIDTH,items_num*ITEM_HEIGHT+1,0x777777); //îáîäîê
73,7 → 77,7
_ITEMS_DRAW:
for (i=0; i<items_num; i++;)
{
if (!strcmp(ITEMS_LIST[i],"-"))
if (!strcmp(ITEMS_LIST[i*2],"-"))
{
DrawBar(1, i*ITEM_HEIGHT+1, ITEM_WIDTH-1, ITEM_HEIGHT, 0xFFFFFF);
DrawBar(1, i*ITEM_HEIGHT+1+9, ITEM_WIDTH-1, 1, 0x999999);
82,22 → 86,12
DefineButton(0, i*ITEM_HEIGHT, ITEM_WIDTH, ITEM_HEIGHT, i+10+BT_HIDE, 0xFFFFFF);
if (i<>items_cur) EDX=0xFFFFFF; else EDX=0x94AECE;
DrawBar(1, i*ITEM_HEIGHT+1, ITEM_WIDTH-1, ITEM_HEIGHT, EDX);
WriteText(8,i*ITEM_HEIGHT+6,0x80,0x000000,ITEMS_LIST[i],0);
WriteText(8,i*ITEM_HEIGHT+6,0x80,0x000000,ITEMS_LIST[i*2],0);
}
}
}
 
void ItemProcess(int num_id)
{
if (num_id==10) WB1.Scan(52);
if (num_id==11) WB1.Scan(53);
//-----------------------
if (num_id==13) WB1.Scan(11); //KOI
if (num_id==14) WB1.Scan(21); //UTF
ExitProcess();
}
 
 
 
 
 
/programs/network/htmlv/browser/include/parce_tag.h
12,12 → 12,12
 
IF (kavichki)
{
i=find_symbol(#tagparam, kavichki);
i=strrchr(#tagparam, kavichki);
strcpy(#options, #tagparam + i);
}
ELSE
{
WHILE((i > 0) && (tagparam[i] <>'=')) i--; //i=find_symbol(#tagparam, '=')+1;
WHILE((i > 0) && (tagparam[i] <>'=')) i--; //i=strrchr(#tagparam, '=')+1;
i++;
strcpy(#options, #tagparam + i); //êîïèðóåì îïöèþ
/programs/network/htmlv/browser/include/some_code.h
27,7 → 27,7
 
void GetURLfromPageLinks(int id)
{
int j = 0;
int i, j = 0;
for (i = 0; i <= id - 401; i++)
{
do j++;
34,7 → 34,7
while (page_links[j] <>'|');
}
page_links[j] = 0x00;
strcpy(#URL, #page_links[find_symbol(#page_links, '|')]);
strcpy(#URL, #page_links[strrchr(#page_links, '|')]);
}
 
 
49,14 → 49,14
dword italic_buf;
int tile_height=2, //áóäåì âûâîäèòü äâóõïèêñåëüíûìè ïîëîñêàìè
shift=-2, //ñ äâóõïèêñåëüíûì ñìåùåíèåì
i;
i, skin_width;
 
italic_buf = mem_Alloc(w*h*3);
skin_width = GetSkinWidth();
CopyScreen(italic_buf, x+Form.left+2, y+Form.top+skin_width, w, h);
 
CopyScreen(italic_buf, x+Form.left+2, GetSkinWidth()+y+Form.top, w, h);
FOR (i=0;i*tile_height<h;i++)
PutImage(w*3*tile_height*i+italic_buf,w,tile_height,x+shift-i+1,i*tile_height+y);
 
FOR (i=0;i*tile_height<h;i++){
PutImage(w*3*tile_height*i+italic_buf,w,tile_height,x+shift-i+1,i*tile_height+y);
}
mem_Free(italic_buf);
}
/programs/network/htmlv/browser/include/unicode_tags.h
2,18 → 2,6
 
byte unicode_chars[] = "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯àáâãäåæçèéêëìíîïðñh£\243i\105\244\0";
 
/* IF (BL==178) ESBYTE[ESI] = 73; //I
IF (BL==179) ESBYTE[ESI] = 105; //i
IF (BL==175) ESBYTE[ESI] = 244; //J
IF (BL==191) ESBYTE[ESI] = 245; //j
IF (BL==170) ESBYTE[ESI] = 242; //E
IF (BL==186) ESBYTE[ESI] = 243; //e
IF (BL==168) ESBYTE[ESI] = 240; //à
IF (BL==184) ESBYTE[ESI] = 'e'; //e
IF (BL==180) ESBYTE[ESI] = 254; //£
IF ((BL==147) || (BL==148) || (BL==171) || (BL==187)) ESBYTE[ESI] = 34;
IF ((BL==150) || (BL==151)) ESBYTE[ESI] = 45;
*/
 
char *unicode_tags[]={
"nbsp", " ",
74,7 → 62,7
"#1031", "\244",
 
"#8470", "N",
"bull", "-", //¢®®¡é¥ §¤¥áì â®çª 
"bull", "-", //âîîáùå çäåñü òî÷êà
"percnt","%",
 
0};