From 4b8415c842ec9d4b29116dcef482644b0982048b Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 7 Jan 2016 16:00:59 +0000 Subject: [PATCH] Aelia: upload pre alpha git-svn-id: svn://kolibrios.org@6043 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/aelia/Tupfile.lua | 6 + programs/cmm/aelia/_compile.bat | 5 + programs/cmm/aelia/aelia.c | 420 ++++++++++++++++++ programs/cmm/aelia/buidin_pages/about.htm | Bin 0 -> 538 bytes programs/cmm/aelia/buidin_pages/home.htm | Bin 0 -> 406 bytes programs/cmm/aelia/buidin_pages/not_found.htm | Bin 0 -> 534 bytes programs/cmm/aelia/gui.h | 75 ++++ programs/cmm/aelia/ini.h | 34 ++ programs/cmm/aelia/parse_address.h | 74 +++ programs/cmm/aelia/prepare_page.h | 185 ++++++++ programs/cmm/aelia/toolbar.png | Bin 0 -> 1778 bytes programs/cmm/examples/Tupfile.lua | 1 + 12 files changed, 800 insertions(+) create mode 100644 programs/cmm/aelia/Tupfile.lua create mode 100644 programs/cmm/aelia/_compile.bat create mode 100644 programs/cmm/aelia/aelia.c create mode 100644 programs/cmm/aelia/buidin_pages/about.htm create mode 100644 programs/cmm/aelia/buidin_pages/home.htm create mode 100644 programs/cmm/aelia/buidin_pages/not_found.htm create mode 100644 programs/cmm/aelia/gui.h create mode 100644 programs/cmm/aelia/ini.h create mode 100644 programs/cmm/aelia/parse_address.h create mode 100644 programs/cmm/aelia/prepare_page.h create mode 100644 programs/cmm/aelia/toolbar.png diff --git a/programs/cmm/aelia/Tupfile.lua b/programs/cmm/aelia/Tupfile.lua new file mode 100644 index 0000000000..cf6727d2f0 --- /dev/null +++ b/programs/cmm/aelia/Tupfile.lua @@ -0,0 +1,6 @@ +if tup.getconfig("NO_CMM") ~= "" then return end +if tup.getconfig("LANG") == "ru" +then C_LANG = "LANG_RUS" +else C_LANG = "LANG_ENG" -- this includes default case without config +end +tup.rule("aelia.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "aelia.com") diff --git a/programs/cmm/aelia/_compile.bat b/programs/cmm/aelia/_compile.bat new file mode 100644 index 0000000000..d8f9d30424 --- /dev/null +++ b/programs/cmm/aelia/_compile.bat @@ -0,0 +1,5 @@ +C-- "aelia.c" +@del "aelia" +@rename "aelia.com" "aelia" +@del warning.txt +@pause diff --git a/programs/cmm/aelia/aelia.c b/programs/cmm/aelia/aelia.c new file mode 100644 index 0000000000..978ba1c1ca --- /dev/null +++ b/programs/cmm/aelia/aelia.c @@ -0,0 +1,420 @@ +#define MEMSIZE 4096*30 + +#include "../lib/font.h" +#include "../lib/io.h" +#include "../lib/gui.h" +#include "../lib/list_box.h" +#include "../lib/menu.h" +#include "../lib/obj/box_lib.h" +#include "../lib/obj/libini.h" +#include "../lib/obj/iconv.h" +#include "../lib/obj/proc_lib.h" +#include "../lib/obj/http.h" +#include "../lib/patterns/libimg_load_skin.h" +#include "../lib/patterns/simple_open_dialog.h" +#include "../lib/patterns/history.h" + +#include "../browser/http_downloader.h" +#include "parse_address.h" + +char default_dir[] = "/rd/1"; +od_filter filter2 = {0,0}; + +char accept_language[]= "Accept-Language: ru\n"; + +#define TOOLBAR_H 36 +#define TOOLBAR_ICON_WIDTH 26 +#define TOOLBAR_ICON_HEIGHT 24 + +#define DEFAULT_EDITOR "/sys/tinypad" +#define DEFAULT_PREVIEW_PATH "/tmp0/1/aelia_preview.txt" + +//ATTENTION: each page must have '\0' character at the end of the file +char buidin_page_home[] = FROM "buidin_pages\\home.htm"; +char buidin_page_about[] = FROM "buidin_pages\\about.htm"; +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; + +proc_info Form; +char title[4196]; + +enum { + OPEN_FILE, + MAGNIFY_MINUS, + MAGNIFY_PLUS, + CHANGE_ENCODING, + RUN_EDIT, + SHOW_INFO, + GO_BACK, + GO_FORWARD, +}; + +char address[UML]="http://"; +int mouse_address_box; +edit_box address_box = {250,56,34,0xffffff,0x94AECE,0xffffff,0xffffff,0,UML,#address,#mouse_address_box,2,19,19}; + +#include "ini.h" +#include "gui.h" +#include "prepare_page.h" + +void InitDlls() +{ + load_dll(boxlib, #box_lib_init, 0); + load_dll(libHTTP, #http_lib_init, 1); + load_dll(libio, #libio_init, 1); + load_dll(libimg, #libimg_init, 1); + //load_dll(libini, #lib_init, 1); + load_dll(iconv_lib, #iconv_open, 0); + load_dll(Proc_lib, #OpenDialog_init,0); +} + + +void main() +{ + InitDlls(); + OpenDialog_init stdcall (#o_dialog); + label.init(DEFAULT_FONT); + Libimg_LoadImage(#skin, abspath("toolbar.png")); + LoadIniSettings(); + list.no_selection = true; + SetEventMask(10000000000000000000000001100111b); + loop() + { + switch(WaitEvent()) + { + case evMouse: + HandleMouseEvent(); + break; + case evKey: + HandleKeyEvent(); + break; + case evButton: + HandleButtonEvent(); + break; + case evReDraw: + if (menu.list.cur_y) { + encoding = menu.list.cur_y - 10; + debugln("evReDraw: charset changed"); + EventOpenAddress(history.current()); + } + draw_window(); + } + } +} + + +void HandleButtonEvent() +{ + byte btn = GetButtonID(); + if (btn==1) { + SaveIniSettings(); + ExitProcess(); + } + switch(btn-10) + { + case GO_BACK: + EventGoBack(); + break; + case GO_FORWARD: + EventGoForward(); + break; + case OPEN_FILE: + EventOpenDialog(); + break; + case MAGNIFY_PLUS: + EventMagnifyPlus(); + break; + case MAGNIFY_MINUS: + EventMagnifyMinus(); + break; + case CHANGE_ENCODING: + EventChangeEncoding(); + break; + case RUN_EDIT: + EventRunEdit(); + break; + case SHOW_INFO: + EventShowInfo(); + break; + } +} + + +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; + } + } + if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) { + switch (key_scancode) + { + case 024: //O + EventOpenDialog(); + break; + case SCAN_CODE_UP: + EventMagnifyPlus(); + break; + case SCAN_CODE_DOWN: + EventMagnifyMinus(); + break; + case 018: //E + EventRunEdit(); + break; + case 035: //H + EventShowHistory(); + break; + case SCAN_CODE_TAB: + EventChangeEncoding(); + break; + } + return; + } + if (list.ProcessKey(key_scancode)) { + DrawPage(); + return; + } + if (key_ascii != 0x0d) + && (key_ascii != ASCII_KEY_PGDN) + && (key_ascii != ASCII_KEY_PGUP) { + EAX = key_ascii << 8; + edit_box_key stdcall(#address_box); + } +} + + +void HandleMouseEvent() +{ + edit_box_mouse stdcall (#address_box); + mouse.get(); + list.wheel_size = 7; + if (list.MouseScroll(mouse.vert)) { + DrawPage(); + return; + } + scrollbar_v_mouse (#scroll); + if (list.first != scroll.position) { + list.first = scroll.position; + DrawPage(); + } +} + + +/* ----------------------------------------------------- */ + +void EventOpenDialog() +{ + OpenDialog_start stdcall (#o_dialog); + if (o_dialog.status) EventOpenAddress(#openfile_path); +} + +void EventOpenAddress(dword _new_address) +{ +char temp[UML]; + if (!ESBYTE[_new_address]) return; + debugln("===================================="); + debug("address: "); + debugln(_new_address); + strlcpy(#address, _new_address, UML); + strlwr(#address); + DrawAddressBox(); + + /* + There could be several possible types of addresses: + - build in page + - local file + - url + So we need to detect what incoming address is + and then halndle it in the propper way. + */ + + io.buffer_data = 0; + + // - build in page + 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(); + } + // - local file + else if (check_is_the_adress_local(#address)==true) { + debugln("this is local address"); + io.read(#address); + } + // - url + else { + debugln("this is url"); + if (strncmp(#address,"http://",7)!=0) { + strcpy(#temp, "http://"); + strlcpy(#temp, #address, UML); + strlcpy(#address, #temp, UML); + DrawAddressBox(); + } + if (!downloader.Start(#address)) { + downloader.Stop(); + } else { + while (downloader.state!=STATE_COMPLETED) + { + downloader.MonitorProgress(); + if (downloader.data_full_size>0) + DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE*downloader.data_downloaded_size/downloader.data_full_size); + else + DrawProgress(STEP_2_COUNT_PAGE_HEIGHT-STEP_1_DOWNLOAD_PAGE/2); + } + io.buffer_data = downloader.bufpointer; + } + } + + if (!io.buffer_data) { + debugln("page not found"); + io.buffer_data = #buidin_page_not_found; + } + + history.add(#address); + + /* + Great! So we have the page in our buffer. + We don't know is it a plain text or html. + So we need to parse it and draw. + */ + + list.KeyHome(); + list.ClearList(); + PreparePage(); +} + +void EventMagnifyPlus() +{ + label.size.pt++; + if(!label.changeSIZE()) + label.size.pt--; + else + PreparePage(); +} + +void EventMagnifyMinus() +{ + label.size.pt--; + if(!label.changeSIZE()) + label.size.pt++; + else + PreparePage(); +} + +void EventRunEdit() +{ + if (check_is_the_adress_local(history.current())==true) { + io.run(DEFAULT_EDITOR, history.current()); + } + else { + //io.write(strlen(io.buffer_data), io.buffer_data, DEFAULT_PREVIEW_PATH); // <--- doesn't work, smth odd, need to check + WriteFile(strlen(io.buffer_data), io.buffer_data, DEFAULT_PREVIEW_PATH); + io.run(DEFAULT_EDITOR, DEFAULT_PREVIEW_PATH); + } +} + +void EventChangeEncoding() +{ + menu.selected = encoding + 1; + menu.show(Form.left+Form.cwidth-97,Form.top+TOOLBAR_H+skin_height-6, 130, "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866", 10); +} + +void EventShowInfo() { + EventOpenAddress("aelia:about"); +} + +void EventShowHistory() +{ + EventOpenAddress("aelia:history"); +} + +void EventGoBack() +{ + if (history.back()) EventOpenAddress(history.current()); +} + +void EventGoForward() +{ + if (history.forward()) EventOpenAddress(history.current()); +} + +/* ------------------------------------------- */ + + +void draw_window() +{ + DefineAndDrawWindow(Form.left,Form.top,Form.width,Form.height,0x73,0,#title); + GetProcessInfo(#Form, SelfInfo); + 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; } + + DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 2, 0xe1e1e1); + DrawBar(0, TOOLBAR_H - 2, Form.cwidth, 1, 0xcecece); + DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, 0x7F7F7F); + + DrawToolbarButton(GO_BACK, 8); + DrawToolbarButton(GO_FORWARD, 33); + DrawToolbarButton(OPEN_FILE, 68); + DrawToolbarButton(MAGNIFY_PLUS, Form.cwidth - 161); + DrawToolbarButton(MAGNIFY_MINUS, Form.cwidth - 136); + DrawToolbarButton(CHANGE_ENCODING, Form.cwidth - 102); + DrawToolbarButton(RUN_EDIT, Form.cwidth - 68); + DrawToolbarButton(SHOW_INFO, Form.cwidth - 34); + + DrawAddressBox(); + + if ((Form.cwidth-scroll.size_x-1 == list.w) && + (Form.cheight-TOOLBAR_H == list.h) && + (list.count) + ) + { + DrawPage(); + } + else + { + if (!label.raw) { //this code need to be run + if (param) EventOpenAddress(#param); //only once at browser sturtup + else EventOpenAddress("aelia:home"); + } + else PreparePage(); + } + + DrawRectangle(scroll.start_x, scroll.start_y, scroll.size_x, scroll.size_y-1, scroll.bckg_col); +} + +void DrawPage() +{ + list.CheckDoesValuesOkey(); + if (list.count) _PutImage(list.x,list.y,list.w,list.h,list.first*list.item_h*list.w*3 + label.raw); + DrawScroller(); +} + +void DrawAddressBox() +{ + address_box.left = 97; + address_box.top = 11; + address_box.width = Form.cwidth - address_box.left - 172; + DrawRectangle(address_box.left-4, address_box.top-5, address_box.width+6, 23, 0x8C8C8C); + DrawWideRectangle(address_box.left-3, address_box.top-3, address_box.width+5, 21, 4, address_box.color); + address_box.size = address_box.pos = address_box.shift = address_box.shift_old = strlen(#address); + address_box.offset = 0; + edit_box_draw stdcall(#address_box); +} \ No newline at end of file diff --git a/programs/cmm/aelia/buidin_pages/about.htm b/programs/cmm/aelia/buidin_pages/about.htm new file mode 100644 index 0000000000000000000000000000000000000000..3b82c8e15ed7f438b4a0e2c1cfb4e69fe6e9e553 GIT binary patch literal 538 zcmY*XO>e?54BZ)N|H0xqJ_hHm5{yZkHi^R+_q26sL>gC)Th@O+hZbp^oV@2}`#DJ} zsa^UwNh&l&jAF%My2+@OWI0?EUEb)7ieA$c%J?crY?>8i!gAIveyN)Yu#n0~KTWGM$d|9%9$+wd*)K%poJg#o|oPW^5@e zh)>DVM4wl;8mo1>!w#Jq;GkyLN`4{wyr01_F2c(UK8FJPZ#bZ-@73=lXY6m%S7GVf9qh@xI-0AZe$PS>6^*A$81pB|Vd#DU z6VD|5yI&YPIc6_BQGl3@y*%A5t&`;&=3zt`;-)NV5UfytwX&+yrmlzLjbp`fShe3) eZPF{TVEZq19ezH&dRpy!#4s&BUmt_!bav#h#ZbHaAY{6pfuU$pbO^_ZBu72h`} zs|7lqy@3|NFyUK5_ZgjYcBQ<_NA+p38)5a*#srLU3t}-KoZVn0t2M|n@vCaXDy(nH zV(^FIf&p9v!SlpH2j>@S5`P*#21{Od)IDYF9Acqkq2?oO4kqA3+OvSGHnULUs()9x*%9XZciIAF1Oc9Gyb@ZqsZWEA}AfO2_1P%qiC#iZ}zpBey*7wiw^bb5m BrP%-g literal 0 HcmV?d00001 diff --git a/programs/cmm/aelia/gui.h b/programs/cmm/aelia/gui.h new file mode 100644 index 0000000000..31de815672 --- /dev/null +++ b/programs/cmm/aelia/gui.h @@ -0,0 +1,75 @@ +void DrawToolbarButton(char image_id, int x) +{ + DefineButton(x+1, 7, TOOLBAR_ICON_WIDTH-2, TOOLBAR_ICON_HEIGHT-2, 10+image_id + BT_HIDE, 0); + img_draw stdcall(skin.image, x, 6, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, 0, image_id*TOOLBAR_ICON_HEIGHT); +} + + +void DrawScroller() +{ + scroll.max_area = list.count; + scroll.cur_area = list.visible; + scroll.position = list.first; + scroll.all_redraw = 0; + scroll.start_x = list.x + list.w; + scroll.start_y = list.y; + scroll.size_y = list.h; + scroll.start_x = list.x + list.w; + scrollbar_v_draw(#scroll); +} + + +dword MakePageWithHistory() +{ + int i; + static dword history_page; + + if (history_page) free(history_page); + history_page = malloc(history.items.data_size+256); + strcat(history_page, "History\n

