Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2432 → Rev 2433

/programs/network/htmlv/browser/HTMLv.c--
1,5 → 1,5
//HTML Viewer in C--
//Copyright 2007-20012 by Veliant & Leency
//Copyright 2007-2012 by Veliant & Leency
//Asper, Lrz, Nable, lev.
 
#include "..\lib\kolibri.h--"
56,6 → 56,8
copystr(#URL,#editURL);
if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
//Draw_Window(); //shis is right
//WB1.ShowPage(#URL); //shis is right
 
SetEventMask(0x27);
loop()
144,10 → 146,13
DrawRegion_3D(205,14,onLeft(58,205),18,0x94AECE,0x94AECE); //îáîäîê ïîëîñû àäðåñà
DrawRegion_3D(206,15,onLeft(59,205),16,0xE4ECF3,0xE4ECF3);
edit1.width=Form.width-266;
//edit_box_draw stdcall(#edit1); //ðèñóåì ñòðîêó àäðåñà //shis is right
WB1.top=44;
WB1.width=Form.width-11;
WB1.height=onTop(43,5);
WB1.ShowPage(#URL);
//WB1.ParseHTML(buf, filesize); //shis is right
}
int onLeft(dword right,left) {return Form.width-right-left;}
/programs/network/htmlv/browser/History.txt
2,8 → 2,12
- ïîääåðæêà <body> "bgcolor=" è "text=";
- îáðàáîòêà ïåðåõîäà ââåðõ "../";
- jpg, gif, png îòêðûâàþòñÿ ÷åðåç kiv.
- òåïåðü èçîáðàæåíèÿ ëåãêî ìîãóò áûòü ññûëêàìè;
- 2 íåáîëüøèõ ôèêñà äëÿ èçîáðàæåíèé, êíîïêè BackSpace;
- ÷óòîê óëó÷øåíà îáðàáîòêà óðëîâ, ñîäåðæàùèõ #.
 
 
 
29.02.12 -- v0.76 -- 11.3
- èñïðàâëåíà ðàáîòà êíîïêè "Íàçàä";
- â èñòîðèþ ïîñåù¸ííûõ ñòðàíèö íå ìîæåò áûòü äîáàâëåíî 2 îäèíàêîâûõ àäðåñà ïîäðÿä;
/programs/network/htmlv/browser/TWB.h
1,11 → 1,9
//Web-component, Leency & Veliant 2007-20012
//lev
 
//èäåÿ - ëåâûå ôàéëû îòêðûâàòü ñîîòâåòñòâóþùèìè ïðîãàìè
//ol - öèôåðêè
 
//èç õòòï-ëîàä â ðåàäõòìë
 
 
int downloader_id;
 
dword j,
17,7 → 15,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.77";
char version[]=" Text-based Browser 0.78";
 
 
struct TWebBrowser {
66,11 → 64,18
//ýòó âñþ õðåíü íóæíî â GetNewUrl() ïåðåìåñòèòü
IF (URL[0] == '#') { //ìû íå óìååì ïåðåõîäèòü ïî ññûëêå âíóòðè äîêóìåíòà. Ïîêà ÷òî...
copystr(#editURL, #URL);
copystr(BrowserHistory.CurrentUrl(), #editURL);
copystr(#URL, #editURL + strlen(#editURL));
//edit1.size = edit1.pos = strlen(#editURL);
//edit_box_draw stdcall(#edit1); //ðèñóåì ñòðîêó àäðåñà
copystr(BrowserHistory.CurrentUrl(), #URL);
ShowPage(#URL);
return;
}
URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà, ëó÷øå, ÷åì íè÷åãî (õàáð, íàïðèìåð, áóäåò ðàáîòàòü)
URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà, ëó÷øå, ÷åì íè÷åãî (õàáð, íàïðèìåð, áóäåò ðàáîòàòü) //ýòî íå ñîâñåì ïðàâèëüíî - â åäèòóðë äîëæíî îñòàâàòüñÿ
 
GetNewUrl();
 
78,7 → 83,7
if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg"))
{
RunProgram("/sys/media/kiv", #URL);
copystr(#editURL, #URL);
copystr(BrowserHistory.CurrentUrl(), #URL);
return;
}
 
183,7 → 188,7
}
 
void GetNewUrl(){
IF (!strcmp(get_URL_part(2),"./")) copystr(#URL+2,#URL);
IF (!strcmp(get_URL_part(2),"./")) copystr(#URL+2,#URL); //èãíîðèì :)
if (URL[0] <> '/')
&& (strcmp(get_URL_part(5),"http:")<>0) && (strcmp(get_URL_part(5),"mailt")<>0) && (strcmp(get_URL_part(5),"ftp:/")<>0)
681,7 → 686,7
{
img_za_kadrom=WB1.top-top1;
h=h-img_za_kadrom;
top1=WB1.top-5;
top1=WB1.top;
}
if (top1>WB1.top+WB1.height-h-10) //åñëè ÷àñòü èçîáðàæåíèÿ ñíèçó IF (stroka - 2 < max_kolvo_strok)
693,7 → 698,12
img_draw stdcall (image,left1-5,top1+10,w, h,0,img_za_kadrom);
DrawBar(left1+w - 5, top1 + 10, width1-w + 5, h, bg_color);
IF (link)
{
DefineButton(left1 - 5, top1+10, w, h, blink + BT_HIDE, 0xB5BFC9);
}
 
}
/*else
{
IF (strcmp(#parametr,"alt=")==0) copystr(#options,#line+strlen(#line));
/programs/network/htmlv/browser/include/history.h
14,7 → 14,9
UrlHistory[j] = 0x00;
j = find_symbol(#UrlHistory, '|'); //ïðåäûäóùàÿ ñòðàíèöà -> îíà íàì è íóæíà
copystr(#UrlHistory + j, #URL);
copystr(#URL, #editURL);
za_kadrom = count = 0;
if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
WB1.ShowPage(#URL);
}