Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7755 → Rev 7756

/programs/cmm/TWB/TWB.c
39,30 → 39,26
void BufEncode();
} WB1;
 
dword page_bg;
#include "..\TWB\img_cache.h"
 
dword link_color_inactive;
dword link_color_active;
dword page_bg;
 
bool
link,
cur_encoding,
t_html,
t_body;
bool link, cur_encoding, t_html, t_body;
 
#include "..\TWB\img_cache.h"
#include "..\TWB\links.h"
 
dword bufpointer=0;
dword bufsize=0;
 
char header[150];
 
int body_magrin=6;
int basic_line_h=22;
 
char header[150];
char oldtag[100];
scroll_bar scroll_wv = { 15,NULL,NULL,NULL,0,2,NULL,15,0,0xeeeeee,0xBBBbbb,0xeeeeee};
 
scroll_bar scroll_wv = { 15,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
 
//============================================================================================
void TWebBrowser::DrawStyle()
{
251,7 → 247,6
DrawStyle();
if (tag.name) SetStyle();
}
strncpy(#oldtag, #tag.name, sizeof(oldtag)-1);
break;
default:
AddCharToTheLine(ESBYTE[bufpos]);
375,9 → 370,8
return;
}
if (tag.is("div")) {
if (streq(#oldtag,"div")) && (tag.opened) return;
if (streq(#tag.prior,"div")) && (tag.opened) return;
NewLine();
//IF (oldtag[0] != 'h')
return;
}
if (tag.is("header")) || (tag.is("article")) || (tag.is("footer")) || (tag.is("figure")) {
385,9 → 379,8
return;
}
if (tag.is("p")) {
IF (oldtag[0] == 'h') || (streq(#oldtag,"td")) || (streq(#oldtag,"p")) return;
IF (tag.prior[0] == 'h') || (streq(#tag.prior,"td")) || (streq(#tag.prior,"p")) return;
NewLine();
//IF(tag.opened) NewLine();
return;
}
if (tag.is("br")) { NewLine(); return; }
/programs/cmm/TWB/img_cache.h
69,12 → 69,14
img_draw stdcall (pics[cur_pic].image, left1-5, top1, imgw, imgh,0,img_lines_first);
DrawBar(left1+imgw - 5, top1, WB1.list.w-imgw, imgh, page_bg);
DrawBar(WB1.list.x, top1+imgh, WB1.list.w, -imgh % WB1.list.item_h + WB1.list.item_h, page_bg);
/*
if (link)
{
//UnsafeDefineButton(left1 - 5, top1, imgw, imgh-1, PageLinks.count + 400 + BT_HIDE, 0xB5BFC9);
//PageLinks.AddText(0, imgw, imgh-1, NOLINE, 1);
//WB1.DrawPage();
UnsafeDefineButton(left1 - 5, top1, imgw, imgh-1, PageLinks.count + 400 + BT_HIDE, 0xB5BFC9);
PageLinks.AddText(0, imgw, imgh-1, NOLINE, 1);
WB1.DrawPage();
}
*/
}
 
ImageCache ImgCache;
/programs/cmm/TWB/parce_tag.h
2,6 → 2,7
struct _tag
{
char name[32];
char prior[32];
char params[5000];
bool opened;
collection attributes;
25,12 → 26,11
bool _tag::reset()
{
if (!name) return false;
strcpy(#prior, #name);
name = NULL;
opened = true;
attributes.drop();
values.drop();
attributes.add("ZERO");
values.add("NULL");
return true;
}