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

 	#include "lang.h--"
 #endif
 //libraries
-#define MEMSIZE 0x100000
-#include "..\lib\kolibri.h"
+#define MEMSIZE 0x100000
 #include "..\lib\strings.h"
 #include "..\lib\gui.h"
 #include "..\lib\encoding.h"
 #include "..\lib\file_system.h"
-#include "..\lib\mem.h"
-#include "..\lib\dll.h"
+#include "..\lib\mem.h"
 #include "..\lib\draw_buf.h"
 #include "..\lib\list_box.h"
 #include "..\lib\cursor.h"
 	char loading[] = "Loading...
";
 	char page_not_found[] = FROM "html\page_not_found_en.htm";
 	char accept_language[]= "Accept-Language: en\n";
 #endif
 proc_info Form;
 #define WIN_W 799
 #define WIN_H 559
 	OpenPage();
 	CreateDir("/tmp0/1/downloads");
-	SetEventMask(0xa7);
-	loop()
+	SetEventMask(0xa7);
 	BEGIN_LOOP_APPLICATION:
 		WaitEventTimeout(2);
 		switch(EAX & 0xFF)
+		{
 				//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)
+					if (m.pkm) && (m.up)
+					{
-						show_menu = 1;
-					}
-					if (!m.pkm) && (show_menu)
-					{
-						show_menu = 0;
 						SwitchToAnotherThread();
 						CreateThread(#menu_rmb,#stak+4092);
 						break;
+					}
+				}
 					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();
+					if (btn!=WB1.list.first) WB1.Parse();
+				}
 				break;
 			case evButton:
 				btn=GetButtonID();
 				if (btn==1)	ExitProcess();
 			case evKey:
 				key = GetKey();
 				if (address_box.flags & 0b10)
+				{
 					if (key==ASCII_KEY_ENTER) Scan(key); else
-					if (key<>0x0d) && (key<>183) && (key<>184) {EAX=key<<8; edit_box_key stdcall(#address_box);}
+					if (key!=0x0d) && (key!=183) && (key!=184) {EAX=key<<8; edit_box_key stdcall(#address_box);}
+				}
 				else Scan(key);
 				break;
 							Draw_Window();		// stop button => refresh button
+						}
+					}
+				}
+		}
-	}
+	goto BEGIN_LOOP_APPLICATION;
+}
 void SetElementSizes()
