Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2839 → Rev 2840

/programs/network/htmlv/browser/HTMLv.c
13,20 → 13,18
#include "..\lib\libio_lib.h"
#include "..\lib\libimg_lib.h"
#include "..\lib\edit_box_lib.h"
#include "..\lib\scroll_bar\scroll_lib.h"
#include "..\lib\scroll_lib.h"
#include "..\lib\ttf_fonts.h"
//êàðòèíêè
#include "img\toolbar_icons.c"
#include "img\URLgoto.txt";
 
#define DEBUG_ON 0
 
 
//ïåðåìåííûå
char URL[4096],
editURL[4096],
page_links[12000],
header[512];
header[300];
 
struct lines{
int visible, all, first, column_max;
88,6 → 86,7
if (m.pkm) && (m.y>WB1.top) && (m.y<Form.height) && (filesize)
{
SwitchToAnotherThread();
CreateThread(#menu_rmb,#stak);
}
 
/programs/network/htmlv/browser/TWB.h
9,7 → 9,7
 
char download_path[]="/rd/1/.download";
char search_path[]="http://nigma.ru/index.php?s=";
char version[]=" Text-based Browser 0.94u";
char version[]=" Text-based Browser 0.94z";
 
 
struct TWebBrowser {
85,6 → 85,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);
strcpy(#editURL, BrowserHistory.CurrentUrl());
strcpy(#URL, BrowserHistory.CurrentUrl());
return;
}
320,14 → 321,16
debug("Start parsing");
for ( ; buf+filesize > bword; bword++;) {//ESBYTE[bword]
bukva = ESBYTE[bword];
switch (bukva) {
for ( ; buf+filesize > bword; bword++;)
{
bukva = ESBYTE[bword];
if (ignor_text) && (bukva<>'<') continue;
switch (bukva)
{
case 0x0a:
if (pre_text)
{
bukva = '';
temp = '';
bukva = temp = '';
goto NEXT_MARK;
}
case '\9':
364,11 → 367,14
{
bukva = ESBYTE[bword];
if (bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
if (!ignor_param) && (bukva <>' ') strcat(#tag, #bukva);
if (!ignor_param) && (bukva <>' ')
{
if (strlen(#tag)<sizeof(tag)) strcat(#tag, #bukva);
}
else
{
ignor_param = true;
strcat(#tagparam, #bukva);
if (!ignor_text) && (strlen(#tagparam)+1<sizeof(tagparam)) strcat(#tagparam, #bukva);
}
bword++;
}
401,7 → 407,6
break;
case '&': //îáðàáîòêà òåãîâ òèïà &nbsp;
if (ignor_text) break;
bword++;
tag='';
for (j=0; (ESBYTE[bword] <>';') && (j < 7); j++, bword++;)
431,7 → 436,6
break;
default:
DEFAULT_MARK:
if (ignor_text) break;
if (!pre_text) && (bukva == ' ') && (line[strlen(#line)-1]==' ') break;
//
if (stolbec + strlen(#line) > lines.column_max)
501,7 → 505,7
return;
}
IF (ignor_text == 1) return;
IF (ignor_text) return;
 
IF(!chTag("q")) strcat(#line, "\"");
559,7 → 563,7
return;
}
//////////////////////////
 
if (!chTag("a"))
{
if (rez)
597,7 → 601,7
}
return;
}
/////////////////////////
 
if (!chTag("font"))
{
if (rez)
619,7 → 623,7
if (text_color_index > 0) text_color_index--;
return;
}
//////////////////////////
 
if(!chTag("tr")) || (!chTag("br")) {
TextGoDown(left1, top1, width1);
return;
634,7 → 638,7
IF(rez) TextGoDown(left1, top1 + 10, width1);
return;
}
////////////////////////////
 
if (!chTag("h1")) || (!chTag("h2")) || (!chTag("h3")) || (!chTag("h4")) {
TextGoDown(left1, top1, width1);
IF(rez) TextGoDown(left1, top1 + 10, width1);
/programs/network/htmlv/browser/include/parce_tag.h
10,17 → 10,23
i--;
}
 
IF (kavichki)
if (kavichki)
{
i=strrchr(#tagparam, kavichki);
strcpy(#options, #tagparam + i);
if (i>sizeof(options))
strcpy(#options, #tagparam + sizeof(options));
else
strcpy(#options, #tagparam + i);
}
ELSE
else
{
WHILE((i > 0) && (tagparam[i] <>'=')) i--; //i=strrchr(#tagparam, '=')+1;
i++;
strcpy(#options, #tagparam + i); //êîïèðóåì îïöèþ
if (i>sizeof(options))
strcpy(#options, #tagparam + sizeof(options));
else
strcpy(#options, #tagparam + i);
 
WHILE (options[0] == ' ') strcpy(#options, #options+1);
}
tagparam[i] = 0x00;
31,6 → 37,10
tagparam[i + 1] = 0x00;
}
 
strcpy(#parametr, #tagparam + i + 1); //êîïèðóåì ïàðàìåòð
if (i>sizeof(parametr))
strcpy(#parametr, #tagparam + sizeof(parametr));
else
strcpy(#parametr, #tagparam + i + 1);
 
tagparam[i] = 0x00;
}
}
/programs/network/htmlv/lib/scroll_bar/scroll_lib.h
File deleted
/programs/network/htmlv/lib/scroll_bar/scroll_dll.h
File deleted
/programs/network/htmlv/lib/scroll_bar
Property changes:
Deleted: tsvn:logminsize
-5
\ No newline at end of property