From cab4c34e5b8cef1fc88b2ed3ef3c7c8b0c1257a6 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 6 Feb 2016 22:48:51 +0000 Subject: [PATCH] Aelia 0.35: fix ParceHTML function, show site favicon git-svn-id: svn://kolibrios.org@6152 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/aelia/aelia.c | 14 +++- programs/cmm/aelia/buidin_pages/about.htm | Bin 579 -> 579 bytes programs/cmm/aelia/favicon.h | 83 ++++++++++++++++++++++ programs/cmm/aelia/prepare_page.h | 4 +- programs/cmm/lib/debug.h | 3 +- programs/cmm/pixie/pixie.c | 2 +- 6 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 programs/cmm/aelia/favicon.h diff --git a/programs/cmm/aelia/aelia.c b/programs/cmm/aelia/aelia.c index 4d62abaed..bc7cb077a 100644 --- a/programs/cmm/aelia/aelia.c +++ b/programs/cmm/aelia/aelia.c @@ -59,6 +59,7 @@ edit_box address_box = {250,56,34,0xffffff,0x94AECE,0xffffff,0xffffff,0,UML,#add CustomCursor CursorPointer; dword CursorFile = FROM "pointer.cur"; +#include "favicon.h" #include "ini.h" #include "gui.h" #include "label.h" @@ -243,6 +244,7 @@ void EventOpenDialog() void EventOpenAddress(dword _new_address) { char temp[UML]; +char favicon_address[UML]; if (!ESBYTE[_new_address]) return; debugln("===================================="); debug("address: "); @@ -261,6 +263,7 @@ char temp[UML]; */ io.buffer_data = 0; + favicon.get(NULL); // - build in page if (!strncmp(#address,"aelia:",6)) { @@ -297,6 +300,8 @@ char temp[UML]; strcpy(#address,downloader.url); DrawAddressBox(); io.buffer_data = downloader.bufpointer; + get_absolute_url(#favicon_address, #address, "/favicon.ico"); + favicon.get(#favicon_address); } } @@ -306,6 +311,7 @@ char temp[UML]; } history.add(#address); + favicon.draw(address_box.left-18, address_box.top-1); /* Great! So we have the page in our buffer. @@ -438,12 +444,14 @@ void DrawPage() void DrawAddressBox() { - address_box.left = 97; + address_box.left = 97+19; address_box.top = 11; address_box.width = Form.cwidth - address_box.left - 138; - 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); + DrawRectangle(address_box.left-4-19, address_box.top-5, address_box.width+6+19, 23, 0x8C8C8C); + DrawWideRectangle(address_box.left-3-19, address_box.top-3, address_box.width+5+19, 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); + favicon.draw(address_box.left-18, address_box.top-1); + DrawBar(address_box.left-2, address_box.top+1, 2, 13, 0xFFFfff); } \ No newline at end of file diff --git a/programs/cmm/aelia/buidin_pages/about.htm b/programs/cmm/aelia/buidin_pages/about.htm index 6c156cf532b25457e8ff528bac4212f5c138e8ba..0dd4d3752d60a69aa3596eb4468b27365b69abff 100644 GIT binary patch delta 12 TcmX@ia+qa85~JzH< zeroch; //restore line text.start = line_break; stroka_x = HTML_PADDING_X; @@ -200,8 +200,8 @@ dword DOM_pos; label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color); } WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start); - stroka_x+=char_width[' ']; } + stroka_x+=char_width[' ']; stroka_x += get_label_len(text.start); } if (ch=='>') { diff --git a/programs/cmm/lib/debug.h b/programs/cmm/lib/debug.h index 8646c48a7..01a308fea 100644 --- a/programs/cmm/lib/debug.h +++ b/programs/cmm/lib/debug.h @@ -40,7 +40,8 @@ DONE: inline fastcall void debugln( EDX) { debug( EDX); - debugch('\n'); + debugch(10); + debugch(13); } inline void debugi(dword d_int) diff --git a/programs/cmm/pixie/pixie.c b/programs/cmm/pixie/pixie.c index 1e261175d..670d7b1e2 100644 --- a/programs/cmm/pixie/pixie.c +++ b/programs/cmm/pixie/pixie.c @@ -316,7 +316,7 @@ void StartPlayingMp3() char item_path[4096]; char notify_message[512]; StopPlayingMp3(); - if (!list.count) { NotifyAndBackFocus("'Pixie Player\nPress O key to open file' -St"); return; } + if (!list.count) { NotifyAndBackFocus("'Pixie Player\nPress O key to open MP3 file' -St"); return; } if (current_playing_file_n > list.count) { current_playing_file_n = list.count; return; } if (current_playing_file_n < 0) { current_playing_file_n = 0; return; } playback_mode = PLAYBACK_MODE_PLAYING;