WebView 3.9

- new homepages
- fix clash on a wrong <kosicon> number
- set proper internal page sizes

programs/cmm/browser/TWB/set_style.h

@@ -270,11 +270,15 @@ void TWebBrowser::tag_h1234_caption()
 void TWebBrowser::tag_kosicon()
 {
 	dword imgbuf[44];
+	dword maxicon;
 	dword shared_i18 = memopen("ICONS18", NULL, SHM_READ);
+	maxicon = EDX / 18 / 18 / 4;
 	if (shared_i18) && (tag.get_number_of("n")) {
-		if (draw_x + 18 > canvas.bufw) NewLine();
-		canvas.DrawImage(draw_x, draw_y-2, 18, 18, 18*18*4*tag.number+shared_i18);
-		draw_x += 22;
+		if (tag.number < maxicon) {
+			if (draw_x + 18 > canvas.bufw) NewLine();
+			canvas.DrawImage(draw_x, draw_y-2, 18, 18, 18*18*4*tag.number+shared_i18);
+			draw_x += 22;			
+		}
 	}
 
 }

programs/cmm/browser/WebView.c

@@ -571,10 +571,10 @@ void OpenPage(dword _open_URL)
 		//INTERNAL PAGE
 		history.add(#new_url);
 		WB1.custom_encoding = -1;
-		if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home)-1);
-		else if (streq(#new_url, URL_SERVICE_TEST)) LoadInternalPage(#buildin_page_test, sizeof(buildin_page_test)-1);
+		if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home));
+		else if (streq(#new_url, URL_SERVICE_TEST)) LoadInternalPage(#buildin_page_test, sizeof(buildin_page_test));
 		else if (streq(#new_url, URL_SERVICE_HISTORY)) ShowHistory();
-		else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1);
+		else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 
 	} else if (!strncmp(#new_url,"http:",5)) || (!strncmp(#new_url,"https:",6)) {
 		//WEB PAGE
@@ -589,7 +589,7 @@ void OpenPage(dword _open_URL)
 
 		if (!http.transfer) {
 			history.add(#new_url);
-			LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1);
+			LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 		}
 	} else {
 		//LOCAL PAGE
@@ -712,7 +712,7 @@ void EventSubmitOmnibox()
 
 void LoadInternalPage(dword _bufdata, _in_bufsize){
 	if (!_bufdata) || (!_in_bufsize) {
-		LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1);
+		LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 	} else {
 		WB1.list.first = 0; //scroll page to the top
 		DrawOmnibox();

programs/cmm/browser/const.h

@@ -112,4 +112,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw";
 
 #define DEFAULT_URL URL_SERVICE_HOMEPAGE
 
-char version[]="WebView 3.85";
+char version[]="WebView 3.9";

programs/cmm/browser/res/homepage_en.htm

@@ -1,17 +1,49 @@
-<html>
-<head>
-<title>Homepage</title>
-</head>
-<body><pre>Welcome to WebView a Text-Based Browser. 
+<html><head><title>New tab</title></head>
+<body bgcolor=#fff>
 
-KolibriOS Bookmarks:
-1. <a href=//kolibrios.org>Homepage</a>
-2. <a href="//builds.kolibrios.org">Night-builds</a>
-3. <a href="//ftp.kolibrios.org">FTP Server</a>
+<table><tr><td width=20><td width=210><pre>
+ ___________________
+|# :             : #|
+|  :   WebView   :  |
+|  :  TextBased  :  |
+|  :   Browser   :  |
+|  :             :  |
+|  :_____________:  |
+|     ___________   |
+|    | __        |  |
+|    ||  |       |  |
+\____||__|_______|__|<font color=#DDD>lc</font>
 
-<font bg=#F8F15B>By the way,</font> 
+<font bg=#F8F15B> web <font bg=#FF5A7E color=#fff> 1.0 <font bg=#47D018> compatable
+<font bg=#3CE7FF>              </font></font></font></font>
+<td>
+
+</pre>
+<kosicon n=58><a href=//kolibrios.org>Homepage</a> &nbsp;
+<kosicon n=50><a href="//builds.kolibrios.org">Night-builds</a> &nbsp;
+<kosicon n=50><a href="//ftp.kolibrios.org">FTP Server</a>
+<pre>
+
+By the way,
 <font color="#555555">&bull; You can check for browser updates from the main menu.
-&bull; To run a web search, type a text in the adress box and press Ctrl+Enter. 
+&bull; To run a web search, type a text in the adress box and press Ctrl+Enter.
 &bull; Pressing F6 moves a text cursor to the omnibox.
-&bull; Click on a label in the bottom right corner to change the encoding of a page.
-</font>
+&bull; You can manually change the encoding of a page by clicking on a label in the bottom right corner.
+
+
+
+
+
+
+
+        ~+
+
+                 *       +
+           '                  |
+       ()    .-.,="``"=.    - o -
+             '=/_       \     |
+          *   |  '=._    |
+               \     `=./`,        '
+            .   '=.__.=' `='      *
+   +                         +
+        O      *        '       .<font color=#DDD>jgs</font>

programs/cmm/browser/res/homepage_ru.htm

@@ -1,15 +1,49 @@
-<html><head><meta charset="cp-866">
-<title>Домашняя страница</title></head>
-<body><pre>Добро пожаловать текстовый браузер WebView!
+<html><head><title>Новая вкладка</title></head>
+<body bgcolor=#fff>
 
-Ресурсы KolibriOS:<ol>
-<li><a href=//kolibrios.org>Официальный сайт</a>
-<li><a href="//builds.kolibrios.org">Ночные сборки</a>
-<li><a href="//ftp.kolibrios.org">FTP сервер</a></ol>
+<table><tr><td width=20><td width=210><pre>
+ ___________________
+|# :             : #|
+|  :   WebView   :  |
+|  :  Текстовый  :  |
+|  :   Браузер   :  |
+|  :             :  |
+|  :_____________:  |
+|     ___________   |
+|    | __        |  |
+|    ||  |       |  |
+\____||__|_______|__|<font color=#DDD>lc</font>
 
-<font bg=#F8F15B>Кстати,</font> 
+<font bg=#F8F15B> web <font bg=#FF5A7E color=#fff> 1.0 <font bg=#47D018> compatable
+<font bg=#3CE7FF>              </font></font></font></font>
+<td>
+
+</pre>
+<kosicon n=58><a href=//kolibrios.org>Официальный сайт</a> &nbsp;
+<kosicon n=50><a href="//builds.kolibrios.org">Ночные сборки</a> &nbsp;
+<kosicon n=50><a href="//ftp.kolibrios.org">FTP сервер</a>
+<pre>
+
+Кстати,
 <font color="#555555">&bull; Из главного меню можно проверить наличие обновлений
 &bull; Для поиска в Google наберите тест в адресной строке и нажмите Ctrl+Enter
 &bull; Клавиша F6 перемещает текстовый курсор в омнибокс.
 &bull; Можно изменить кодировку страницы, для этого нажмите на надпись в правом нижнем углу окна.
 
+
+
+
+
+
+
+        ~+
+
+                 *       +
+           '                  |
+       ()    .-.,="``"=.    - o -
+             '=/_       \     |
+          *   |  '=._    |
+               \     `=./`,        '
+            .   '=.__.=' `='      *
+   +                         +
+        O      *        '       .<font color=#DDD>jgs</font>