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

 //images
 #include "img\toolbar_icons.c"
 #include "img\URLgoto.txt";
 #ifdef LANG_RUS
-	char version[]=" ¥ªáâ®¢ë© ¡à ã§¥à 0.99.67";
+	char version[]=" ¥ªáâ®¢ë© ¡à ã§¥à 0.99.69";
 	?define IMAGES_CACHE_CLEARED "íè ª àâ¨®ª ®ç¨é¥"
 	?define T_LAST_SLIDE "â® ¯®á«¥¤¨© á« ©¤"
 	char loading[] = " £àã§ª  áâà ¨æë...
";
 	unsigned char page_not_found[] = FROM "html\page_not_found_ru.htm";
 	char accept_language[]= "Accept-Language: ru\n\0";
 #else
-	char version[]=" Text-based Browser 0.99.67";
+	char version[]=" Text-based Browser 0.99.69";
 	?define IMAGES_CACHE_CLEARED "Images cache cleared"
 	?define T_LAST_SLIDE "This slide is the last"
 	char loading[] = "Loading...
";
 	unsigned char page_not_found[] = FROM "html\page_not_found_en.htm";
 	char accept_language[]= "Accept-Language: en\n\0";
-#endif
-byte native_http=1;
+#endif
 proc_info Form;
 #define WIN_W 640
 int action_buf;
 dword http_transfer = 0;
-dword http_buffer;
-int	downloader_id;
+dword http_buffer;
+#include "..\TWB\TWB.c"
-#include "..\TWB\TWB.c"
+#include "menu_rmb.h"
-#include "menu_rmb.h"
+#include "history.h"
 		WaitEventTimeout(2);
 		switch(EAX & 0xFF)
+		{
 			CASE evMouse:
 				if (!CheckActiveProcess(Form.ID)) break;
+				//Edit URL
 				edit_box_mouse stdcall (#address_box);
 				m.get();
+				//Links hover
 				if (m.y>WB1.list.y) PageLinks.Hover(m.x, m.y, link_color_inactive, link_color_active, bg_color);
+				//Menu
 				if (m.y>WB1.list.y) && (m.y
+				{
 					if (m.pkm)
+					{
 						show_menu = 1;
 						SwitchToAnotherThread();
 						CreateThread(#menu_rmb,#stak+4092);
 						break;
+					}
+				}
+				//Mouse scroll
 				if (m.vert)
+				{
-					if (WB1.list.MouseScroll(m.vert)) WB1.Parse(bufpointer, bufsize);
+					if (WB1.list.MouseScroll(m.vert)) WB1.Parse();
+				}
+				//Drag scroller
 				if (!m.lkm) scroll_used=0;
 				if (m.x>=scroll_wv.start_x) && (m.x<=scroll_wv.start_x+scroll_wv.size_x)
 				&& (m.y>=scroll_wv.start_y+scroll_wv.btn_height) && (-scroll_wv.btn_height+scroll_wv.start_y+scroll_wv.size_y>m.y)
 				&& (WB1.list.count>WB1.list.visible) && (m.lkm)
+				{
 					scroll_used=1;
+				}
 				if (scroll_used)
+				{
 					half_scroll_size = WB1.list.h - 16 * WB1.list.visible / WB1.list.count - 3 /2;
 					if (half_scroll_size+WB1.list.y>m.y) || (m.y<0) || (m.y>4000) m.y=half_scroll_size+WB1.list.y;
 					btn=WB1.list.first;
 					WB1.list.first = m.y -half_scroll_size -WB1.list.y * WB1.list.count / WB1.list.h;
 					if (WB1.list.visible+WB1.list.first>WB1.list.count) WB1.list.first=WB1.list.count-WB1.list.visible;
-					if (btn<>WB1.list.first) WB1.Parse(bufpointer, bufsize);
+					if (btn<>WB1.list.first) WB1.Parse();
+				}
 				break;
 			case evButton:
 				btn=GetButtonID();
-				if (btn==1)
-				{
-					KillProcess(downloader_id);
-					ExitProcess();
+				if (btn==1)	ExitProcess();
-				}
-				ELSE
-				{
-					Scan(btn);
+				Scan(btn);
-				}
 				break;
 			case evKey:
 				key = GetKey();
 				_EDIT_MARK:
 				if (key<>0x0d) && (key<>183) && (key<>184) {EAX=key<<8; edit_box_key stdcall(#address_box);}
 				break;
 			case evReDraw:
-				if (action_buf) { Scan(action_buf); action_buf=0;}
+				if (action_buf) Scan(action_buf);
 				Draw_Window();
 				break;
 			case evNetwork:
 				if (http_transfer > 0) {
 					http_process stdcall (http_transfer);
+					$push EAX
-					$push EAX
+					ESI = http_transfer;
-					ESI = http_transfer;
+					if (o_bufpointer) o_bufpointer = free(o_bufpointer);
 					bufpointer = ESI.http_msg.content_ptr;
 					bufsize = ESI.http_msg.content_received;
-					WB1.Parse(bufpointer, bufsize);
+					WB1.Parse();
 					$pop EAX
+						{
 							Draw_Window();		// stop button => refresh button
+						}
+					}
+				}
-			default:
-				if (downloader_id<>0)
-				{
-					if (GetProcessSlot(downloader_id)<>0) break;
-					downloader_id=0;
-					WB1.list.first = WB1.list.count = 0;
-					WB1.ReadHtml(_WIN);
-					Draw_Window();
-				}
+		}
+	}
+}
+	}
 	if (Form.height<120) MoveSize(OLD,OLD,OLD,120);
 	if (Form.width<280) MoveSize(OLD,OLD,280,OLD);
 	PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal);
