WebSVN – Kolibri OS – Diff – /programs/cmm/browser/WebView.c

 #ifndef AUTOBUILD
 	#include "lang.h--"
 #endif
 //libraries
-#define MEMSIZE 1060000
+#define MEMSIZE 4096 * 256
 #include "..\lib\gui.h"
 #include "..\lib\draw_buf.h"
 #include "..\lib\list_box.h"
 #include "..\lib\cursor.h"
-#include "..\lib\collection.h"
-#include "..\lib\font.h"
+#include "..\lib\collection.h"
 #include "..\lib\menu.h"
 //*.obj libraries
 //useful patterns
 #include "..\lib\patterns\libimg_load_skin.h"
 #include "..\lib\patterns\history.h"
 #include "..\lib\patterns\http_downloader.h"
-char homepage[] = FROM "html\\homepage.htm";
+char homepage[] = FROM "html\\homepage.htm""\0";
 #ifdef LANG_RUS
-char version[]=" ¥ªáâ®¢ë© ¡à ã§¥à 1.49";
+char version[]="¥ªáâ®¢ë© ¡à ã§¥à 1.5";
 ?define IMAGES_CACHE_CLEARED "íè ª àâ¨®ª ®ç¨é¥"
 ?define T_LAST_SLIDE "â® ¯®á«¥¤¨© á« ©¤"
 char loading[] = " £àã§ª  áâà ¨æë...
";
-char page_not_found[] = FROM "html\page_not_found_ru.htm";
+char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0";
 char accept_language[]= "Accept-Language: ru\n";
 char rmb_menu[] =
 "®á¬®âà¥âì ¨áå®¤¨ª
 ¥¤ ªâ¨à®¢ âì ¨áå®¤¨ª
 áâ®à¨ï
 ç¨áâ¨âì ªíè ª àâ¨®ª
 ¥¥¤¦¥à § £àã§®ª";
 #else
-char version[]=" Text-based Browser 1.49";
+char version[]="Text-based Browser 1.5";
 ?define IMAGES_CACHE_CLEARED "Images cache cleared"
 ?define T_LAST_SLIDE "This slide is the last"
 char loading[] = "Loading...
";
-char page_not_found[] = FROM "html\page_not_found_en.htm";
+char page_not_found[] = FROM "html\\page_not_found_en.htm""\0";
 char accept_language[]= "Accept-Language: en\n";
 char rmb_menu[] =
 "View source
 edit_box address_box = {250,56,34,0xffffff,0x94AECE,0xffffff,0xffffff,0,sizeof(URL),#editURL,#mouse_twb,2,19,19};
-void main()
-{
-	dword btn;
-	int half_scroll_size;
+void main()
 	int scroll_used=0, show_menu;
 	CursorPointer.Load(#CursorFile);
 	load_dll(boxlib, #box_lib_init,0);
 	load_dll(libio, #libio_init,1);
 	CreateDir("/tmp0/1/downloads");
 	if (param) strcpy(#URL, #param); else strcpy(#URL, URL_SERVICE_HOME);
 	WB1.DrawBuf.zoom = 1;
 	WB1.list.SetFont(8, 14, 10011000b);
 	WB1.list.no_selection = true;
-	label.init(DEFAULT_FONT);
 	SetEventMask(0xa7);
 	BEGIN_LOOP_APPLICATION:
 		WaitEventTimeout(2);
 		switch(EAX & 0xFF)
+		{
 					break;
+				}
 				break;
 			case evButton:
-				btn=GetButtonID();
-				if (btn==1)	ExitProcess();
-				Scan(btn);
+				ProcessEvent(GetButtonID());
 				break;
 			case evKey:
 				GetKeys();
 				if (address_box.flags & 0b10)
+				{
-					if (key_ascii == ASCII_KEY_ENTER) Scan(key_scancode); else {
+					if (key_ascii == ASCII_KEY_ENTER) ProcessEvent(key_scancode); else {
 						EAX = key_editbox;
 						edit_box_key stdcall(#address_box);
+					}
+				}
+				else
-				else
+				{
 					if (WB1.list.ProcessKey(key_scancode)) WB1.DrawPage();
-					Scan(key_scancode);
+					else ProcessEvent(key_scancode);
+				}
 				break;
 			case evReDraw:
 				if (menu.list.cur_y) {
-					Scan(menu.list.cur_y);
+					ProcessEvent(menu.list.cur_y);
 					menu.list.cur_y = 0;
+				}
 									ESI = EAX;
 									EDI = #URL;
 									do {
 										$lodsb;
 										$stosb;
-									} while (AL != 0) && (AL != 13) && (AL != 10));
+									} while (AL != 0) && (AL != 13) && (AL != 10);
 									DSBYTE[EDI-1]='\0';
+								}
+							}
 							else
+							{
 		Form.cheight - TOOLBAR_H - STATUSBAR_H, WB1.list.font_h + WB1.DrawBuf.zoom + WB1.DrawBuf.zoom * WB1.DrawBuf.zoom);
 	WB1.list.wheel_size = 7;
 	WB1.list.column_max = WB1.list.w - scroll_wv.size_x / WB1.list.font_w;
 	WB1.list.visible = WB1.list.h - 5 / WB1.list.item_h;
 	if (WB1.list.w!=WB1.DrawBuf.bufw) {
-		WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 4096 * 7400 / WB1.list.w);
+		if (WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 2048 * WB1.list.item_h) == false)
+		die("Memory allocation error! Seems to be too little RAM.");
-		Scan(REFRESH_BUTTON);
+		ProcessEvent(REFRESH_BUTTON);
+	}
+}
 void Draw_Window()
 void Draw_Window()
 	int list__w, list__h;
 	DrawBar(0,0, Form.cwidth,TOOLBAR_H-2, panel_color);
 	DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, 0xD7D0D3);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color);
 	if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBoxWebView(); }
 	DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x, scroll_wv.size_y-1, scroll_wv.bckg_col);
 	DrawProgress();
-	/*
-	list__w = 200;
-	list__h = 200;
-	label.raw_size = 0;
-	label.write_buf(10,10, list__w, list__h, 0xFFFFFF, 0, 11, "Hello World!");
-	label.write_buf(10,23, list__w, list__h, 0xFFFFFF, 0xFF00FF, 12, "How are you?");
-	label.write_buf(11,40, list__w, list__h, 0xFFFFFF, 0x2E74BB, 15, "Fine");
-	label.apply_smooth();
-	label.show_buf(0,0);
-	*/
+}
-void Scan(dword id__)
-{
-	action_buf=0;
+void ProcessEvent(dword id__)
 	if (WB1.list.ProcessKey(id__)) WB1.DrawPage();
+	switch (id__)
+	{
+		case 1:
-	else switch (id__)
+			ExitProcess();
 			return;
 		case SCAN_CODE_BS:
 		case BACK_BUTTON:
 			if (history.back()) {

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c – Rev 6686 → 6698