WebSVN – Kolibri OS – Diff – /programs/cmm/aelia/aelia.c

 #include "../lib/patterns/simple_open_dialog.h"
 #include "../lib/patterns/history.h"
 #include "../lib/patterns/http_downloader.h"
 #include "../browser/download_manager.h"
+llist list;
+#include "link.h"
+#include "canvas.h"
+#include "favicon.h"
 char default_dir[] = "/rd/1";
 od_filter filter2 = { 16, "TXT\0HTM\0HTML\0\0" };
 char accept_language[]= "Accept-Language: ru\n";
+#define TOOLBAR_H 36
-#define TOOLBAR_H 36
+#define TOOLBAR_ICON_WIDTH  26
-#define TOOLBAR_ICON_WIDTH  26
+#define TOOLBAR_ICON_HEIGHT 24
-#define TOOLBAR_ICON_HEIGHT 24
+#define STATUSBAR_H 15
 char buidin_page_not_found[] = FROM "buidin_pages\\not_found.htm";
 #define UML 4096*2
 scroll_bar scroll = { 15,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
-llist list;
+scroll_bar scroll = { 15,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
 	GO_BACK,
 	GO_FORWARD,
 	SANDWICH
 };
-char address[UML]="http://";
+char address[UML];
 edit_box address_box = {250,56,34,0xffffff,0x94AECE,0xffffff,0xffffff,0,UML,#address,NULL,2,19,19};
 bool debug_mode=false;
 #include "favicon.h"
-#include "ini.h"
-#include "gui.h"
-#include "link.h"
+#include "ini.h"
-#include "canvas.h"
+#include "gui.h"
 #include "prepare_page.h"
 	OpenDialog_init stdcall (#o_dialog);
 	LoadIniSettings();
 	kfont.init(DEFAULT_FONT);
 	Libimg_LoadImage(#skin, abspath("toolbar.png"));
 	list.no_selection = true;
-	SetEventMask(10000000000000000000000001100111b);
+	SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER + EVM_STACK);
 	loop()
+	{
 		switch(WaitEvent())
+		{
 			case evMouse:
 				HandleKeyEvent();
 				break;
 			case evButton:
 				HandleButtonEvent();
 				break;
+			case evNetwork:
+				HandleNetworkEvent();
+				break;
 			case evReDraw:
 				draw_window();
 				if (menu.list.cur_y>=10) && (menu.list.cur_y<20) {
 					encoding = menu.list.cur_y - 10;
 					EventPageRefresh();
 void HandleKeyEvent()
-{
-	GetKeys();
-	switch (key_scancode)
-	{
-		case 059:
-			EventShowInfo();
-			return;
-		case SCAN_CODE_ENTER:
-			EventOpenAddress(#address);
-			return;
-		case SCAN_CODE_BS:
-			if (! address_box.flags & 0b10) {
-				EventGoBack();
-				return;
+{
 	GetKeys();
 	if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) {
-		switch (key_scancode)
-		{
-			case 024: //O
-				EventOpenDialog();
+		switch (key_scancode)
 				break;
 			case SCAN_CODE_UP:
 				EventMagnifyPlus();
-				break;
+				return;
 			case SCAN_CODE_DOWN:
 				EventMagnifyMinus();
+				return;
+			case SCAN_CODE_KEY_O:
+				EventOpenDialog();
-				break;
+				return;
-			case 018: //E
+			case SCAN_CODE_KEY_E:
 				EventRunEdit();
-				break;
+				return;
-			case 035: //H
+			case SCAN_CODE_KEY_H:
 				EventShowHistory();
-				break;
+				return;
 			case SCAN_CODE_TAB:
+				EventChangeEncoding();
+				return;
+		}
+	}
+	switch (key_scancode)
+	{
+		case SCAN_CODE_F1:
+			EventShowInfo();
+			return;
+		case SCAN_CODE_F12:
+			EventChangeDebugMode();
+			return;
+		case SCAN_CODE_ENTER:
+			EventOpenAddress(#address);
+			return;
+		case SCAN_CODE_BS:
+			if (! address_box.flags & 0b10) {
-				EventChangeEncoding();
+				EventGoBack();
-				break;
+				return;
-		}
+			}
+	}
-	if (list.ProcessKey(key_scancode)) {
+	if (list.ProcessKey(key_scancode)) && (! address_box.flags & 0b10) {
 		DrawPage();
 		return;
+	}
-	if (key_ascii != 0x0d)
+	if (key_ascii != ASCII_KEY_ENTER)
 	&& (key_ascii != ASCII_KEY_PGDN)
 	&& (key_ascii != ASCII_KEY_PGUP) {
 		EAX = key_editbox;
 void HandleMouseEvent()
+{
 	edit_box_mouse stdcall (#address_box);
 	mouse.get();
 	list.wheel_size = 7;
-	if (link.hover()) {
+	if (link.hover(mouse.x, mouse.y)) {
-		if (link.active == -1) {
+		if (-1 == link.active) {
-			debugln("unhovered");
+			DrawStatusBar( " " ); //just clean status bar
+		}
 		else {
-			debugln(link.text.get(link.active));
-			debugln(link.url.get(link.active));
+			DrawStatusBar( link.get_active_url() );
+		}
+	}
+	if (mouse.key&MOUSE_LEFT) && (mouse.up) {
+		if (-1 != link.active) EventOpenAddress( link.get_active_url() );
+	}
 	if (list.MouseScroll(mouse.vert)) {
 		DrawPage();
 		return;
+	}
 	scrollbar_v_mouse (#scroll);
 	if (list.first != scroll.position) {
 		list.first = scroll.position;
 		DrawPage();
+	}
+}
+void HandleNetworkEvent()
+{
+	char favicon_address[UML];
+	if (downloader.state == STATE_IN_PROGRESS) {
+		downloader.MonitorProgress();
+		if (downloader.httpd.content_length>0)
+			DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE*
+				downloader.httpd.content_received/downloader.httpd.content_length);
+		else
+			DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE/2);
+	}
+	if (downloader.state == STATE_COMPLETED)
+	{
+		if (!strncmp(downloader.url,"http://gate.aspero.pro/",22)) {
+			strcpy(#address,downloader.url + 29);
+		}
+		else {
+			strcpy(#address,downloader.url);
+		}
+		downloader.Stop();
+		DrawAddressBox();
+		io.buffer_data = downloader.bufpointer;
+		/*
+		get_absolute_url(#favicon_address, #address, "/favicon.ico");
+		favicon.get(#favicon_address);
+		*/
+		PostOpenPageActions();
+	}
+}
 /* ----------------------------------------------------- */
+}
 void EventOpenAddress(dword _new_address)
+{
 char temp[UML];
-char favicon_address[UML];
+char getUrl[UML];
 	if (!ESBYTE[_new_address]) return;
 	debugln("====================================");
 	debug("address: ");
 	debugln(_new_address);
 	if (!strncmp(#address,"aelia:",6)) {
 		debugln("this is buildin page");
 		if (!strcmp(#address,"aelia:home")) io.buffer_data = #buidin_page_home;
 		if (!strcmp(#address,"aelia:about")) io.buffer_data = #buidin_page_about;
 		if (!strcmp(#address,"aelia:history")) io.buffer_data = MakePageWithHistory();
+		PostOpenPageActions();
+	}
 	// - local file
 	else if (check_is_the_adress_local(#address)==true) {
 		debugln("this is local address");
 		io.read(#address);
+		PostOpenPageActions();
+	}
 	// - url
 	else {
 		debugln("this is url");
-		if (strncmp(#address,"http://",7)!=0) {
+		if (!strncmp(#address,"https://",8)) {
+			sprintf(#getUrl, "http://gate.aspero.pro/?site=%s", #address);
+		}
+		else if (!strncmp(#address,"http://",7)) {
+			strlcpy(#getUrl, #address, UML);
+		}
+		else {
 			strcpy(#temp, "http://");
 			strlcpy(#temp, #address, UML);
 			strlcpy(#address, #temp, UML);
 			DrawAddressBox();
+			strlcpy(#getUrl, #address, UML);
+		}
-		if (!downloader.Start(#address)) {
-			downloader.Stop();
+		downloader.Start(#getUrl);
-		} else {
-			while (downloader.state!=STATE_COMPLETED)
-			{
-				downloader.MonitorProgress();
-				if (downloader.httpd.content_length>0)
-					DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE*
-						downloader.httpd.content_received/downloader.httpd.content_length);
-				else
-					DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE/2);
-			}
-			strcpy(#address,downloader.url);
-			DrawAddressBox();
-			io.buffer_data = downloader.bufpointer;
-			get_absolute_url(#favicon_address, #address, "/favicon.ico");
-			favicon.get(#favicon_address);
+	}
+}
+void PostOpenPageActions()
+{
 	if (!io.buffer_data) {
 		debugln("page not found");
 		io.buffer_data = #buidin_page_not_found;
 	We don't know is it a plain text or html.
 	So we need to parse it and draw.
 	*/
-	list.KeyHome();
-	list.ClearList();
+	list.KeyHome();
 	PreparePage();
+}
 		downloader_edit = NULL;
 		CreateThread(#Downloader,#downloader_stak+4092);
+	}
+}
+void EventChangeDebugMode()
+{
+	debug_mode ^= 1;
+	if (debug_mode) notify("'Debug mode ON'-I");
+	else notify("'Debug mode OFF'-I");
+	return;
+}
 /* ------------------------------------------- */
 	if (Form.status_window>2) return;
 	if (Form.width  < 200) { MoveSize(OLD,OLD,200,OLD); return; }
+	if (Form.height < 200) { MoveSize(OLD,OLD,OLD,200); return; }
+	system.color.get();
+	list.SetSizes(0, TOOLBAR_H, Form.cwidth-scroll.size_x-1,
-	if (Form.height < 200) { MoveSize(OLD,OLD,OLD,200); return; }
+		Form.cheight-TOOLBAR_H-STATUSBAR_H, kfont.size.pt+4);
 	DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 2, 0xe1e1e1);
 	DrawBar(0, TOOLBAR_H - 2, Form.cwidth, 1, 0xcecece);
+		}
 		else PreparePage();
+	}
+	DrawRectangle(scroll.start_x, scroll.start_y, scroll.size_x, scroll.size_y-1, scroll.bckg_col);
-	DrawRectangle(scroll.start_x, scroll.start_y, scroll.size_x, scroll.size_y-1, scroll.bckg_col);
+	DrawStatusBar(NULL);
+}
 void DrawPage()
 	edit_box_draw stdcall(#address_box);
 	favicon.draw(address_box.left-18, address_box.top-1);
 	DrawBar(address_box.left-2, address_box.top+1, 2, 13, 0xFFFfff);
+}
+PathShow_data status_text = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, 0, NULL, 0};
+void DrawStatusBar(dword _status_text)
+{
+	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, system.color.work);
+	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, 0x8C8C8C);
+	if (_status_text) {
+		status_text.start_x = 7;
+		status_text.start_y = Form.cheight - STATUSBAR_H + 3;
+		status_text.area_size_x = Form.cwidth - status_text.start_x -3;
+		status_text.font_color = system.color.work_text;
+		status_text.text_pointer = _status_text;
+		PathShow_prepare stdcall(#status_text);
+		PathShow_draw stdcall(#status_text);
+	}

Subversion Repositories Kolibri OS

(root)/programs/cmm/aelia/aelia.c – Rev 7291 → 7293