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

 _http http = {0, 0, 0, 0, 0, 0, 0};
 char homepage[] = FROM "html\\homepage.htm""\0";
 #ifdef LANG_RUS
-char version[]="¥ªáâ®¢ë© ¡à ã§¥à 1.74";
+char version[]="¥ªáâ®¢ë© ¡à ã§¥à 1.8";
 ?define IMAGES_CACHE_CLEARED "íè ª àâ¨®ª ®ç¨é¥"
 ?define T_LAST_SLIDE "â® ¯®á«¥¤¨© á« ©¤"
 char loading[] = " £àã§ª  áâà ¨æë...
";
 ¥¥¤¦¥à § £àã§®ª";
 char link_menu[] =
 "®¯¨à®¢ âì ááë«ªã
 ª ç âì á®¤¥à¦¨¬®¥ ááë«ª¨";
 #else
-char version[]="Text-based Browser 1.74";
+char version[]="Text-based Browser 1.8";
 ?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""\0";
 char accept_language[]= "Accept-Language: en\n";
 dword STATUSBAR_H = 15;
 dword col_bg;
 dword panel_color;
 dword border_color;
+bool debug_mode = false;
+bool old_tag_parser_mode = false;
 progress_bar wv_progress_bar;
 bool souce_mode = false;
 bool open_in_a_new_window = false;
 	VIEW_SOURCE=1100,
 	EDIT_SOURCE,
 	VIEW_HISTORY,
 	//FREE_IMG_CACHE,
 	DOWNLOAD_MANAGER,
