XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

HTMLv/TWB: several structure improvements

Browse Source 
git-svn-id: svn://kolibrios.org@4508 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2014-01-22 00:08:47 +00:00
parent 199e14f164
commit 16d2133641
2 changed files with 58 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
programs/cmm/TWB/TWB.c
View File

@ -1,6 +1,3 @@
#include "..\lib\draw_buf.h"
#include "..\lib\list_box.h"
#include "..\lib\cursor.h"
#include "..\TWB\links.h" #include "..\TWB\links.h"
int downloader_id; int downloader_id;
@ -25,7 +22,6 @@ struct TWebBrowser {
DrawBufer DrawBuf; DrawBufer DrawBuf;
void GetNewUrl(); void GetNewUrl();
void ReadHtml(); void ReadHtml();
void ShowPage();
void ParseHTML(); void ParseHTML();
void WhatTextStyle(); void WhatTextStyle();
void DrawPage(); void DrawPage();
@ -175,38 +171,12 @@ void TWebBrowser::ReadHtml(byte encoding)
} }
void TWebBrowser::ShowPage() void TWebBrowser::ParseHTML(dword bufpos){
{
address_box.size = address_box.pos = strlen(#editURL);
address_box.offset=0;
edit_box_draw stdcall(#address_box);
PageLinks.Clear();
if (!filesize)
{
DrawBar(list.x, list.y, list.w+scroll_wv.size_x+1, list.h, 0xFFFFFF); //fill all
if (GetProcessSlot(downloader_id)<>0) WriteText(list.x + 10, list.y + 18, 0x80, 0, "Loading...");
else
{
WriteText(list.x + 10, list.y + 18, 0x80, 0, "Page not found. May be, URL contains some errors.");
if (!strncmp(#URL,"http:",5)) WriteText(list.x + 10, list.y + 32, 0x80, 0, "Or Internet unavilable for your configuration.");
}
//return;
}
else
ParseHTML(buf);
if (!header) strcpy(#header, #version);
if (!strcmp(#version, #header)) DrawTitle(#header);
}
void TWebBrowser::ParseHTML(dword bword){
word bukva[2]; word bukva[2];
int j, perenos_num; int j, perenos_num;
byte ignor_param; byte ignor_param;
char temp[768]; char temp[768];
dword bufstart = bufpos;
b_text = i_text = u_text = s_text = blq_text = b_text = i_text = u_text = s_text = blq_text =
li_text = link = ignor_text = text_color_index = text_colors[0] = li_tab = li_text = link = ignor_text = text_color_index = text_colors[0] = li_tab =
@ -230,9 +200,9 @@ void TWebBrowser::ParseHTML(dword bword){
if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1; if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
} }
for ( ; buf+filesize > bword; bword++;) for ( ; bufstart+filesize > bufpos; bufpos++;)
{ {
bukva = ESBYTE[bword]; bukva = ESBYTE[bufpos];
if (ignor_text) && (bukva!='<') continue; if (ignor_text) && (bukva!='<') continue;
if (condition_text_active) && (condition_text_val != condition_href) && (bukva!='<') continue; if (condition_text_active) && (condition_text_val != condition_href) && (bukva!='<') continue;
switch (bukva) switch (bukva)
@ -256,49 +226,49 @@ void TWebBrowser::ParseHTML(dword bword){
case '=': //quoted printable case '=': //quoted printable
if (strcmp(#URL + strlen(#URL) - 4, ".mht")<>0) goto DEFAULT_MARK; if (strcmp(#URL + strlen(#URL) - 4, ".mht")<>0) goto DEFAULT_MARK;
temp[0] = ESBYTE[bword+1]; temp[0] = ESBYTE[bufpos+1];
temp[1] = ESBYTE[bword+2]; temp[1] = ESBYTE[bufpos+2];
temp[2] = '\0'; temp[2] = '\0';
if (bukva = Hex2Symb(#temp)) if (bukva = Hex2Symb(#temp))
{ {
bword+=2; bufpos+=2;
goto DEFAULT_MARK; goto DEFAULT_MARK;
} }
break; break;
case '&': //&nbsp; and so on case '&': //&nbsp; and so on
bword++; bufpos++;
tag=0; tag=0;
for (j=0; (ESBYTE[bword]<>';') && (j<7); j++, bword++;) for (j=0; (ESBYTE[bufpos]<>';') && (j<7); j++, bufpos++;)
{ {
bukva = ESBYTE[bword]; bukva = ESBYTE[bufpos];
chrcat(#tag, bukva); chrcat(#tag, bukva);
} }
if (bukva = GetUnicodeSymbol()) goto DEFAULT_MARK; if (bukva = GetUnicodeSymbol()) goto DEFAULT_MARK;
break; break;
case '<': case '<':
bword++; //ïðîìîòàåì ñèìâîë < bufpos++; //ïðîìîòàåì ñèìâîë <
tag = parametr = tagparam = ignor_param = NULL; tag = parametr = tagparam = ignor_param = NULL;
if (ESBYTE[bword] == '!') //ôèëüòðàöèÿ âíóòðè <!-- -->, äåðçêî if (ESBYTE[bufpos] == '!') //ôèëüòðàöèÿ âíóòðè <!-- -->, äåðçêî
{ {
bword++; bufpos++;
if (ESBYTE[bword] == '-') if (ESBYTE[bufpos] == '-')
{ {
HH_: HH_:
do do
{ {
bword++; bufpos++;
if (buf + filesize <= bword) break 2; if (bufstart + filesize <= bufpos) break 2;
} }
while (ESBYTE[bword] <>'-'); while (ESBYTE[bufpos] <>'-');
bword++; bufpos++;
if (ESBYTE[bword] <>'-') goto HH_; if (ESBYTE[bufpos] <>'-') goto HH_;
} }
} }
while (ESBYTE[bword] !='>') && (bword < buf + filesize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû while (ESBYTE[bufpos] !='>') && (bufpos < bufstart + filesize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
{ {
bukva = ESBYTE[bword]; bukva = ESBYTE[bufpos];
if (bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' '; if (bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
if (!ignor_param) && (bukva <>' ') if (!ignor_param) && (bukva <>' ')
{ {
@ -309,7 +279,7 @@ void TWebBrowser::ParseHTML(dword bword){
ignor_param = true; ignor_param = true;
if (!ignor_text) && (strlen(#tagparam)+1<sizeof(tagparam)) strcat(#tagparam, #bukva); if (!ignor_text) && (strlen(#tagparam)+1<sizeof(tagparam)) strcat(#tagparam, #bukva);
} }
bword++; bufpos++;
} }
strlwr(#tag); strlwr(#tag);
strlwr(#tagparam); strlwr(#tagparam);
@ -376,7 +346,7 @@ void TWebBrowser::ParseHTML(dword bword){
{ {
anchor=NULL; anchor=NULL;
list.first=anchor_line_num; list.first=anchor_line_num;
ParseHTML(buf); ParseHTML(bufstart);
} }
DrawScroller(); DrawScroller();
} }
@ -649,6 +619,7 @@ void TWebBrowser::DrawScroller() //
scroll_wv.all_redraw=1; scroll_wv.all_redraw=1;
scroll_wv.start_x = list.x + list.w; scroll_wv.start_x = list.x + list.w;
scroll_wv.start_y = list.y;
scroll_wv.size_y=list.h; scroll_wv.size_y=list.h;
scrollbar_v_draw(#scroll_wv); scrollbar_v_draw(#scroll_wv);

40
programs/cmm/browser/HTMLv.c
View File

@ -16,6 +16,10 @@
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\draw_buf.h"
#include "..\lib\list_box.h"
#include "..\lib\cursor.h"
//*.obj libraries //*.obj libraries
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\lib.obj\box_lib.h"
#include "..\lib\lib.obj\libio_lib.h" #include "..\lib\lib.obj\libio_lib.h"
@ -62,8 +66,6 @@ void main()
if (load_dll2(libimg, #libimg_init,1)!=0) debug("Error: library doesn't exists - libimg"); if (load_dll2(libimg, #libimg_init,1)!=0) debug("Error: library doesn't exists - libimg");
if (!URL) strcpy(#URL, "/sys/index.htm"); if (!URL) strcpy(#URL, "/sys/index.htm");
strcpy(#editURL, #URL);
CursorPointer.Load(#CursorFile); CursorPointer.Load(#CursorFile);
Form.width=WIN_W; Form.width=WIN_W;
Form.height=WIN_H; Form.height=WIN_H;
@ -211,7 +213,7 @@ void Draw_Window()
DrawRectangle(206,15,Form.cwidth-205-50,16,0xE4ECF3); DrawRectangle(206,15,Form.cwidth-205-50,16,0xE4ECF3);
SetElementSizes(); SetElementSizes();
WB1.ShowPage(); ShowPage();
DefineButton(scroll_wv.start_x+1, scroll_wv.start_y+1, 16, 16, BTN_UP+BT_HIDE, 0xE4DFE1); DefineButton(scroll_wv.start_x+1, scroll_wv.start_y+1, 16, 16, BTN_UP+BT_HIDE, 0xE4DFE1);
DefineButton(scroll_wv.start_x+1, scroll_wv.start_y+scroll_wv.size_y-18, 16, 16, BTN_DOWN+BT_HIDE, 0xE4DFE1); DefineButton(scroll_wv.start_x+1, scroll_wv.start_y+scroll_wv.size_y-18, 16, 16, BTN_DOWN+BT_HIDE, 0xE4DFE1);
@ -351,7 +353,7 @@ void ProcessLinks(int id)
} }
if (URL[1]!='-') && (URL[1]!='+') condition_href = atoi(#URL+1); if (URL[1]!='-') && (URL[1]!='+') condition_href = atoi(#URL+1);
strcpy(#URL, BrowserHistory.CurrentUrl()); strcpy(#URL, BrowserHistory.CurrentUrl());
WB1.ShowPage(); ShowPage();
return; return;
} }
//#1 //#1
@ -360,7 +362,7 @@ void ProcessLinks(int id)
strcpy(#anchor, #URL+strrchr(#URL, '#')); strcpy(#anchor, #URL+strrchr(#URL, '#'));
strcpy(#URL, BrowserHistory.CurrentUrl()); strcpy(#URL, BrowserHistory.CurrentUrl());
WB1.list.first=WB1.list.count-WB1.list.visible; WB1.list.first=WB1.list.count-WB1.list.visible;
WB1.ShowPage(); ShowPage();
return; return;
} }
//liner.ru#1 //liner.ru#1
@ -412,9 +414,33 @@ void OpenPage()
} }
WB1.list.first = WB1.list.count =0; WB1.list.first = WB1.list.count =0;
WB1.ReadHtml(_WIN); WB1.ReadHtml(_WIN);
WB1.ShowPage(); ShowPage();
}
void ShowPage()
{
address_box.size = address_box.pos = strlen(#editURL);
address_box.offset=0;
edit_box_draw stdcall(#address_box);
if (!filesize)
{
PageLinks.Clear();
DrawBar(WB1.list.x, WB1.list.y, WB1.list.w+scroll_wv.size_x+1, WB1.list.h, 0xFFFFFF); //fill all
if (GetProcessSlot(downloader_id)<>0) WriteText(WB1.list.x + 10, WB1.list.y + 18, 0x80, 0, "Loading...");
else
{
WriteText(WB1.list.x + 10, WB1.list.y + 18, 0x80, 0, "Page not found. May be, URL contains some errors.");
if (!strncmp(#URL,"http:",5)) WriteText(WB1.list.x + 10, WB1.list.y + 32, 0x80, 0, "Or Internet unavilable for your configuration.");
}
//return;
}
else
WB1.ParseHTML(buf);
if (!header) strcpy(#header, #version);
if (!strcmp(#version, #header)) DrawTitle(#header);
} }
stop: stop: