Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2417 → Rev 2418

/programs/network/htmlv/browser/History.txt
1,5 → 1,9
xx.xx.12 -- v0.7x -- 11.x
- èñïðàâëåíà ðàáîòà êíîïêè "Íàçàä".
29.02.12 -- v0.76 -- 11.x
- èñïðàâëåíà ðàáîòà êíîïêè "Íàçàä";
- â èñòîðèþ ïîñåù¸ííûõ ñòðàíèö íå ìîæåò áûòü äîáàâëåíî 2 îäèíàêîâûõ àäðåñà ïîäðÿä;
- èñïðàâëåíî èñ÷åçàíèå çàãîëîâêà ñòðàíèö;
- èñ÷åçàëà êíîïêà ââåðõ â ïðîêðóòêå - èñïðàâëåíî;
- íåêîòîðûå äðóãèå èñïðàâëåíèÿ.
 
 
27.02.12 -- v0.75 -- 11.? Êá
/programs/network/htmlv/browser/TWB.h
19,7 → 19,7
char download_path[]="/rd/1/.download";
//char search_path[]="http://nova.rambler.ru/search?words=";
char search_path[]="http://nigma.ru/index.php?s=";
char version[]=" Text-based Browser 0.75";
char version[]=" Text-based Browser 0.76";
 
 
struct TWebBrowser {
77,13 → 77,12
 
BrowserHistory.AddUrl();
 
if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
//Lee 21.02 }
copystr(#URL, #editURL);
//ShowPage(#URL);
Draw_Window();
za_kadrom = count = 0;
ShowPage(#URL);
return;
}
134,6 → 133,7
case 0x0D: //enter
copystr(#editURL, #URL);
if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
za_kadrom = count = 0;
ShowPage(#URL);
return;
case 173: //ctrl+enter
141,6 → 141,7
copystr(#search_path, #URL);
copystr(#editURL, #URL + strlen(#URL));
if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
za_kadrom = count = 0;
ShowPage(#URL);
return;
 
202,8 → 203,7
 
void HttpLoad()
{
za_kadrom = 0;
//count = 0; ÿ äóìàþ åìó ìåñòî çäåñü
KillProcess(downloader_id); //óáèâàåì ñòàðûé ïðîöåññ
DeleteFile(#download_path);
IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]='';
235,7 → 235,6
void TWebBrowser::ShowPage(dword adress) {
max_kolvo_stolbcov = width - 30 / 6;
max_kolvo_strok = height - 3 / 10 - 2;
copystr(#version, #header);
edit1.size = edit1.pos = strlen(#editURL);
edit_box_draw stdcall(#edit1); //ðèñóåì ñòðîêó àäðåñà
276,6 → 275,7
blink = 400;
line = '';
copystr("|", #page_links);
copystr(#version, #header);
IF(!strcmp(#URL + strlen(#URL) - 4, ".txt")) pre_text = 1; //çà÷¸òíîå îòîáðàæåíèå òåêñòà
//IF(!strcmp(#URL + strlen(#URL) - 4, ".rtf")) pre_text = 1;
IF(!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
327,9 → 327,7
}
lowcase(#tag);
lowcase(#tagparam);
//WriteDebug(#tagparam);
//WriteDebug(#tag); Pause(50);
//
 
IF (tag[strlen(#tag)-1]=='/') tag[strlen(#tag)-1]=''; //íåáîëüøîé ôèêñ äëÿ ðàáîòû ñ XHTML-òåãàìè òèïà br/
IF(strlen(#tagparam) > 0) && (strlen(#tagparam) < 4000) GetNextParam();
WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //îáðàáîòêà òåãîâ
350,36 → 348,7
bukva=Hex2Symb(#temp);
IF (bukva) goto DEFAULT_MARK;
break;
/*case '\\': //ïîääåðæêà rtf
IF(strcmp(#URL + strlen(#URL) - 4, ".rtf")<>0) goto DEFAULT_MARK;
 
bword++;
IF (ESBYTE[bword] =='\'')
{
bword++;
bukva=ESBYTE[bword];
copystr(#bukva, #temp);
 
bword++;
bukva=ESBYTE[bword];
copystr(#bukva, #temp + strlen(#temp));
bukva=Hex2Symb(#temp);
IF (bukva) goto DEFAULT_MARK;
}
else
{
FOR (j=0; (ESBYTE[bword] <>'\\') && (buf + fsize < bword); j++; bword++;)
{
bukva = ESBYTE[bword];
copystr(#bukva, #tag + strlen(#tag));
}
IF ((!strcmp(#tag, "par\0x0a")) || (!strcmp(#tag, "par\0x0b"))) stroka++;
tag='';
bword--;
}
break;*/
case '&': //îáðàáîòêà òåãîâ òèïà &nbsp;
IF(ignor_text) break;
bword++;
501,19 → 470,20
return;
}
IF(!chTag("script")) || (!chTag("style")) ignor_text = rez;
IF (ignor_text == 1) return;
//
 
if(!chTag("title")) && (!rez) && (stroka == 0)
if(!chTag("title")) && (!rez)
{
copystr(#line, #header);
copystr(" -", #header + strlen(#header));
copystr(#version, #header + strlen(#header));
DrawTitle(#header);
if (stroka==0) DrawTitle(#header);
return;
}
IF (ignor_text == 1) return;
//
//
IF(!chTag("q")) copystr("\"", #line + strlen(#line));
//âûâîä íà ýêðàí
759,7 → 729,7
DrawFlatButton(left + width - 15, top, 16, 16, ID1, 0xE4DFE1, "\x18");
 
IF(count <= max_kolvo_strok) {
DrawBar(left + width - 14, top, 16, height - 17, 0xCED0D0);
DrawBar(left + width - 14, top+17, 16, height - 34, 0xCED0D0);
return;
}
 
/programs/network/htmlv/browser/include/history.h
20,6 → 20,8
 
void UrlsHistory::AddUrl()
{
if (strcmp(BrowserHistory.CurrentUrl(), #URL)==0) return; //åñëè íîâûé àäðåññ = òåêóùåìó
IF (strlen(#UrlHistory)>6000) copystr(#UrlHistory+5000,#UrlHistory);
copystr("|", #UrlHistory + strlen(#UrlHistory));
copystr(#URL, #UrlHistory + strlen(#UrlHistory));