Aren/kolibrios
1
0
Fork 0
mirror of https://github.com/KolibriOS/kolibrios.git synced 2024-12-26 00:26:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

HTMLv 0.98.2: fixed FreeImageCache, <input> tag visualization only

Browse Source 
git-svn-id: svn://kolibrios.org@3129 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2012-12-21 13:15:04 +00:00
parent 2793582a69
commit f7ddaf37bd
3 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
programs/cmm/browser/TWB.h
View File

@ -8,7 +8,7 @@ dword
char download_path[]="/rd/1/.download"; char download_path[]="/rd/1/.download";
char search_path[]="http://nigma.ru/index.php?s="; char search_path[]="http://nigma.ru/index.php?s=";
char version[]=" Text-based Browser 0.98"; char version[]=" Text-based Browser 0.98.2";
struct TWebBrowser { struct TWebBrowser {
@ -730,10 +730,31 @@ void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
{ {
TextGoDown(left1, top1, width1); TextGoDown(left1, top1, width1);
TextGoDown(left1, top1 + 10, width1); TextGoDown(left1, top1 + 10, width1);
if (anchor) return;
IF(strcmp(#parametr, "color=") == 0) hr_color = GetColor(#options); IF(strcmp(#parametr, "color=") == 0) hr_color = GetColor(#options);
ELSE hr_color = 0x999999; ELSE hr_color = 0x999999;
IF(stroka > 0) DrawBar(left1, top1 + 14, width1 - 8, 1, hr_color); IF(stroka > 0) DrawBar(left1, top1 + 14, width1 - 8, 1, hr_color);
} }
if (!chTag("input"))
{
do{
if (!strcmp(#parametr, "type=")) if ((!strcmp(#options, "radio")) || (!strcmp(#options, "checkbox")))
{
if (!anchor) && (stroka > 0) CheckBox(stolbec*6 + left1,top1-2,10,10, 0, "\0", 0x888888, text_colors[text_color_index], 0);
stolbec+=2;
}
if (!strcmp(#parametr, "type=")) if ((!strcmp(#options, "text")) || (!strcmp(#options, "password")))
{
if (!anchor) && (stroka > 0) CheckBox(stolbec*6 + left1,top1-2,90,10, 0, "\0", 0x555555, 0, 0);
stolbec+=16;
}
if (!strcmp(#parametr, "type=")) if ((!strcmp(#options, "button")) || (!strcmp(#options, "file")) || (!strcmp(#options, "submit")))
{
if (!anchor) && (stroka > 0) DrawCaptButton(stolbec*6 + left1,top1-2,60,10, 0, 0xCCCccc, 0, "Button");
stolbec+=21;
}
} while(GetNextParam());
}
if (!chTag("img")) if (!chTag("img"))
{ {
Images( left1, top1, width1); Images( left1, top1, width1);
@ -794,8 +815,8 @@ void FreeImgCache()
int i; int i;
for (i=0; i<=num_of_pics; i++) for (i=0; i<=num_of_pics; i++)
{ {
mem_Free(pics[num_of_pics].image); img_destroy stdcall (pics[num_of_pics].image);
pics[num_of_pics].path=NULL; pics[num_of_pics].path = NULL;
} }
num_of_pics=0; num_of_pics=0;
} }
@ -816,7 +837,7 @@ void Images(int left1, top1, width1)
if (strcmpn(#img_path, "http:", 5)!=0) || (strcmpn(#options, "http:", 5)!=0) if (strcmpn(#img_path, "http:", 5)!=0) || (strcmpn(#options, "http:", 5)!=0)
{ {
img_path[strrchr(#img_path, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî / img_path[strrchr(#img_path, '/')] = '\0'; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
strcat(#img_path, #options); strcat(#img_path, #options);
cur_pic=GetOrSetPicNum(#img_path); cur_pic=GetOrSetPicNum(#img_path);

19
programs/cmm/browser/include/acid_0.1.htm
View File

@ -7,7 +7,7 @@
<body bgcolor="#000000" link="#0066FF" text="#FFFFFF"> <body bgcolor="#000000" link="#0066FF" text="#FFFFFF">
<img src="background.gif" alt="background"> <img name="2.1.4" src="background.gif" alt="background">
<b>Ýòî òåñòîâàÿ ñòðàíèöà äëÿ ïðîâåðêè HTML Viewer</b><br /> <b>Ýòî òåñòîâàÿ ñòðàíèöà äëÿ ïðîâåðêè HTML Viewer</b><br />
<br /> <br />
@ -53,15 +53,20 @@
</pre> </pre>
<!--ýòîãî òåêñòà çäåñü <íåò>--> <!--ýòîãî òåêñòà çäåñü <íåò>-->
<br>
<input type="text" size="30" /></label><br>
<label>Radio1: <input type="radio" name="sex" /></label>
<label>Radio2: <input type="radio" name="sex" /></label><br>
<br>
<font color=#777777> <font color=#777777>
<a href='/SYS/index.htm'>Index.htm</a><br> <a href='./index.htm'>./index.htm</a><br>
<a href='./index.htm'>Index.htm</a><br> <a href='/sys/index.htm'>Íåçàêðûòûé òåã à - index.htm<br>
<a href='/sys/index.htm'>Íåçàêðûòûé òåã à - Index.htm<br> <a href="/sys/kernel.mnt">kernel.mnt</a><br>
<a href="/sys/kernel.mnt">Kernel.mnt</a><br> <a href="#2.1.4">#2.1.4</a><br>
<a href="index.htm#2.1.4">index.htm#2.1.4</a><br>
<a href="http://bash.im">http://bash.im</a><br> <a href="http://bash.im">http://bash.im</a><br>
<a href="mailto:leency@mail.ru">Mail to leency</a><br> <a href="mailto:leency@mail.ru">Mail to leency</a><br>
<a href="#2.1.4">#2.1.4</a><br>
<a href="background.gif">Ôîíîâàÿ êàðòèíêà</a><br> <a href="background.gif">Ôîíîâàÿ êàðòèíêà</a><br>
</font> </font>
<a href='1111111111111111111111111111111111111111111111111111111111111111 <a href='1111111111111111111111111111111111111111111111111111111111111111

2
programs/cmm/browser/include/some_code.h
View File

@ -6,6 +6,8 @@
#define NEWTAB 304 #define NEWTAB 304
#define GOTOURL 305 #define GOTOURL 305
#define SEARCHWEB 306 #define SEARCHWEB 306
#define INPUT_CH 307
#define INPUT_BT 308
#define ID1 178 #define ID1 178
#define ID2 177 #define ID2 177