+{
 			OpenPage();
 			return;
 		case 006: //download manager
 			if (!downloader_opened) {
-				strcpy(#DL_URL, "http://");
+				strncpy(#DL_URL, "http://",7);
 				CreateThread(#Downloader,#downloader_stak+4092);
+			}
 			return;
 			WB1.list.first = 0;
 			ShowSource();
 			WB1.Parse();
 			break;
 		case 053: //F4
-			if (strncmp(#URL,"http:",5)==0)
+			if (!strncmp(#URL,"http:",5))
+			{
 				WriteFile(bufsize, bufpointer, "/tmp0/1/WebView_tmp.htm");
-				if (EAX==0) RunProgram("/rd/1/tinypad", "/tmp0/1/WebView_tmp.htm");
+				if (!EAX) RunProgram("/rd/1/tinypad", "/tmp0/1/WebView_tmp.htm");
-			}
-			else
-			{
-				RunProgram("/rd/1/tinypad", #URL);
+			}
+			else RunProgram("/rd/1/tinypad", #URL);
 			return;
 		case 054: //F5
 			IF(address_box.flags & 0b10) return;
 		case REFRESH:
 			if (http_transfer > 0)
 			RunProgram(#program_path, #URL);
 			return;
 		case GOTOURL:
 		case 0x0D: //enter
 			if (!editURL[0]) return;
-			if ((strncmp(#editURL,"http:",5)!=0) && (editURL[0]!='/') && ((strncmp(#editURL,"WebView:",8)!=0))
+			if (strncmp(#editURL,"http:",5)) && (editURL[0]!='/') && (strncmp(#editURL,"WebView:",9)) strncpy(#URL,"http://",7);
-			{
-				strcpy(#URL,"http://");
-			}
 			else
 				URL[0] = 0;
 			strcat(#URL, #editURL);
 			OpenPage();
 			return;
 		case SEARCHWEB:
-			strcpy(#URL, #search_path);
+			sprintf(#URL,"%s%s",#search_path,#editURL);
-			strcat(#URL, #editURL);
 			OpenPage();
 			return;
 		case 183: //PgDown
 	strcpy(#URL, PageLinks.GetURL(id-401));
 	//$1 - Condition Script
 	if (URL[0] == '$')
+	{
 		if (URL[1]=='-') && (condition_href) condition_href--;
-		if (URL[1]=='+')
+		else if (URL[1]=='+')
+		{
 			if (condition_href
+		}
-		if (URL[1]!='-') && (URL[1]!='+') condition_href = atoi(#URL+1);
+		else condition_href = atoi(#URL+1);
 		strcpy(#URL, BrowserHistory.CurrentUrl());
 		ShowPage();
 		return;
+	}
 	//#1
 	if (UrlExtIs(".png")==1) || (UrlExtIs(".gif")==1) || (UrlExtIs(".jpg")==1) || (UrlExtIs(".zip")==1) || (UrlExtIs(".kex")==1)
 	|| (UrlExtIs(".7z")==1) || (UrlExtIs("netcfg")==1)
+	{
 		//notify(#URL);
-		if (strcmpn(#URL,"http://", 7)==0)
+		if (!strncmp(#URL,"http://", 7))
+		{
 			strcpy(#DL_URL, #URL);
 			CreateThread(#Downloader,#downloader_stak+4092);
-		}
-		else
-		{
+		}
-			RunProgram("@open", #URL);
 		else RunProgram("@open", #URL);
 		strcpy(#editURL, BrowserHistory.CurrentUrl());
 		strcpy(#URL, BrowserHistory.CurrentUrl());
 		return;
 	}
-	if (!strcmpn(#URL,"mailto:", 7))
+	if (!strncmp(#URL,"mailto:", 7))
+	{
 		notify(#URL);
 		strcpy(#editURL, BrowserHistory.CurrentUrl());
 		strcpy(#URL, BrowserHistory.CurrentUrl());
 	return;
+}
 void StopLoading()
 {
-	if (http_transfer<>0)
+	if (http_transfer)
+	{
 		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
+		free(EAX);						// free data
 		http_transfer=0;
 		bufsize = 0;
-		bufpointer = mem_Free(bufpointer);
+		bufpointer = free(bufpointer);
+	}
 	wv_progress_bar.value = 0;
 	img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-2, 17, skin.h, 52, 0);
+{
 	StopLoading();
 	souce_mode = false;
 	strcpy(#editURL, #URL);
 	BrowserHistory.AddUrl();
-	if (strncmp(#URL,"WebView:",8)==0)
+	if (!strncmp(#URL,"WebView:",8))
+	{
 		SetPageDefaults();
-		if (strcmp(#URL, URL_SERVICE_HOME)==0)
-		{
-			WB1.Prepare(#homepage, sizeof(homepage));
+		if (!strcmp(#URL, URL_SERVICE_HOME)) WB1.Prepare(#homepage, sizeof(homepage));
-		}
-		if (strcmp(#URL, URL_SERVICE_HISTORY)==0)
+		else if (!strcmp(#URL, URL_SERVICE_HISTORY)) ShowHistory();
-		{
-			ShowHistory();
-		}
 		return;
+	}
-	if (strncmp(#URL,"http:",5)==0)
+	if (!strncmp(#URL,"http:",5))
+	{
 		img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-2, 17, skin.h, 131, 0);
 		http_get stdcall (#URL, 0, 0, #accept_language);
 		http_transfer = EAX;
-		if (http_transfer == 0)
+		if (!http_transfer)
+		{
 			StopLoading();
 			bufsize = 0;
-			bufpointer = mem_Free(bufpointer);
+			bufpointer = free(bufpointer);
 			ShowPage();
 			return;
+		}
+	}
 	else
+	{
 		file_size stdcall (#URL);
 		bufsize = EBX;
 		if (bufsize)
+		{
-			mem_Free(bufpointer);
+			free(bufpointer);
-			bufpointer = mem_Alloc(bufsize);
+			bufpointer = malloc(bufsize);
 			SetPageDefaults();
 			ReadFile(0, bufsize, bufpointer, #URL);
 			//ShowSource();
+		}
 		ShowPage();
+{
 	DrawEditBox();
 	if (!bufsize)
+	{
 		PageLinks.Clear();
-		if (http_transfer<>0)
+		if (http_transfer)
+		{
 			WB1.Prepare(#loading, sizeof(loading));
+		}
 		else
 			WB1.Prepare(#page_not_found, sizeof(page_not_found));
 	if (!strcmp(#version, #header)) DrawTitle(#header);
+}
 byte UrlExtIs(dword ext)
 {
+	if (!strcmpi(#URL + strlen(#URL) - strlen(ext), ext)) return true;
-	if (strcmpi(#URL + strlen(#URL) - strlen(ext), ext)==0) return 1; else return 0;
+	return false;
-}
+}
 stop:

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c @ 5640 – Rev 5626 → 5631