History

\n"); + strcat(history_page, "

Visited pages


\n"); + for (i=0; i"); + strcat(history_page, history.items.get(i)); + strcat(history_page, "
\n"); + } + return history_page; +} + + +enum { + STEP_1_DOWNLOAD_PAGE = 0, + STEP_2_COUNT_PAGE_HEIGHT = 30, + STEP_3_DRAW_PAGE_INTO_BUFFER = 60, + STEP_4_SMOOTH_FONT = 94, + STEP_5_STOP = 100, +}; + +void DrawProgress(int percent) +{ + int progress_width; + if (percent<100) { + progress_width = address_box.width+5*percent/100; + DrawBar(address_box.left-3, address_box.top+16, progress_width, 2, 0x72B7EA); + //debugi(percent); + } + else { + progress_width = address_box.width+5; + DrawBar(address_box.left-3, address_box.top+16, progress_width, 2, 0xFFFfff); + } +} + +int progress_percent; +void DrawProgressWhileDrawing(dword bufoff, buflen) +{ + int progress_cur = bufoff - io.buffer_data; + int progress_max = buflen - io.buffer_data; + int new_progress_percent = STEP_4_SMOOTH_FONT-STEP_3_DRAW_PAGE_INTO_BUFFER*progress_cur/progress_max + STEP_3_DRAW_PAGE_INTO_BUFFER; + if (progress_percent != new_progress_percent) { + progress_percent = new_progress_percent; + DrawProgress(progress_percent); + } +} diff --git a/programs/cmm/aelia/ini.h b/programs/cmm/aelia/ini.h new file mode 100644 index 0000000000..ad4ac153ad --- /dev/null +++ b/programs/cmm/aelia/ini.h @@ -0,0 +1,34 @@ +char ini_path[4096]; +char config_section[] = "Config"; +int encoding; + +void LoadIniSettings() +{ + label.size.pt = 14; + encoding = CH_CP866; + Form.left = 150; + Form.top = 50; + Form.width = 640; + Form.height = 560; + /* + strcpy(#ini_path, "/sys/settings/treader.ini"); + ini_get_int stdcall (#ini_path, #config_section, "FontSize", 14); label.size.pt = EAX; + ini_get_int stdcall (#ini_path, #config_section, "Encoding", CH_CP866); encoding = EAX; + ini_get_int stdcall (#ini_path, #config_section, "WinX", 150); Form.left = EAX; + ini_get_int stdcall (#ini_path, #config_section, "WinY", 50); Form.top = EAX; + ini_get_int stdcall (#ini_path, #config_section, "WinW", 640); Form.width = EAX; + ini_get_int stdcall (#ini_path, #config_section, "WinH", 560); Form.height = EAX; + */ +} + +void SaveIniSettings() +{ + /* + ini_set_int stdcall (#ini_path, #config_section, "FontSize", label.size.pt); + ini_set_int stdcall (#ini_path, #config_section, "Encoding", encoding); + ini_set_int stdcall (#ini_path, #config_section, "WinX", Form.left); + ini_set_int stdcall (#ini_path, #config_section, "WinY", Form.top); + ini_set_int stdcall (#ini_path, #config_section, "WinW", Form.width); + ini_set_int stdcall (#ini_path, #config_section, "WinH", Form.height); + */ +} diff --git a/programs/cmm/aelia/parse_address.h b/programs/cmm/aelia/parse_address.h new file mode 100644 index 0000000000..946f84d22b --- /dev/null +++ b/programs/cmm/aelia/parse_address.h @@ -0,0 +1,74 @@ + +int check_is_the_adress_local(dword _in) +{ + if(!strncmp(_in,"/sys/",5)) return true; + if(!strncmp(_in,"/hd/",4)) return true; + if(!strncmp(_in,"/fd/",4)) return true; + if(!strncmp(_in,"/rd/",4)) return true; + if(!strncmp(_in,"/tmp/",5)) return true; + if(!strncmp(_in,"/cd/",4)) return true; + if(!strncmp(_in,"/bd/",4)) return true; + if(!strncmp(_in,"/usbhd/",7)) return true; + if(!strncmp(_in,"/kolibrios/",11)) return true; + return false; +} + +/* +int check_is_the_url_absolute(dword in) +{ + if(!strncmp(_in,"http:",5)) return true; + if(!strncmp(_in,"https:",6)) return true; + if(!strncmp(_in,"ftp:",4)) return true; +} + +void GetAbsoluteURL(dword in_URL) +{ + int i; + dword orig_URL = in_URL; + char newurl[UML]; + + while (i=strstr(in_URL, "&")) + { + strcpy(i+1, i+5); + } + + if (UrlIsAbsolute(in_URL)) return; + + IF (!strcmpn(in_URL,"./", 2)) in_URL+=2; + if (!http_transfer) + { + strcpy(#newurl, History.current()); + } + else + { + strcpy(#newurl, History.items.get(History.active-2)); + } + + if (ESBYTE[in_URL] == '/') //remove everything after site domain name + { + i = strchr(#newurl+8, '/'); + if (i) ESBYTE[i]=0; + in_URL+=1; + } + + _CUT_ST_LEVEL_MARK: + + if (newurl[strrchr(#newurl, '/')-2]<>'/') + { + newurl[strrchr(#newurl, '/')] = 0x00; + } + + IF (!strncmp(in_URL,"../",3)) + { + in_URL+=3; + newurl[strrchr(#newurl, '/')-1] = 0x00; + goto _CUT_ST_LEVEL_MARK; + } + + if (newurl[strlen(#newurl)-1]<>'/') strcat(#newurl, "/"); + + strcat(#newurl, in_URL); + strcpy(orig_URL, #newurl); +} + +*/ \ No newline at end of file diff --git a/programs/cmm/aelia/prepare_page.h b/programs/cmm/aelia/prepare_page.h new file mode 100644 index 0000000000..ea8d15e315 --- /dev/null +++ b/programs/cmm/aelia/prepare_page.h @@ -0,0 +1,185 @@ +char char_width[255]; + +void PreparePage() +{ +int i; + list.SetSizes(0, TOOLBAR_H, Form.cwidth-scroll.size_x-1, Form.cheight-TOOLBAR_H, label.size.pt+1); + //get font chars width, need to increase performance + //if (strstri(io.buffer_data, "")==-1) { + debugln("no found"); + label.changeSIZE(); + for (i=0; i<256; i++) char_width[i] = label.symbol_size(i); + ChangeCharset(charsets[encoding], "CP866", io.buffer_data); + DrawProgress(STEP_2_COUNT_PAGE_HEIGHT); ParceTxt(false); //get page height to calculate buffer size + DrawProgress(STEP_3_DRAW_PAGE_INTO_BUFFER); ParceTxt(true); //draw text in buffer + DrawProgress(STEP_4_SMOOTH_FONT); label.apply_smooth(); + DrawProgress(STEP_5_STOP); DrawPage(); + /*} + else { + debugln(" tag found"); + label.changeSIZE(); + for (i=0; i<256; i++) char_width[i] = label.symbol_size(i); + ChangeCharset(charsets[encoding], "CP866", io.buffer_data); + DrawProgress(STEP_2_COUNT_PAGE_HEIGHT); ParceHtml(false); //get page height to calculate buffer size + DrawProgress(STEP_3_DRAW_PAGE_INTO_BUFFER); ParceHtml(true); //draw text in buffer + DrawProgress(STEP_4_SMOOTH_FONT); label.apply_smooth(); + DrawProgress(STEP_5_STOP); DrawPage(); + }*/ +} + +void ParceTxt(byte draw) +{ +byte ch, zeroch=0; +dword bufoff, buflen, line_start, srch_pos; +int stroka_y=5, line_length=0; + + line_start=io.buffer_data; + buflen = strlen(io.buffer_data) + io.buffer_data; + for (bufoff=io.buffer_data; bufoff=list.w-30) || (ch==10) { + srch_pos = bufoff; + loop() + { + if (__isWhite(ESBYTE[srch_pos])) { bufoff=srch_pos+1; break; } //normal word-break + if (srch_pos == line_start) break; //no white space found in whole line + srch_pos--; + } + if (draw==true) { + ESBYTE[bufoff] >< zeroch; //set line end + label.write_buf(8,stroka_y,list.w,label.size.height, 0xFFFFFF, 0, label.size.pt, line_start); + ESBYTE[bufoff] >< zeroch; //restore line + DrawProgressWhileDrawing(bufoff, buflen); + if (stroka_y/list.item_h-list.first==list.visible) DrawPage(); + } + stroka_y += list.item_h; + line_start = bufoff; + line_length = 0; + } + } + if (draw==false) { + list.count = stroka_y/list.item_h+2; + if (list.count < list.visible) list.count = list.visible; + label.size.height = list.count+1*list.item_h; + label.raw_size = 0; + } + if (draw==true) label.write_buf(8,stroka_y,list.w,label.size.height, 0xFFFFFF, 0, label.size.pt, line_start); +} + + +/*======================================================== += = += HTML = += = +========================================================*/ + +/* +HTML parcer tags: + +<meta encoding> +<a hrf=""> +<img src="" alt=""> +<h1> ... <h6> +<b> +<u> +<s> +<pre> +*/ + +struct _DOM { + dword start; + dword end; + dword len; +}; + +struct _style { + bool b, u, i, s; + bool h1, h2, h3, h4, h5, h6; + bool a; + bool pre; + bool title; + bool br; +} style; + +struct _tag { + dword start; + dword name; + dword param[10]; + dword value[10]; + void parce(); + void get_param_value(); +}; + +void _tag::parce() +{ + bool closed_status = false; + if (start) debugln(start); + /* + if (strncmp(start, "/", 1)==0) { + start++; + closed_status = true; + } + if (!strcmp(start, "title")) style.title = closed_status; + if (!strcmp(start, "br")) style.br = closed_status; + */ +} + +struct _text { + dword start; + int x, y; + void draw(); +}; + +void _text::draw() +{ + if (start) debugln(start); + /* + if (style.title) { + strlcpy(#title, start, sizeof(title)); + DrawTitle(#title); + return; + } + if (style.br) { + y += list.item_h; + style.br = false; + } + */ +} + + +void ParceHtml(byte draw) +{ +byte ch; +_DOM DOM; +_text text; +_tag tag; +dword DOM_pos; + + /* Create DOM */ + debugln("starting DOM parce"); + DOM.len = strlen(io.buffer_data); + DOM.start = malloc(DOM.len); + DOM.end = DOM.start + DOM.len; + strlcpy(DOM.start, io.buffer_data, DOM.len); + + /* Parce DOM */ + text.start = DOM_pos; + for (DOM_pos=DOM.start; DOM_pos<DOM.end; DOM_pos++) + { + ch = ESBYTE[DOM_pos]; + if (ch=='<') { + ESBYTE[DOM_pos] = NULL; + tag.start = DOM_pos + 1; + text.draw(); + } + if (ch=='>') { + ESBYTE[DOM_pos] = NULL; + text.start = DOM_pos + 1; + tag.parce(); + } + } + free(DOM.start); + ExitProcess(); +} \ No newline at end of file diff --git a/programs/cmm/aelia/toolbar.png b/programs/cmm/aelia/toolbar.png new file mode 100644 index 0000000000000000000000000000000000000000..931b6cf93051dbb6dbbbd0df254ee51b2f3086e9 GIT binary patch literal 1778 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 TlAQVK&!=PxzXW@9!THX=sKD>^ literal 0 HcmV?d00001 diff --git a/programs/cmm/examples/Tupfile.lua b/programs/cmm/examples/Tupfile.lua index 72dd104241..2b76c704aa 100644 --- a/programs/cmm/examples/Tupfile.lua +++ b/programs/cmm/examples/Tupfile.lua @@ -5,3 +5,4 @@ else C_LANG = "LANG_ENG" -- this includes default case without config end tup.rule("example.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "example.com") tup.rule("collections.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "collections.com") +tup.rule("menu.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com")