-	if (GetProcessSlot(downloader_id)<>0) || (http_transfer > 0) _PutImage(88,10, 24,24, #stop_btn);
+	if (http_transfer > 0) _PutImage(88,10, 24,24, #stop_btn);
 	DrawBar(200,0,Form.cwidth-200,43,0xE4DFE1);
 	DrawBar(0,42,Form.cwidth,1,0xE2DBDC);
 	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);
+}
-void Scan(int id)
+void ChangeCharset(byte new_charset)
+{
+	BufEncode(new_charset);
+	WB1.Parse();
+}
+void Scan(int id)
+{
+	action_buf=0;
+	if (id >= 400)
+	{
 		ProcessLinks(id);
-	if (id >= 400) ProcessLinks(id);
+		return;
+	}
 	switch (id)
-	{
 		case 011: //Ctrk+K
-			WB1.ReadHtml(_KOI);
+		case 011: //Ctrk+K
-			WB1.Parse(bufpointer, bufsize);
+			ChangeCharset(_KOI);
-			return;
 			return;
 		case 021: //Ctrl+U
-			WB1.ReadHtml(_UTF);
+		case 021: //Ctrl+U
-			WB1.Parse(bufpointer, bufsize);
-			return;
+			ChangeCharset(_UTF);
 			return;
-		case 004: //Ctrl+D
-			WB1.ReadHtml(_DOS);
-			WB1.Parse(bufpointer, bufsize);
+		case 004: //Ctrl+D
-			return;
+			ChangeCharset(_DOS);
 			return;
 		case 005: //Win encoding
-			WB1.ReadHtml(_WIN);
+		case 005: //Win encoding
-			WB1.Parse(bufpointer, bufsize);
+			ChangeCharset(_WIN);
 			return;
 		case 009: //free img cache
 		case FORWARD:
 			if (!BrowserHistory.GoForward()) return;
 			OpenPage();
 			return;
 		case 052:  //F3
+			if (strncmp(#URL,"http:",5)==0)
+			{
+				WriteFile(bufsize, bufpointer, "/tmp0/1/webview.tmp");
-			if (strncmp(#URL,"http:",5)<>0) RunProgram("/rd/1/tinypad", #URL);
+				if (EAX==0) RunProgram("/rd/1/tinypad", "/tmp0/1/webview.tmp");
+			}
+			else
+			{
-			else RunProgram("/rd/1/tinypad", #download_path);
+				RunProgram("/rd/1/tinypad", #URL);
+			}
 			return;
 		case 054: //F5
-			IF(address_box.flags & 0b10) WB1.Parse(bufpointer, bufsize);
+			IF(address_box.flags & 0b10) WB1.Parse();
 			return;
 		case REFRESH:
-			if (http_transfer<>0)
-			{
-				EAX = http_transfer;
-				EAX = EAX.http_msg.content_ptr;		// get pointer to data
-				$push	EAX							// save it on the stack
-				http_free stdcall (http_transfer);	// abort connection
-				$pop	EAX
-				mem_Free(EAX);						// free data
-				http_transfer=0;
-				bufsize = 0;
-			}
-			if (GetProcessSlot(downloader_id)<>0)
-			{
-				KillProcess(downloader_id);
-				pause(20);
-				Draw_Window();
-				return;
-			}
-			anchor_line_num=WB1.list.first;
-			anchor[0]='|';
+			if (http_transfer > 0) StopLoading();
-			OpenPage();
+			else OpenPage();
 			return;
 		case 014:
 		case 020:
 		case NEWTAB:
 		case 183: //PgDown
 			if (WB1.list.count < WB1.list.visible) return;
 			IF(WB1.list.first == WB1.list.count - WB1.list.visible) return;
 			WB1.list.first += WB1.list.visible + 2;
 			IF(WB1.list.visible + WB1.list.first > WB1.list.count) WB1.list.first = WB1.list.count - WB1.list.visible;
-			WB1.Parse(bufpointer, bufsize);
+			WB1.Parse();
 			return;
 		case 184: //PgUp
 			if (WB1.list.count < WB1.list.visible) return;
 			IF(WB1.list.first == 0) return;
 			WB1.list.first -= WB1.list.visible - 2;
 			IF(WB1.list.first < 0) WB1.list.first = 0;
-			WB1.Parse(bufpointer, bufsize);
+			WB1.Parse();
 			return;
 		case 178:
 		case BTN_UP:
 			if (WB1.list.first <= 0) return;
 			WB1.list.first--;
-			WB1.Parse(bufpointer, bufsize);
+			WB1.Parse();
 			return;
 		case 177:
 		case BTN_DOWN:
 			if (WB1.list.visible + WB1.list.first >= WB1.list.count) return;
 			WB1.list.first++;
-			WB1.Parse(bufpointer, bufsize);
+			WB1.Parse();
 			return;
 		case 180: //home
-			if (WB1.list.KeyHome()) WB1.Parse(bufpointer, bufsize);
+			if (WB1.list.KeyHome()) WB1.Parse();
 			return;
 		case 181: //end
 		notify(#URL);
 		strcpy(#editURL, BrowserHistory.CurrentUrl());
 		strcpy(#URL, BrowserHistory.CurrentUrl());
 		return;
+	}
 	OpenPage();
 	return;
+}
+void StopLoading()
+{
+	if (http_transfer<>0)
+	{
+		EAX = http_transfer;
+		EAX = EAX.http_msg.content_ptr;		// get pointer to data
+		$push	EAX							// save it on the stack
+		http_free stdcall (http_transfer);	// abort connection
+		$pop	EAX
+		mem_Free(EAX);						// free data
+		http_transfer=0;
+		bufsize = 0;
+	}
+	anchor_line_num=WB1.list.first;
+	anchor[0]='|';
+}
 void OpenPage()
 {
-	if (GetProcessSlot(downloader_id)<>0) PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal);
+	if (http_transfer<>0) PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal);
-	KillProcess(downloader_id);
+	StopLoading();
 	strcpy(#editURL, #URL);
 	BrowserHistory.AddUrl();
 	strcpy(#header, #version);
 	pre_text =0;
-	if (!strncmp(#URL,"http:",5))
-	{
+	WB1.list.ClearList();
-		if (native_http)
+	if (strncmp(#URL,"http:",5)==0)
+	{
-			http_get stdcall (#URL, #accept_language);
+		http_get stdcall (#URL, #accept_language);
+		http_transfer = EAX;
-			http_transfer = EAX;
+		cur_encoding = _DEFAULT;
+		IF (http_transfer < 0) notify("Error from HTTP lib");
+		Draw_Window();
-			IF (http_transfer < 0) notify("Error from HTTP lib");
+		return;
+	}
-		else
+	else
-		{
+	{
+		file_size stdcall (#URL);
+		bufsize = EBX;
-			KillProcess(downloader_id);
+		if (!bufsize) return;
+		mem_Free(bufpointer);
-			DeleteFile(#download_path);
+		cur_encoding = _DEFAULT;
+		if (o_bufpointer) o_bufpointer = free(o_bufpointer);
-			downloader_id = RunProgram("/sys/network/downloader", #URL);
+		bufpointer = mem_Alloc(bufsize);
-			IF (downloader_id<0) notify("Error running Downloader. Internet unavilable.");
+		ReadFile(0, bufsize, bufpointer, #URL);
-		}
-		Draw_Window();
-		return;
-	}
-	WB1.list.first = WB1.list.count =0;
 	WB1.ReadHtml(_WIN);
 	ShowPage();
+}
 	if (strcmp(#URL, URL_HISTORY)==0) ShowHistory(); else
 	if (!bufsize)
+	{
 		PageLinks.Clear();
+		if (http_transfer<>0)
-		if (GetProcessSlot(downloader_id)<>0)
+		{
+			WB1.Prepare(#loading, sizeof(loading));
 			WB1.Parse(#loading, sizeof(loading));
 		else
-			WB1.Parse(#page_not_found, sizeof(page_not_found));
+			WB1.Prepare(#page_not_found, sizeof(page_not_found));
+	}
 	else
-		WB1.Parse(bufpointer, bufsize);
+		WB1.Parse();
 	if (!header) strcpy(#header, #version);
-	if (!strcmp(#version, #header)) DrawTitle(#header);
-}
-ShowHistory()
-{
-		int i;
-		static int history_pointer;
-		free(history_pointer);
-		history_pointer = malloc(64000);
-		strcat(history_pointer, " HistoryHistory
");
-		strcat(history_pointer, "Visited pages

");
-		for (i=1; i
-		{
-			strcat(history_pointer, "");
-			strcat(history_pointer, BrowserHistory.GetUrl(i));
-			strcat(history_pointer, "
");
-		}
-		strcat(history_pointer, "Cached images

");
-		for (i=1; i
-		{
-			strcat(history_pointer, "
");
-			strcat(history_pointer, #pics[i].path);
 	if (!strcmp(#version, #header)) DrawTitle(#header);

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/HTMLv.c – Rev 4571 → 4636

History

Visited pages

Cached images