-	COPY_LINK=1200,
+	COPY_LINK_URL=1200,
 	DOWNLOAD_LINK_CONTENTS,
 };
 #include "..\TWB\TWB.c"
 edit_box address_box = {250,60,30,0xffffff,0x94AECE,0xffffff,0xffffff,0x10000000,sizeof(URL),#editURL,#mouse_twb,2,19,19};
-void main()
 void main()
 	CursorPointer.Load(#CursorFile);
 	load_dll(boxlib, #box_lib_init,0);
 	load_dll(libio, #libio_init,1);
 	load_dll(libimg, #libimg_init,1);
 	loop() switch(WaitEvent())
+	{
 		case evMouse:
 			edit_box_mouse stdcall (#address_box);
 			mouse.get();
-			if (WB1.list.MouseOver(mouse.x, mouse.y))
-			{
-				if (PageLinks.HoverAndProceed(mouse.x, WB1.list.first + mouse.y))
+			if (PageLinks.HoverAndProceed(mouse.x, WB1.list.first + mouse.y))
-				&& (bufsize) && (mouse.pkm) && (mouse.up) {
+			&& (bufsize) && (mouse.pkm) && (mouse.up) {
-					EventShowPageMenu(mouse.x, mouse.y);
+				if (WB1.list.MouseOver(mouse.x, mouse.y)) EventShowPageMenu(mouse.x, mouse.y);
-					break;
+				break;
+			}
-				if (WB1.list.MouseScroll(mouse.vert)) WB1.DrawPage();
+			if (WB1.list.MouseScroll(mouse.vert)) WB1.DrawPage();
-			}
 			scrollbar_v_mouse (#scroll_wv);
 			if (WB1.list.first != scroll_wv.position)
+			{
 				WB1.list.first = scroll_wv.position;
 				WB1.DrawPage();
 				if (http.receive_result == 0) {
 					// Handle redirects
 					if (http.status_code >= 300) && (http.status_code < 400)
+					{
 						redirected++;
-						if (redirected<=5)
+						if (redirected>5)
-						{
-							if (http.handle_redirect()) {
-								if (!strncmp(#URL,"https://",8))
+						{
-									history.back();
-									strcpy(#editURL, history.current());
-									strcpy(#URL, history.current());
+							notify("'Too many redirects.' -E");
-									ShowErrorMessageThatHttpsIsNotSupportedYet();
-									StopLoading();
+							StopLoading();
-									break;
-								}
-							}
+						}
 						else
+						{
-							notify("Too many redirects");
+							http.handle_redirect();
-							StopLoading();
-							break;
-						}
-					}
-					else
-					{
-						redirected = 0;
-					}
-					// Loading the page is complete, free resources
-					if (redirected>0)
-					{
-						http.free();
+							http.free();
-						GetAbsoluteURL(#URL);
+							GetAbsoluteURL(#http.redirect_url);
-						history.back();
+							history.back();
-						strcpy(#editURL, #URL);
+							strcpy(#editURL, #URL);
-						DrawEditBoxWebView();
+							DrawEditBoxWebView();
-						OpenPage();
+							OpenPage();
+						}
-					else
+						break;
-					{
+					}
+					redirected = 0;
+					// Loading the page is complete, free resources
-						history.add(#URL);
+					history.add(#URL);
-						ESI = http.transfer;
-						bufpointer = ESI.http_msg.content_ptr;
+					bufpointer = http.content_pointer;
-						bufsize = ESI.http_msg.content_received;
+					bufsize = http.content_received;
-						http.free();
+					http.free();
-						SetPageDefaults();
+					SetPageDefaults();
-						ShowPage();
+					ShowPage();
+				}
+			}
+	}
+}
-}
 void SetElementSizes()
+{
 	address_box.top = TOOLBAR_H/2-10;
 	DefineButton(address_box.left+address_box.width+1, address_box.top-3, 16, skin.h-1, REFRESH_BUTTON+BT_HIDE+BT_NOFRAME, 0);
 	DefineButton(Form.cwidth-27, address_box.top-3, 23, skin.h-1, SANDWICH_BUTTON+BT_HIDE, 0);
 	img_draw stdcall(skin.image, Form.cwidth-24, address_box.top-3, 17, skin.h, 87, 0);
 	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();
-	if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBoxWebView(); }
+		DrawEditBoxWebView();
+	}
 	DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x, scroll_wv.size_y-1, scroll_wv.bckg_col);
 	DrawProgress();
+}
 				OpenPage();
+			}
 			return;
 		case GOTOURL_BUTTON:
 		case SCAN_CODE_ENTER:
+			if (!editURL[0]) {
+				strcpy(#URL, URL_SERVICE_HOME);
+			}
-			if (!strncmp(#editURL,"http:",5)) || (editURL[0]=='/')
+			else if (!strncmp(#editURL,"http:",5)) || (editURL[0]=='/')
 			|| (!strncmp(#editURL,"https:",6)) || (!strncmp(#editURL,"WebView:",8))
+			{
 				strcpy(#URL, #editURL);
+			}
 			else
 			WB1.list.first = 0;
 			ShowSource();
 			WB1.LoadInternalPage(bufpointer, bufsize);
 			break;
 		case EDIT_SOURCE:
-			if (!strncmp(#URL,"http:",5))
+			if (!strncmp(#URL,"http",4))
+			{
 				CreateFile(bufsize, bufpointer, "/tmp0/1/WebView_tmp.htm");
 				if (!EAX) RunProgram("/rd/1/tinypad", "/tmp0/1/WebView_tmp.htm");
+			}
 			else RunProgram("/rd/1/tinypad", #URL);
 			if (!downloader_opened) {
 				downloader_edit = NULL;
 				CreateThread(#Downloader,#downloader_stak+4092);
+			}
 			return;
-		case COPY_LINK:
+		case COPY_LINK_URL:
 			Clipboard__CopyText(PageLinks.GetURL(PageLinks.active));
 			notify("'URL copied to clipboard'O");
 			return;
 		case DOWNLOAD_LINK_CONTENTS:
 			if (!downloader_opened) {
 				strcpy(#downloader_edit, PageLinks.GetURL(PageLinks.active));
 				CreateThread(#Downloader,#downloader_stak+4092);
+			}
 			return;
+		case SCAN_CODE_F12:
+			debug_mode ^= 1;
+			if (debug_mode) notify("'Debug mode ON'-I");
+			else notify("'Debug mode OFF'-I");
+			return;
+		case SCAN_CODE_F11:
+			old_tag_parser_mode ^= 1;
+			if (old_tag_parser_mode) notify("'Old tag parser ON'-I");
+			else notify("'Old tag parser OFF'-I");
+			return;
+	}
+}
 void StopLoading()
 	if (o_bufpointer) o_bufpointer = free(o_bufpointer);
+}
 void OpenPage()
+{
 	char getUrl[sizeof(URL)];
 	StopLoading();
 	souce_mode = false;
 	strcpy(#editURL, #URL);
 	history.add(#URL);
 		if (!strcmp(#URL, URL_SERVICE_HOME)) WB1.LoadInternalPage(#homepage, sizeof(homepage));
 		else if (!strcmp(#URL, URL_SERVICE_HISTORY)) ShowHistory();
 		DrawEditBoxWebView();
 		return;
+	}
-	if (!strncmp(#URL,"http:",5))
+	if (!strncmp(#URL,"http:",5)) || (!strncmp(#URL,"https://",8))
+	{
 		img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-3, 17, skin.h, 131, 0);
+		if (!strncmp(#URL,"http:",5)) {
-		http.get(#URL);
+			http.get(#URL);
+		}
+		if (!strncmp(#URL,"https://",8)) {
+			sprintf(#getUrl, "http://gate.aspero.pro/?site=%s", #URL);
+			http.get(#getUrl);
+		}
+		//http.get(#URL);
 		if (!http.transfer)
+		{
 			StopLoading();
 			bufsize = 0;
 			bufpointer = free(bufpointer);
 void ShowPage()
-{
 	DrawEditBoxWebView();
-	debugval("bufsize", bufsize);
+	DrawEditBoxWebView();
 	if (!bufsize)
+	{
 		if (http.transfer) WB1.LoadInternalPage(#loading, sizeof(loading));
 	$and wv_progress_bar.progress_color, 0x00ffffff
+}
 void DrawProgress()
 {
-	unsigned long btn;
+	dword persent;
 	if (http.transfer == 0) return;
-	if (wv_progress_bar.max) btn = address_box.width*wv_progress_bar.value/wv_progress_bar.max; else btn = 30;
+	if (wv_progress_bar.max) persent = wv_progress_bar.value*100/wv_progress_bar.max; else persent = 10;
-	DrawBar(address_box.left-2, address_box.top+20, btn, 2, wv_progress_bar.progress_color);
+	DrawBar(address_box.left-2, address_box.top+20, persent*address_box.width/100, 2, wv_progress_bar.progress_color);
+}
 	if (http.transfer > 0)
+	{
 		StopLoading();
 		history.back();
+	}
 	strcpy(#URL, PageLinks.GetURL(PageLinks.active));
 	//#1
 	if (URL[0] == '#')
+	{
 		if (URL[1] == NULL) {
 		strcpy(#editURL, history.current());
 		strcpy(#URL, history.current());
 		return;
+	}
-	if (!strncmp(#URL,"https://",8))
-	{
-		ShowErrorMessageThatHttpsIsNotSupportedYet();
-		strcpy(#editURL, history.current());
-		strcpy(#URL, history.current());
-		return;
-	}
 	GetAbsoluteURL(#URL);
-	if (strncmp(#URL,"http://",7)!=0)
+	if (strncmp(#URL,"http://",7)!=0) && (strncmp(#URL,"https://",8)!=0)
+	{
 		if (UrlExtIs(".htm")!=true) && (UrlExtIs(".html")!=true)
+		{
 	menu.show(Form.left+_left-6,Form.top+_top+skin_height+3, 220, #rmb_menu, VIEW_SOURCE);
+}
 void EventShowLinkMenu(dword _left, _top)
 {
-	menu.show(Form.left+_left-6,Form.top+_top+skin_height+3, 220, #link_menu, COPY_LINK);
+	menu.show(Form.left+_left-6,Form.top+_top+skin_height+3, 220, #link_menu, COPY_LINK_URL);
+}
 void EventUpdateProgressBar()
 		wv_progress_bar.value = http.content_received;
 		DrawProgress();
+	}
+}
-void ShowErrorMessageThatHttpsIsNotSupportedYet()
-{
-	notify("'HTTPS protocol is not supported yet' -E");
-}
 DrawStatusBar(dword _status_text)
+{
 	status_text.start_x = wv_progress_bar.left + wv_progress_bar.width + 10;
 	status_text.start_y = Form.cheight - STATUSBAR_H + 3;

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/WebView.c – Rev 7281 → 7282