Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2239 → Rev 2240

/programs/network/htmlv/browser/History.txt
1,5 → 1,7
26.09.11 -- v0.70b -- 11.4 Êá
- óíèâåðñàëüíàÿ îáðàáîòêà öâåòîâ.
26.09.11 -- v0.70ñ -- 11.4 Êá
- óíèâåðñàëüíàÿ îáðàáîòêà öâåòîâ;
- óëó÷øåíèÿ â îáðàáîòêå title;
- èñïðàâëåíà îáðàáîòêà ñòàíèö â êîäèðîâêå iso-8859-1.
 
22.09.11 -- v0.70 -- 11.3 Êá
- óëó÷øåí è îïòèìèçèðîâàí êîä îáðàáîòêè þíèêîäîâñêèõ òåãîâ (&), èñïðàâëåí
/programs/network/htmlv/browser/TWB.h--
35,7 → 35,7
 
TWebBrowser WB1;
 
byte rez, b_text, i_text, u_text, s_text, w_title, pre_text, blq_text, li_text, link, ignor_text, li_tab;
byte rez, b_text, i_text, u_text, s_text, pre_text, blq_text, li_text, link, ignor_text, li_tab;
 
 
dword text_colors[10],
74,9 → 74,11
IF(count < max_kolvo_strok) SWITCH(id) {
CASE 183: CASE 184: CASE 180: CASE 181: return;
} //åñëè ìàëî ñòðîê èãíîðèðóåì íåêîòîðûå êíîïêè
switch (id) {
case 011:
switch (id)
{
case 011: //Ctrk+K
ReadHtml();
koitodos(buf);
break;
case BACK:
BrowserHistory.GoBack();
141,7 → 143,6
default:
RETURN;
}
IF(id == 11) koitodos(buf);
ParseHTML(buf, filesize);
}
 
190,29 → 191,36
}
}
 
 
 
void ReadHtml(byte DO_LOAD)
void HttpLoad()
{
 
if (!strcmp(get_URL_part(5),"http:")))
{
IF (DO_LOAD) && (!WindowRePaint)
{
DeleteFile(#download_path);
IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]='';
downloader_id = RunProgram("/sys/network/downloader", #URL);
IF (downloader_id<0) RunProgram("@notify", "Error running Downloader. Internet unavilable.");
RunProgram("/sys/network/downloader", #URL);
RETURN;
}
 
/* if (!strcmp(get_URL_part(5),"http:")))
{
IF (DO_LOAD) && (!WindowRePaint)
{
HttpLoad();
//RETURN;
}
file_size stdcall (#download_path);
}
ELSE file_size stdcall (#URL);
*/
void ReadHtml(byte DO_LOAD)
{
if (!strcmp(get_URL_part(5),"http:")))
file_size stdcall (#download_path);
else
file_size stdcall (#URL);
filesize = EBX;
IF (!filesize) return; //Lee 22.09
if (!filesize) /*{Pause(200); ReadHtml();}*/ return; //Lee 22.09
mem_Free(buf);
buf = mem_Alloc(filesize);
ReadFile(0, filesize, buf, #URL);
269,7 → 277,7
stroka = -za_kadrom;
stolbec = 0;
FOR(j = 400; j < blink + 1; j++;) DeleteButton(j);
b_text = i_text = u_text = s_text = w_title = pre_text = blq_text =
b_text = i_text = u_text = s_text = pre_text = blq_text =
li_text = link = ignor_text = text_color_index = text_colors[0] = li_tab = 0; //îáíóëÿåì òåãè
link_color = 0x0000FF;
blink = 400;
400,15 → 408,13
}
rez = StrToInt(#tag + 1) - 1040;
IF(tag[1] == '1') && (rez>1040) && (rez<1118) && (strlen(#tag) == 5)
IF(tag[1] == '1') && (rez>=0) && (rez<=72) && (strlen(#tag) == 5)
{
bukva = utf100tmmv_mas[rez];
copystr(#bukva, #line + strlen(#line));
break;
bukva = unicode_chars[rez];
GOTO DEFAULT_MARK; //îáðàáàòûâàåì áóêâó
}
WriteDebug("Unknown tag");
WriteDebug(#tag);
WriteDebug(#tag); //òýã íå íàéäåí - âûâîäèì íà äîñêó îòëàäêè
copystr(#tag, #line + strlen(#line)); //âûâîäèì íà ýêðàí íåîáðàáîòàííûé òåã, òàê áðàóçåðû çà÷åì-òî äåëàþò
break;
default:
416,7 → 422,7
IF(ignor_text) break;
IF(pre_text == 0) && (bukva == ' ') && (strcmp(#line + strlen(#line) - 1, " ") == 0) continue;
//
if (stolbec + strlen(#line) > max_kolvo_stolbcov) && (w_title == 0)
if (stolbec + strlen(#line) > max_kolvo_stolbcov)
{
copystr(#line + find_symbol(#line, ' '), #temp); //ïåðåíîñ ïî ñëîâàì
line[find_symbol(#line, ' ')] = 0x00;
506,19 → 512,12
IF (ignor_text == 1) return;
//
 
if(!chTag("title")) IF(w_title == 0)
if(!chTag("title")) && (!rez) && (stroka == 0)
{
copystr(" ", #line);
w_title = 1;
}
ELSE {
w_title = 0;
stolbec = 0;
copystr(#line, #header);
copystr(" -", #header + strlen(#header));
copystr(#version, #header + strlen(#header));
IF(stroka == 0) || (WindowRePaint == 1) DrawTitle(#header);
//äà, çíàþ, 2 ðàçà âûõîäèò, íî, åñëè áîëüøàÿ ñòðàíèöà, òî òðóú
DrawTitle(#header);
return;
}
/programs/network/htmlv/browser/include/unicode_tags.h--
1,6 → 1,6
 
 
byte utf100tmmv_mas[77] = "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯àáâãäåæçèéêëìíîïðñh£\243i\105\244\0";
byte unicode_chars[] = "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯àáâãäåæçèéêëìíîïðñh£\243i\105\244\0";
 
/* IF (BL==178) ESBYTE[ESI] = 73; //I
IF (BL==179) ESBYTE[ESI] = 105; //i