fix clicking on url ".."

- fix case when filename=file.ext without quotes;
- add invisible option "-i"

programs/cmm/browser/TWB/render.h

@@ -160,8 +160,11 @@ bool TWebBrowser::RenderImage(dword cur_img)
 
 	if (img_y + img_h >= canvas.bufh) canvas.IncreaseBufSize();
 
-	if (secondrun) 
+	if (secondrun)
 	{	
+		if (bg_colors.get_last() - bg_colors.get(0)) {
+			canvas.DrawBar(draw_x, draw_y, img_w, list.item_h, bg_colors.get_last());
+		}
 		if (ESDWORD[cur_img+20] != IMAGE_BPP32) {
 			img_convert stdcall(cur_img, 0, IMAGE_BPP32, 0, 0);
 			$push eax

programs/cmm/browser/TWB/set_style.h

@@ -304,6 +304,9 @@ void TWebBrowser::tag_img()
 {
 	char img_path[4096]=0;
 	dword base64img;
+	dword img_data=0, img_size=0;
+
+	if (!secondrun) return;
 
 	if (!tag.get_value_of("data-large-image")) 
 		if (!tag.get_value_of("data-src")) 
@@ -334,16 +337,22 @@ void TWebBrowser::tag_img()
 		if (EAX) goto IMGOK; else goto NOIMG;
 	}
 
-	if (cache.has(#img_path)) {
+	if (cache2.is_contain(#img_path)) 
-		img_decode stdcall (cache.current_buf, cache.current_size, 0);
+	{
-		if (EAX) goto IMGOK; else goto NOIMG;
+		read_file(cache2.path.get(cache2.cur), #img_data, #img_size);
+		if (img_size) {
+			img_decode stdcall (img_data, img_size, 0);
+			if (EAX) goto IMGOK;
+		} else {
+			//cache2.url.set_null(cache2.cur);
+		}
 	} else {
 		if (img_url.get_pos_by_name(#img_path)==-1) img_url.add(#img_path);
-		goto NOIMG;
 	}
+	goto NOIMG;
 
 IMGOK:
-	if (RenderImage(EAX)) return;
+	if (RenderImage(EAX)) goto IMG_END;
 
 NOIMG:
 	if (tag.get_value_of("title")) || (tag.get_value_of("alt")) {
@@ -361,6 +370,8 @@ NOIMG:
 	RenderTextbuf();
 	style.image = false;
 	text_colors.pop();
+IMG_END:
+	free(img_data);
 }
 
 struct TABLE {

programs/cmm/browser/WebView.c

@@ -78,7 +78,6 @@ char search_engine[256];
 #include "settings.h"
 #include "tabs.h"
 
-dword cur_img_url;
 dword shared_url;
 dword http_get_type=PAGE;
 dword render_start_time;
@@ -91,6 +90,10 @@ char editURL[URL_SIZE+1];
 edit_box omnibox_edit = {250, 0, 0, 0xffffff,
 	0x94AECE, 0xffffff, 0xffffff,0x10000000,URL_SIZE-2,#editURL,0,,19,19};
 
+int   img_downloaders[256];
+int   img_downloaders_count = 0;
+bool  img_loading = false;
+
 //===================================================//
 //                                                   //
 //                       CODE                        //
@@ -140,8 +143,9 @@ void main()
 	LoadLibraries();
 	LoadIniConfig();
     HandleParam();
+	cache2.load();
 
-	omnibox_edit.left = PADDING+TSZE*2+PADDING+6;
+	omnibox_edit.left = PADDING+TSZE*3+PADDING+8;
 	omnibox_edit.top = PADDING+3;
 
 	WB1.list.SetFont(8, 14, 10011000b);
@@ -202,9 +206,8 @@ void main()
 			break;
 
 		case evReDraw:
-			DefineAndDrawWindow(GetScreenWidth()-WIN_W/2-random(80),GetScreenHeight()-WIN_H/2-random(80),
+			DefineAndDrawWindow(GetScreenWidth()-WIN_W/2-random(80),
-			//DefineAndDrawWindow(0,0,
+				skin_h-WIN_H/2-random(80),WIN_W,WIN_H,0x73,0,0,0);
-				WIN_W,WIN_H,0x73,0,0,0);
 			GetProcessInfo(#Form, SelfInfo);
 			ProcessMenuClick();
 			sc.get();
@@ -217,12 +220,13 @@ void main()
 		case evNetwork:
 			if (http.transfer <= 0) break;
 			http.receive();
-
 			if (http.receive_result != 0) break;
+
 			if (debug_mode) {
 				EAX = http.transfer;
 				debugln(#EAX.http_msg.http_header);
 			}
+
 			if (http.status_code >= 300) && (http.status_code < 400)
 			{
 				// Handle redirects
@@ -232,7 +236,6 @@ void main()
 				} else {
 					StopLoading();
 					redirect_count = 0;
-					if (http_get_type==IMG) goto _IMG_RES;
 					notify("'Too many redirects.' -E");
 				}
 			} else {
@@ -256,18 +259,6 @@ void main()
 					free(http.content_pointer);
 					DrawOmnibox();
 				}
-				else if (http_get_type==IMG) {
-					_IMG_RES:
-					if (http.status_code >= 200) && (http.status_code < 300) {
-						cache.add(cur_img_url, http.content_pointer, http.content_received, IMG, NULL);
-					} else {
-						cache.add(cur_img_url, 0, 0, IMG, NULL);
-					}
-					http.hfree();
-					free(http.content_pointer);
-					GetImg(false);
-				}
-				debugln("end evNetwork");
 			}
 			break;
 		default:
@@ -276,6 +267,7 @@ void main()
 				ESDWORD[shared_url] = '\0';
 				ActivateWindow(GetProcessSlot(Form.ID));
 			}
+			if (img_loading) CheckImgDownloads();
 	}
 }
 
@@ -290,7 +282,7 @@ void ProcessButtonClick(dword id__)
 {
 	switch (id__)
 	{
-		case 1: ExitProcess();
+		case 1: cache2.save(); ExitProcess();
 		case TAB_CLOSE_ID...TAB_CLOSE_ID+TABS_MAX: EventTabClose(id__ - TAB_CLOSE_ID); return;
 		case TAB_ID...TAB_ID+TABS_MAX: EventAllTabsClick(id__ - TAB_ID); return;
 		case ENCODINGS...ENCODINGS+6: EventManuallyChangeEncoding(id__-ENCODINGS); return;
@@ -363,7 +355,7 @@ void ProcessKeyEvent()
 
 void SetElementSizes()
 {
-	omnibox_edit.width = Form.cwidth - BUTTON_W - SEARCH_GO_GAP - BUTTON_W - omnibox_edit.left - 52 - 23;
+	omnibox_edit.width = Form.cwidth - omnibox_edit.left - 51;
 	if (Form.cwidth - scroll_wv.size_x != WB1.list.w) {
 		//temporary fix for crash
 		//related to 'cur_img_url' var read
@@ -391,14 +383,15 @@ void draw_window()
     DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, MixColors(sc.dark, sc.work, 180));
     DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, sc.line);
     DrawBar(0, PADDING, omnibox_edit.left-2, TSZE+1, sc.work);
-    DrawBar(omnibox_edit.left+omnibox_edit.width+24, PADDING, Form.cwidth-omnibox_edit.left-omnibox_edit.width-24, TSZE+1, sc.work);
+    DrawBar(omnibox_edit.left+omnibox_edit.width+2, PADDING, Form.cwidth-omnibox_edit.left-omnibox_edit.width-2, TSZE+1, sc.work);
 
     DrawTopPanelButton(BACK_BUTTON, PADDING-1, PADDING, 30, false);
     DrawTopPanelButton(FORWARD_BUTTON, PADDING+TSZE+PADDING-2, PADDING, 31, false);
-    DrawTopPanelButton(SANDWICH_BUTTON, Form.cwidth-PADDING-TSZE + 2 , PADDING, -1, burger_active); //burger menu
 
-	DrawTopPanelButton(SEARCH_BUTTON, Form.cwidth - PADDING - TSZE - 3 - BUTTON_W, PADDING, 49, false); // Search web button
+    DrawTopPanelButton(SANDWICH_BUTTON, Form.cwidth-PADDING-TSZE-4, PADDING, -1, burger_active); //burger menu
-	DrawTopPanelButton(GO_BUTTON, Form.cwidth - PADDING - TSZE - 3 - BUTTON_W - SEARCH_GO_GAP - BUTTON_W, PADDING, 12, false); // go to address button 
+    
+	//DrawTopPanelButton(SEARCH_BUTTON, Form.cwidth - PADDING - TSZE - 3 - BUTTON_W, PADDING, 49, false); // Search web button
+	//DrawTopPanelButton(GO_BUTTON, Form.cwidth - PADDING - TSZE - 3 - BUTTON_W - SEARCH_GO_GAP - BUTTON_W, PADDING, 12, false); // go to address button 
 
     DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.line);
 
@@ -492,8 +485,10 @@ void EventCopyLinkToClipboard()
 
 void StopLoading()
 {
-	if (http.stop()) pause(10);
+	http.stop();
+	//if (http.stop()) pause(10);
 	prbar.value = 0;
+	img_loading = false;
 }
 
 //rewrite into 
@@ -573,6 +568,8 @@ void OpenPage(dword _open_URL)
 		anchors.take_anchor_from(#new_url);
 	}
 
+	debug("\nWebView GET => ");	debugln(#new_url);
+
 	/*
 	There could be several possible types of addresses:
 	- cached page (only http/https)
@@ -773,9 +770,9 @@ void LoadInternalPage(dword _bufdata, _in_bufsize){
 			WB1.DrawPage();
 		}
 		http.hfree();
-		if (WB1.img_url.count) { 
+		if (WB1.img_url.count) {
-			GetImg(true);
+			GetImg();
-			DrawOmnibox(); 
+			DrawOmnibox();
 		} else {
 			PageLoaded();
 		}
@@ -925,18 +922,18 @@ void DrawStatusBar(dword _msg)
 void DrawOmnibox()
 {
 	int imgxoff;
-	DrawOvalBorder(omnibox_edit.left-2, omnibox_edit.top-3, omnibox_edit.width+24, 24, sc.line, 
+	DrawOvalBorder(omnibox_edit.left-2, omnibox_edit.top-3, omnibox_edit.width+2, 24, sc.line, 
 		sc.line, sc.line, sc.dark);
-	DrawBar(omnibox_edit.left-1, omnibox_edit.top-2, omnibox_edit.width+24, 1, 0xD8DCD8);
+	DrawBar(omnibox_edit.left-1, omnibox_edit.top-2, omnibox_edit.width+2, 1, 0xD8DCD8);
-	DrawBar(omnibox_edit.left-1, omnibox_edit.top-1, omnibox_edit.width+24, 1, omnibox_edit.bg_color);
+	DrawBar(omnibox_edit.left-1, omnibox_edit.top-1, omnibox_edit.width+2, 1, omnibox_edit.bg_color);
 	DrawBar(omnibox_edit.left-1, omnibox_edit.top, 1, 22, omnibox_edit.bg_color);
 
+	if (http.transfer) || (img_loading) { imgxoff = 67; } else imgxoff = 66;
+    DrawTopPanelButton(REFRESH_BUTTON, PADDING+TSZE*2+PADDING+2, PADDING, imgxoff, false);
+
 	if (omnibox_edit.flags & ed_focus) omnibox_edit.flags = ed_focus; else omnibox_edit.flags = 0;
 	EditBox_UpdateText(#omnibox_edit, omnibox_edit.flags);
 	edit_box_draw stdcall(#omnibox_edit);
-	if (http.transfer) imgxoff = 23*23*3; else imgxoff = 0;
-	PutImage(omnibox_edit.left+omnibox_edit.width, omnibox_edit.top-1, 23, 23, imgxoff + #editbox_icons);
-	DefineHiddenButton(omnibox_edit.left+omnibox_edit.width, omnibox_edit.top-2, 22, 23, REFRESH_BUTTON);
 
 	DrawProgress();
 }
@@ -1001,37 +998,64 @@ void HandleRedirect()
 	free(redirect_url);
 }
 
-dword GetImg(bool _new)
+void GetImg()
 {
 	int i;
-	if (!show_images) return;
+	char cur_downloader_path[4096];
-	http_get_type = IMG;
+	char local_path[64];
+	dword cur_img_url;
 
-	for (i = 0; i < WB1.img_url.count; i++)
+	if (!show_images) || (!WB1.img_url.count) return;
-	{
+
+	img_downloaders_count = math.min(WB1.img_url.count, 256);
+	CreateDir("/tmp0/1/Cache");
+
+	for (i = 0; i < img_downloaders_count; i++) {
 		cur_img_url = WB1.img_url.get(i);
-		if (cache.has(cur_img_url)==false) {
+		if (cache2.is_contain(cur_img_url)) continue;
-			prbar.max = WB1.img_url.count;
+		sprintf(#local_path, "/tmp0/1/Cache/wv_%i_%i.png", Form.ID, cache2.url.count + 1);
-			prbar.value = i;
+		sprintf(#cur_downloader_path, "-i %s|%s", cur_img_url, #local_path);
-			if (GetUrl(cur_img_url)) {
+		cache2.add(cur_img_url, #local_path);
-				DrawStatusBar(cur_img_url); 
+		img_downloaders[i] = RunProgram("/sys/network/dl", #cur_downloader_path);
-				DrawProgress(); 
+	}
-				return;
+
-			}
+	img_loading = true;
+	prbar.max = img_downloaders_count;
+	prbar.value = 0;
+}
+
+void CheckImgDownloads()
+{
+	int i;
+	int done_count = 0;
+
+	for (i = 0; i < img_downloaders_count; i++) {
+		if (!img_downloaders[i]) || (!GetProcessSlot(img_downloaders[i])) {
+			img_downloaders[i] = 0; 
+			done_count++;
 		}
 	}
-	if (_new) return;
+
-	DrawOmnibox();
+	if (done_count < img_downloaders_count) {
-	DrawStatusBar(T_RENDERING);
+		prbar.max = img_downloaders_count;
-	WB1.Reparse();
+		prbar.value = done_count;
-	WB1.DrawPage();
+		DrawProgress();
-	PageLoaded();
+		sprintf(#param, "Downloading images: %i/%i...", prbar.value, prbar.max);
+		DrawStatusBar(#param);		
+	} else {
+		DrawStatusBar(T_RENDERING);
+		WB1.Reparse();
+		WB1.DrawPage();
+		PageLoaded();
+		img_loading = false;
+		DrawOmnibox();
+	}
 }
 
 void PageLoaded()
 {
 	DrawStatusBar(sprintf(#param, T_DONE_IN_SEC, GetStartTime()-render_start_time/100, 
-		GetStartTime()-render_start_time*10));	
+		GetStartTime()-render_start_time*10));
 }
 
 stop:

programs/cmm/browser/cache.h

@@ -61,4 +61,68 @@ void _cache::clear()
 	current_size = NULL;
 	current_type = NULL;
 	current_charset = NULL;
+}
+
+
+struct _cache2
+{
+	collection url;
+	collection path;
+	dword cur;
+
+	void add();
+	bool is_contain();
+	void clear();
+
+	void save();
+	void load();
+} cache2;
+
+void _cache2::add(dword _url, _path)
+{
+	if (!is_contain(_url)) {
+		url.add(_url);
+		path.add(_path);
+	}
+}
+
+bool _cache2::is_contain(dword _url)
+{
+	cur = url.get_pos_by_name(_url);
+	if (cur == -1) return false;
+	return true;
+}
+
+void _cache2::clear()
+{
+	url.drop();
+	path.drop();
+}
+
+void _cache2::save()
+{
+	dword buf, buf_size, i;
+	buf_size = url.data_size + path.data_size + url.count + url.count + 7;
+	buf = malloc(buf_size);
+	strcpy(buf, "[img]\n");
+	for ( i = 0 ; i < path.count ; i++ ) {
+		if (!url.get(i)) continue;
+		strcat(buf, url.get(i));
+		strcat(buf, "=");
+		strcat(buf, path.get(i));
+		strcat(buf, "\n");
+	}
+	strcat(buf, "\0");
+	CreateFile(math.min(buf_size, strlen(buf)), buf, "/tmp0/1/Cache/_list_db.ini");
+	free(buf);
+}
+
+void _cache2::load()
+{
+	ini_enum_keys stdcall ("/tmp0/1/Cache/_list_db.ini", "img", #_cache2_load_sections);
+}
+
+byte _cache2_load_sections(dword key_value, key_name, sec_name, f_name)
+{
+	cache2.add(key_name, key_value);
 }

programs/cmm/browser/const.h

@@ -108,11 +108,9 @@ enum {
 	TAB_CLOSE_ID = 900
 };
 
-char editbox_icons[] = FROM "res/editbox_icons.raw";
-
 #define WIN_W 850
 #define WIN_H 920
 
 #define DEFAULT_URL URL_SERVICE_HOMEPAGE
 
-char version[]="WebView 3.98";
+char version[]="WebView 4";

programs/cmm/browser/res/test.htm

@@ -26,6 +26,7 @@
 <a href=//menuetos.net>menuetos.net</a>
 <a href=//osnews.com>osnews.com</a>
 
+<kosicon n=6><a href=https://cobradile.neocities.org>145 images</a>
 
 <h3><kosicon n=54>Cyrillic only</h3>
 <a href=//dgmag.in>dgmag.in</a>  <a href=//old-dos.ru>old-dos.ru</a>  <a href=//lionovsky.us>lionovsky.us</a>  <a href=//mirrors.pdp-11.ru>mirrors.pdp-11.ru</a>  

programs/cmm/downloader/dl.c

@@ -13,6 +13,7 @@
 #include "const.h"
 
 bool open_file = false;
+bool invisible = false;
 
 dword speed;
 
@@ -58,7 +59,7 @@ void main()
 	sc.get();
 	InitDownload();
 
-	if (param) {
+	if (param[0]) {
 		path_pointer = #param;
 		//save path specified? Example: https://example.com/file|/sys/media/ac97snd
 		if (save_path_separator_pos = strchr(#param, '|')) {
@@ -66,11 +67,19 @@ void main()
 			strcpy(#filepath, save_path_separator_pos+1);
 			ESBYTE[save_path_separator_pos] = '\0';
 		}
-		if (streqrp(#param, "-e ")) {
+		// invisible window
+		if (!strncmp(#param, "-i ", 3)) {
+			autoclose.checked = true;
+			invisible = true;
+			path_pointer += 3;
+		}
+		// autoclose
+		if (!strncmp(#param, "-e ", 3)) {
 			autoclose.checked = true;
 			path_pointer += 3;
 		}
-		if (streqrp(#param, "-eo ")) {
+		// autoclose and open file
+		if (!strncmp(#param, "-eo ", 4)) {
 			autoclose.checked = true;
 			open_file = true;
 			path_pointer += 4;
@@ -151,6 +160,8 @@ void DrawDlButton(int x, id, t)
  
 void DefineWindow()
 {  
+	if (invisible) return;
+
 	sc.get();
 	pb.frame_color = ed.border_color = ed.focus_border_color = sc.line;
 	DefineAndDrawWindow(110 + random(300), 100 + random(300), WIN_W+9, 
@@ -161,6 +172,9 @@ void DefineWindow()
 void DrawWindow()
 {
 	#define BUT_Y 58;
+
+	if (invisible) return;
+
 	if (!http.transfer) && (!filepath) {
 		DrawBar(GAPX, 102, WIN_W - GAPX - GAPX+1, 24+1, sc.work);
 		DeleteButton(BTN_DIR);
@@ -220,6 +234,7 @@ void StartDownloading()
 		DrawWindow();
 	} else {
 		pb.progress_color = PB_COL_ERROR;
+		if (invisible) ExitProcess();
 		notify(T_ERROR_STARTING_DOWNLOAD);
 		StopDownloading();
 		EditBox_UpdateText(#ed, ed_focus + ed_always_focus);
@@ -305,7 +320,9 @@ void MonitorProgress()
 void CompleteDownload()
 {
 	SaveFile(0);
-	if (autoclose.checked) ExitProcess();
+	if (autoclose.checked) {
+		ExitProcess();
+	}
 	pb.value = pb.max;
 	pb.progress_color = PB_COL_COMPLETE;
 	StopDownloading();
@@ -318,6 +335,8 @@ void SaveFile(int attempt)
 	int i;
 	char notify_message[4296];
 	char file_name[URL_SIZE+96];
+	bool quote = false;
+	dword filename_pos;
 
 	//if save_path is not set then we have to combine it
 	if (!save_path_set) {
@@ -336,11 +355,19 @@ void SaveFile(int attempt)
 
 		//Content-Disposition: attachment; filename="RealFootball_2018_Nokia_5800_EN_IGP_EU_TS_101.zip"
 		if (http.header_field("content-disposition", #file_name, sizeof(file_name))) {
-			if (EDX = strstr(#file_name,"filename=\"")) { 
+			filename_pos = strstr(#file_name,"filename=");
-				strcat(#filepath, EDX+10);
+			if (filename_pos) { 
+				if (ESBYTE[filename_pos] == '\"') {
+					quote = true;
+					filename_pos++;
+				}
+				strcat(#filepath, filename_pos+9);
 				ESBYTE[strchr(#filepath,'\"')] = '\0';
+				ESBYTE[strchr(#filepath,' ')] = '\0';
+				ESBYTE[strchr(#filepath,';')] = '\0';
 			}
-		} else {
+		}
+		if (!filename_pos) {
 			// Clean all slashes at the end
 			strcpy(#file_name, #uEdit);
 			while (file_name[strlen(#file_name)-1] == '/') {

programs/cmm/lib/obj/http.h

@@ -223,14 +223,13 @@ void _http::receive()
 
 	switch(ESBYTE[new_URL]) {
 		case '.':
-			new_URL++;
+			if (ESBYTE[new_URL+1] == '/') {
-			if (ESBYTE[new_URL] == '/') {
-				new_URL++;
-			}
-			else if (ESBYTE[new_URL] == '.') && (ESBYTE[new_URL+1] == '/') {
-				_GO_UP:
 				new_URL+=2;
-				newurl[strrchr(#newurl, '/')-1] = '\0';				
+			}
+			else if (ESBYTE[new_URL+1] == '.') && (ESBYTE[new_URL+2] == '/') {
+				_GO_UP:
+				new_URL+=3;
+				newurl[strrchr(#newurl, '/')-1] = '\0';		
 			}
 			goto _DEFAULT;
 		case '?':