Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2228 → Rev 2227

/programs/network/htmlv/browser/History.txt
1,9 → 1,3
22.09.11 -- v0.70 -- 11.3 Êá
- óëó÷øåí è îïòèìèçèðîâàí êîä îáðàáîòêè þíèêîäîâñêèõ òåãîâ (&), èñïðàâëåí
è äîïîëíåí èõ ñïèñîê;
- óñòðàí¸í âûëåò ïðîãðàììû ïðè íàæàòèè êëàâèøè CapsLock (ñïàñèáî Mario);
- çàãëóøêà íà âûëåò ïðîãðàììû ïðè çàãðóçêå ñòðàíèö èç è-íýòà (ñïàñèáî Mario).
 
13.09.11 -- v0.69 -- 11.2 Êá
- íîðìàëüíàÿ ïðîêðóòêà èçîáðàæåíèé;
- ðàáîòà ñ ôàéëàìè ëþáîãî ðàçìåðà;
/programs/network/htmlv/browser/TWB.h--
18,7 → 18,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 23.70";
char version[]=" Text-based Browser 23.69";
 
 
struct TWebBrowser {
37,7 → 37,6
 
#include "include\history.h--"
#include "include\colors.h--"
#include "include\unicode_tags.h--"
 
void TWebBrowser::Scan(dword id) {
IF (id > 399) {
58,6 → 57,7
} //åñëè ìàëî ñòðîê èãíîðèðóåì íåêîòîðûå êíîïêè
switch (id) {
case 011:
case 004:
ReadHtml();
break;
case BACK:
185,7 → 185,6
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;
}
file_size stdcall (#download_path);
193,7 → 192,6
ELSE file_size stdcall (#URL);
filesize = EBX;
IF (!filesize) return; //Lee 22.09
mem_Free(buf);
buf = mem_Alloc(filesize);
ReadFile(0, filesize, buf, #URL);
223,9 → 221,6
edit_box_draw stdcall(#edit1); //ðèñóåì ñòðîêó àäðåñà
 
ReadHtml(LETS_LOAD);
IF (!filesize) return; //Lee 22.09
wintodos(buf);
ParseHTML(buf, filesize);
IF(!strlen(buf)) {
271,7 → 266,6
line = '';
copystr("|", #page_links);
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;
IF(za_kadrom == 0) || (WindowRePaint) DrawBar(left, top, width - 15, 15, 0xFFFFFF); //çàêðàøèâàåì ïåðâóþ ñòðîêó
for (; buf + fsize > bword; bword++;) {
345,79 → 339,43
bukva=Hex2Symb(#temp);
IF (bukva) goto DEFAULT_MARK;
break;
/*case '\\': //ïîääåðæêà rtf
IF(strcmp(#URL + strlen(#URL) - 4, ".rtf")<>0) goto DEFAULT_MARK;
 
case '&':
IF(ignor_text) break;
bword++;
IF (ESBYTE[bword] =='\'')
{
bword++;
j = 0;
WHILE(ESBYTE[bword] <>';') && (j < 7) {
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++;
tag='';
FOR (j=0; (ESBYTE[bword] <>';') && (j < 7); j++; bword++;)
{
bukva = ESBYTE[bword];
copystr(#bukva, #tag + strlen(#tag));
j++;
}
FOR (j=0; unicode_tags[j]!=0; j+=2;)
{
IF(!strcmp(#tag, unicode_tags[j]))
{
copystr(unicode_tags[j+1], #line + strlen(#line));
break 1;
}
}
bukva = ''; //âñþ ýòó õðåíü íàäî çàëàáàòü ÷åðåç ìàñèâ
IF(!strcmp("nbsp", #tag)) copystr(" ", #line + strlen(#line));
IF(!strcmp("copy", #tag)) || (!strcmp("#169", #tag)) copystr("(c)", #line + strlen(#line));
IF(!strcmp("reg", #tag)) || (!strcmp("#174", #tag)) copystr("(r)", #line + strlen(#line));
rez = StrToInt(#tag + 1) - 1040;
IF(tag[1] == '1') && (rez>1040) && (rez<1118) && (strlen(#tag) == 5)
{
bukva = utf100tmmv_mas[rez];
copystr(#bukva, #line + strlen(#line));
break;
}
WriteDebug("Unknown tag");
WriteDebug(#tag);
copystr(#tag, #line + strlen(#line)); //âûâîäèì íà ýêðàí íåîáðàáîòàííûé òåã, òàê áðàóçåðû çà÷åì-òî äåëàþò
break;
IF(tag[1] == '1') && (strlen(#tag) == 5) bukva = utf100tmmv_mas[rez];
IF(!strcmp("bdquo", #tag)) copystr(",,", #line + strlen(#line));
IF(!strcmp("amp", #tag)) || (!strcmp("#38", #tag)) bukva = '&';
IF(!strcmp("lt", #tag)) || (!strcmp("#60", #tag)) bukva = '<';
IF(!strcmp("gt", #tag)) || (!strcmp("#62", #tag)) bukva = '>';
IF(!strcmp("minus", #tag)) || (!strcmp("#8722", #tag)) bukva = '-';
IF(!strcmp("#151", #tag)) || (!strcmp("#149", #tag)) || (!strcmp("ndash", #tag)) bukva = '-';
IF(!strcmp("#39", #tag)) || (!strcmp("#96", #tag)) bukva = '\'';
IF(!strcmp("quot", #tag)) || (!strcmp("#34", #tag)) || (!strcmp("ldquo", #tag)) || (!strcmp("rdquo", #tag)) bukva = '"';
tag = '';
//break;
default:
DEFAULT_MARK:
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) && (w_title == 0) {
copystr(#line + find_symbol(#line, ' '), #temp); //ïåðåíîñ ïî ñëîâàì
line[find_symbol(#line, ' ')] = 0x00;
NEXT_MARK: IF(stroka - 1 > max_kolvo_strok) && (za_kadrom <>0) break 1; //óõîäèì...
WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //âûâîä ñòðîêè
TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñòðîêó âêîíöå
copystr(#temp, #line);
}
IF(pre_text == 0) && (bukva == ' ') && (stolbec == 0) && (strlen(#line) == 0) CONTINUE;
/programs/network/htmlv/browser/include/unicode_tags.h--
File deleted
/programs/network/htmlv/browser/include/acid=1.htm
File deleted
/programs/network/htmlv/browser/include/some_code.h--
17,7 → 17,9
#define DONT_LOAD 0
#define LETS_LOAD 1
byte utf100tmmv_mas[77] = "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯àáâãäåæçèéêëìíîïðñh£si\244j";
 
 
dword get_URL_part(byte len) {
char temp1[1000];
copystr(#URL, #temp1);