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.66";
+	char version[]=" ¥ªáâ®¢ë© ¡à ã§¥à 0.99.67";
 	?define IMAGES_CACHE_CLEARED "íè ª àâ¨®ª ®ç¨é¥"
 	?define T_LAST_SLIDE "â® ¯®á«¥¤¨© á« ©¤"
-	char loading[] = " £àã§ª  áâà ¨æë...";
+	char loading[] = " £àã§ª  áâà ¨æë...
";
 	unsigned char page_not_found[] = FROM "html\page_not_found_ru.htm";
 #else
-	char version[]=" Text-based Browser 0.99.66";
+	char version[]=" Text-based Browser 0.99.67";
 	?define IMAGES_CACHE_CLEARED "Images cache cleared"
 	?define T_LAST_SLIDE "This slide is the last"
-	char loading[] = "Loading...";
+	char loading[] = "Loading...
";
 	unsigned char page_not_found[] = FROM "html\page_not_found_en.htm";
 #endif
 				if (!CheckActiveProcess(Form.ID)) break;
 				edit_box_mouse stdcall (#address_box);
 				m.get();
-				PageLinks.Hover(m.x, m.y, link_color_inactive, link_color_active, bg_color);
+				if (m.y>WB1.list.y) PageLinks.Hover(m.x, m.y, link_color_inactive, link_color_active, bg_color);
 				if (m.y>WB1.list.y) && (m.y
+					}
+				}
 				if (m.vert)
 				{
-					if (WB1.list.MouseScroll(m.vert)) WB1.ParseHTML(bufpointer);
+					if (WB1.list.MouseScroll(m.vert)) WB1.Parse(bufpointer, bufsize);
+				}
 				if (!m.lkm) scroll_used=0;
 					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.ParseHTML(bufpointer);
+					if (btn<>WB1.list.first) WB1.Parse(bufpointer, bufsize);
+				}
 				break;
 			case evButton:
 					bufpointer = ESI.http_msg.content_ptr;
 					debug(bufpointer);
 					//bufsize = ESI.http_msg.content_received;
 					bufsize = strlen(bufpointer)-2;
 					debugi(bufsize);
-					WB1.ParseHTML(bufpointer);
+					WB1.Parse(bufpointer, bufsize);
 					$pop EAX
 					if (EAX == 0) {
 						http_free stdcall (http_transfer);
 						http_transfer=0;
+					}
 	switch (id)
+	{
 		case 011: //Ctrk+K
 			WB1.ReadHtml(_KOI);
-			WB1.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			return;
 		case 021: //Ctrl+U
 			WB1.ReadHtml(_UTF);
-			WB1.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			return;
 		case 004: //Ctrl+D
 			WB1.ReadHtml(_DOS);
-			WB1.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			return;
 		case 005: //Win encoding
 			WB1.ReadHtml(_WIN);
-			WB1.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			return;
 		case 009: //free img cache
 			ImgCache.Free();
 			notify(IMAGES_CACHE_CLEARED);
 		case 052:  //F3
 			if (strncmp(#URL,"http:",5)<>0) RunProgram("/rd/1/tinypad", #URL);
 			else RunProgram("/rd/1/tinypad", #download_path);
 			return;
 		case 054: //F5
-			IF(address_box.flags & 0b10) WB1.ParseHTML(bufpointer);
+			IF(address_box.flags & 0b10) WB1.Parse(bufpointer, bufsize);
 			return;
 		case REFRESH:
 			if (GetProcessSlot(downloader_id)<>0)
 		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.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			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.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			return;
 		case 178:
 		case BTN_UP:
 			if (WB1.list.first <= 0) return;
 			WB1.list.first--;
-			WB1.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			return;
 		case 177:
 		case BTN_DOWN:
 			if (WB1.list.visible + WB1.list.first >= WB1.list.count) return;
 			WB1.list.first++;
-			WB1.ParseHTML(bufpointer);
+			WB1.Parse(bufpointer, bufsize);
 			return;
 		case 180: //home
-			if (WB1.list.KeyHome()) WB1.ParseHTML(bufpointer);
+			if (WB1.list.KeyHome()) WB1.Parse(bufpointer, bufsize);
 			return;
 		case 181: //end
 	if (strcmp(#URL, URL_HISTORY)==0) ShowHistory(); else
 	if (!bufsize)
+	{
 		PageLinks.Clear();
 		if (GetProcessSlot(downloader_id)<>0)
-		{
-			bufsize = sizeof(loading);
+			WB1.Parse(#loading, sizeof(loading));
-			WB1.ParseHTML(#loading);
-		}
 		else
-		{
-			bufsize = sizeof(page_not_found);
+			WB1.Parse(#page_not_found, sizeof(page_not_found));
-			WB1.ParseHTML(#page_not_found);
-		}
-		bufsize = 0;
+	}
 	else
-		WB1.ParseHTML(bufpointer);
+		WB1.Parse(bufpointer, bufsize);
 	if (!header) strcpy(#header, #version);
 	if (!strcmp(#version, #header)) DrawTitle(#header);
 		int i;
 		static int history_pointer;
 		free(history_pointer);
 		history_pointer = malloc(64000);
-		strcat(history_pointer, "History
");
+		strcat(history_pointer, " HistoryHistory
");
 		strcat(history_pointer, "Visited pages

");
 		for (i=1; i
+		{
 			strcat(history_pointer, "
 		for (i=1; i
+		{
 			strcat(history_pointer, "
 			strcat(history_pointer, #pics[i].path);
 			strcat(history_pointer, "' />
");
+			strcat(history_pointer, #pics[i].path);
+		}
-		bufsize = strlen(history_pointer);
 		bufpointer = history_pointer;
-		WB1.ParseHTML(history_pointer);
+		WB1.Parse(history_pointer, strlen(history_pointer));
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/browser/HTMLv.c – Rev 4546 → 4550

History

History

Visited pages

Visited pages