From c9389437b7c5d0b486fc80e39435d873eb03303b Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 3 Jun 2020 22:21:39 +0000 Subject: [PATCH] Eolite: fix paste WebView: fix space in the end of value menu: refine params git-svn-id: svn://kolibrios.org@8020 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/TWB/colors.h | 264 +++++++++++++-------------- programs/cmm/TWB/img.h | 26 +-- programs/cmm/TWB/parse_tag.h | 1 + programs/cmm/appearance/appearance.c | 2 +- programs/cmm/browser/WebView.c | 15 +- programs/cmm/eolite/Eolite.c | 7 +- programs/cmm/eolite/include/menu.h | 6 +- programs/cmm/examples/menu.c | 8 +- programs/cmm/iconedit/iconedit.c | 8 +- programs/cmm/lib/gui/menu.h | 12 +- programs/cmm/misc/calypte.c | 4 +- programs/cmm/quark/quark.c | 13 +- 12 files changed, 183 insertions(+), 183 deletions(-) diff --git a/programs/cmm/TWB/colors.h b/programs/cmm/TWB/colors.h index 23b4d5bc0c..4725284efb 100644 --- a/programs/cmm/TWB/colors.h +++ b/programs/cmm/TWB/colors.h @@ -9,146 +9,146 @@ struct color_spec { collection_int text_colors; struct color_spec color_specs[] = { - "aliceblue", 0xF0F8FF, - "antiquewhite", 0xFAEBD7, - "aqua", 0x00FFFF, - "aquamarine", 0x7FFFD4, - "azure", 0xF0FFFF, - "beige", 0xF5F5DC, - "bisque", 0xFFE4C4, - "black", 0x000000, - "blanchedalmond",0xFFEBCD, - "blue", 0x0000FF, - "blueviolet", 0x8A2BE2, - "brown", 0xA52A2A, - "burlywood", 0xDEB887, - "cadetblue", 0x5F9EA0, - "chartreuse", 0x7FFF00, - "chocolate", 0xD2691E, - "coral", 0xFF7F50, - "cornflowerblue",0x6495ED, - "cornsilk", 0xFFF8DC, - "crimson", 0xDC143C, - "cyan", 0x00FFFF, - "darkblue", 0x00008B, - "darkcyan", 0x008B8B, - "darkgoldenrod", 0xB8860B, - "darkgray", 0xA9A9A9, - "darkgreen", 0x006400, - "darkkhaki", 0xBDB76B, - "darkmagenta", 0x8B008B, - "darkolivegreen",0x556B2F, - "darkorange", 0xFF8C00, - "darkorchid", 0x9932CC, - "darkred", 0x8B0000, - "darksalmon", 0xE9967A, - "darkseagreen", 0x8FBC8F, - "darkslateblue", 0x483D8B, - "darkslategray", 0x2F4F4F, - "darkturquoise", 0x00CED1, - "darkviolet", 0x9400D3, - "deeppink", 0xFF1493, - "deepskyblue", 0x00BFFF, - "dimgray", 0x696969, - "dodgerblue", 0x1E90FF, - "firebrick", 0xB22222, - "floralwhite", 0xFFFAF0, - "forestgreen", 0x228B22, - "fuchsia", 0xFF00FF, - "gainsboro", 0xDCDCDC, - "ghostwhite", 0xF8F8FF, - "gold", 0xFFD700, - "goldenrod", 0xDAA520, - "gray", 0x808080, - "green", 0x008000, - "greenyellow", 0xADFF2F, - "honeydew", 0xF0FFF0, - "hotpink", 0xFF69B4, - "indianred", 0xCD5C5C, - "indigo", 0x4B0082, - "ivory", 0xFFFFF0, - "khaki", 0xF0E68C, - "lavender", 0xE6E6FA, - "lavenderblush", 0xFFF0F5, - "lawngreen", 0x7CFC00, - "lemonchiffon", 0xFFFACD, - "lightblue", 0xADD8E6, - "lightcoral", 0xF08080, - "lightcyan", 0xE0FFFF, + "aliceblue", 0xF0F8FF, + "antiquewhite", 0xFAEBD7, + "aqua", 0x00FFFF, + "aquamarine", 0x7FFFD4, + "azure", 0xF0FFFF, + "beige", 0xF5F5DC, + "bisque", 0xFFE4C4, + "black", 0x000000, + "blanchedalmond", 0xFFEBCD, + "blue", 0x0000FF, + "blueviolet", 0x8A2BE2, + "brown", 0xA52A2A, + "burlywood", 0xDEB887, + "cadetblue", 0x5F9EA0, + "chartreuse", 0x7FFF00, + "chocolate", 0xD2691E, + "coral", 0xFF7F50, + "cornflowerblue", 0x6495ED, + "cornsilk", 0xFFF8DC, + "crimson", 0xDC143C, + "cyan", 0x00FFFF, + "darkblue", 0x00008B, + "darkcyan", 0x008B8B, + "darkgoldenrod", 0xB8860B, + "darkgray", 0xA9A9A9, + "darkgreen", 0x006400, + "darkkhaki", 0xBDB76B, + "darkmagenta", 0x8B008B, + "darkolivegreen", 0x556B2F, + "darkorange", 0xFF8C00, + "darkorchid", 0x9932CC, + "darkred", 0x8B0000, + "darksalmon", 0xE9967A, + "darkseagreen", 0x8FBC8F, + "darkslateblue", 0x483D8B, + "darkslategray", 0x2F4F4F, + "darkturquoise", 0x00CED1, + "darkviolet", 0x9400D3, + "deeppink", 0xFF1493, + "deepskyblue", 0x00BFFF, + "dimgray", 0x696969, + "dodgerblue", 0x1E90FF, + "firebrick", 0xB22222, + "floralwhite", 0xFFFAF0, + "forestgreen", 0x228B22, + "fuchsia", 0xFF00FF, + "gainsboro", 0xDCDCDC, + "ghostwhite", 0xF8F8FF, + "gold", 0xFFD700, + "goldenrod", 0xDAA520, + "gray", 0x808080, + "green", 0x008000, + "greenyellow", 0xADFF2F, + "honeydew", 0xF0FFF0, + "hotpink", 0xFF69B4, + "indianred", 0xCD5C5C, + "indigo", 0x4B0082, + "ivory", 0xFFFFF0, + "khaki", 0xF0E68C, + "lavender", 0xE6E6FA, + "lavenderblush", 0xFFF0F5, + "lawngreen", 0x7CFC00, + "lemonchiffon", 0xFFFACD, + "lightblue", 0xADD8E6, + "lightcoral", 0xF08080, + "lightcyan", 0xE0FFFF, "lightgoldenrodyellow", 0xFAFAD2, - "lightgreen", 0x90EE90, - "lightgrey", 0xD3D3D3, - "lightpink", 0xFFB6C1, - "lightsalmon", 0xFFA07A, - "lightseagreen", 0x20B2AA, - "lightskyblue", 0x87CEFA, - "lightslategray",0x778899, - "lightsteelblue",0xB0C4DE, - "lightyellow", 0xFFFFE0, - "lime", 0x00FF00, - "limegreen", 0x32CD32, - "linen", 0xFAF0E6, - "magenta", 0xFF00FF, - "maroon", 0x800000, - "mediumaquamarine",0x66CDAA, - "mediumblue", 0x0000CD, - "mediumorchid", 0xBA55D3, - "mediumpurple", 0x9370DB, - "mediumseagreen",0x3CB371, - "mediumslateblue",0x7B68EE, + "lightgreen", 0x90EE90, + "lightgrey", 0xD3D3D3, + "lightpink", 0xFFB6C1, + "lightsalmon", 0xFFA07A, + "lightseagreen", 0x20B2AA, + "lightskyblue", 0x87CEFA, + "lightslategray", 0x778899, + "lightsteelblue", 0xB0C4DE, + "lightyellow", 0xFFFFE0, + "lime", 0x00FF00, + "limegreen", 0x32CD32, + "linen", 0xFAF0E6, + "magenta", 0xFF00FF, + "maroon", 0x800000, + "mediumaquamarine", 0x66CDAA, + "mediumblue", 0x0000CD, + "mediumorchid", 0xBA55D3, + "mediumpurple", 0x9370DB, + "mediumseagreen", 0x3CB371, + "mediumslateblue", 0x7B68EE, "mediumspringgreen",0x00FA9A, "mediumturquoise",0x48D1CC, "mediumvioletred",0xC71585, "midnightblue", 0x191970, - "mintcream", 0xF5FFFA, - "mistyrose", 0xFFE4E1, - "moccasin", 0xFFE4B5, - "navajowhite", 0xFFDEAD, - "navy", 0x000080, - "oldlace", 0xFDF5E6, - "olive", 0x808000, - "olivedrab", 0x6B8E23, - "orange", 0xFFA500, - "orangered", 0xFF4500, - "orchid", 0xDA70D6, + "mintcream", 0xF5FFFA, + "mistyrose", 0xFFE4E1, + "moccasin", 0xFFE4B5, + "navajowhite", 0xFFDEAD, + "navy", 0x000080, + "oldlace", 0xFDF5E6, + "olive", 0x808000, + "olivedrab", 0x6B8E23, + "orange", 0xFFA500, + "orangered", 0xFF4500, + "orchid", 0xDA70D6, "palegoldenrod", 0xEEE8AA, - "palegreen", 0x98FB98, + "palegreen", 0x98FB98, "paleturquoise", 0xAFEEEE, "palevioletred", 0xDB7093, - "papayawhip", 0xFFEFD5, - "peachpuff", 0xFFDAB9, - "peru", 0xCD853F, - "pink", 0xFFC0CB, - "plum", 0xDDA0DD, - "powderblue", 0xB0E0E6, - "purple", 0x800080, - "red", 0xFF0000, - "rosybrown", 0xBC8F8F, - "royalblue", 0x4169E1, - "saddlebrown", 0x8B4513, - "salmon", 0xFA8072, - "sandybrown", 0xF4A460, - "seagreen", 0x2E8B57, - "seashell", 0xFFF5EE, - "sienna", 0xA0522D, - "silver", 0xC0C0C0, - "skyblue", 0x87CEEB, - "slateblue", 0x6A5ACD, - "slategray", 0x708090, - "snow", 0xFFFAFA, - "springgreen", 0x00FF7F, - "steelblue", 0x4682B4, - "tan", 0xD2B48C, - "teal", 0x008080, - "thistle", 0xD8BFD8, - "tomato", 0xFF6347, - "turquoise", 0x40E0D0, - "violet", 0xEE82EE, - "wheat", 0xF5DEB3, - "white", 0xFFFFFF, - "whitesmoke", 0xF5F5F5, - "yellow", 0xFFFF00, - "yellowgreen", 0x9ACD32, + "papayawhip", 0xFFEFD5, + "peachpuff", 0xFFDAB9, + "peru", 0xCD853F, + "pink", 0xFFC0CB, + "plum", 0xDDA0DD, + "powderblue", 0xB0E0E6, + "purple", 0x800080, + "red", 0xFF0000, + "rosybrown", 0xBC8F8F, + "royalblue", 0x4169E1, + "saddlebrown", 0x8B4513, + "salmon", 0xFA8072, + "sandybrown", 0xF4A460, + "seagreen", 0x2E8B57, + "seashell", 0xFFF5EE, + "sienna", 0xA0522D, + "silver", 0xC0C0C0, + "skyblue", 0x87CEEB, + "slateblue", 0x6A5ACD, + "slategray", 0x708090, + "snow", 0xFFFAFA, + "springgreen", 0x00FF7F, + "steelblue", 0x4682B4, + "tan", 0xD2B48C, + "teal", 0x008080, + "thistle", 0xD8BFD8, + "tomato", 0xFF6347, + "turquoise", 0x40E0D0, + "violet", 0xEE82EE, + "wheat", 0xF5DEB3, + "white", 0xFFFFFF, + "whitesmoke", 0xF5F5F5, + "yellow", 0xFFFF00, + "yellowgreen", 0x9ACD32, 0}; dword StrToCol(char* htmlcolor) diff --git a/programs/cmm/TWB/img.h b/programs/cmm/TWB/img.h index 66a4679d07..bcb093ffd4 100644 --- a/programs/cmm/TWB/img.h +++ b/programs/cmm/TWB/img.h @@ -56,19 +56,6 @@ void _img::set_data(dword _data, _data_len) data.set(getid, _data); } -void DrawLibimgImage(dword _x, _y, _data, _data_len) -{ - libimg_image im; - img_decode stdcall (_data, _data_len, 0); - $or eax, eax - $jz __ERROR__ - - im.image = EAX; - im.set_vars(); - im.draw(_x, _y, im.w, im.h, 0, 0); -__ERROR__: -} - void _img::draw(int _x, _y, _start, _height) { int i, img_x, img_y; @@ -86,6 +73,19 @@ void _img::draw(int _x, _y, _start, _height) } } +void DrawLibimgImage(dword _x, _y, _data, _data_len) +{ + libimg_image im; + img_decode stdcall (_data, _data_len, 0); + $or eax, eax + $jz __ERROR__ + + im.image = EAX; + im.set_vars(); + im.draw(_x, _y, im.w, im.h, 0, 0); +__ERROR__: +} + /* void ImageCache::Images(dword left1, top1, width1) diff --git a/programs/cmm/TWB/parse_tag.h b/programs/cmm/TWB/parse_tag.h index 1427e13831..bd5f567c72 100644 --- a/programs/cmm/TWB/parse_tag.h +++ b/programs/cmm/TWB/parse_tag.h @@ -106,6 +106,7 @@ bool _tag::get_next_param() ESBYTE[i+1] = '\0'; } strlwr(#attr); + strrtrim(#val); attributes.add(#attr); values.add(#val); diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 13b6d0fe2e..6f4db9ac91 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -132,7 +132,7 @@ void main() select_list.ProcessMouse(mouse.x, mouse.y); SelectList_Draw(); EventSetNewCurrent(); - open_lmenu(Form.left+mouse.x+5, Form.top+mouse.y+skin_height, 1, 0, MENU_LIST); + open_lmenu(mouse.x, mouse.y, MENU_TOP_RIGHT, NULL, MENU_LIST); } break; diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 7c0ed4760e..0f4cf10eb4 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -32,7 +32,7 @@ #define URL_SIZE 4000 -char version[]="WebView 2.65"; +char version[]="WebView 2.65b"; #include "texts.h" #include "cache.h" @@ -789,27 +789,28 @@ void DrawProgress() void EventShowPageMenu() { - open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, MENU_ALIGN_TOP_LEFT, NULL, #rmb_menu); + open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #rmb_menu); menu_id = VIEW_SOURCE; } void EventShowLinkMenu() { - open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, MENU_ALIGN_TOP_LEFT, NULL, #link_menu); + open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #link_menu); menu_id = IN_NEW_TAB; } void EventShowMainMenu() { - open_lmenu(Form.left + Form.cwidth - PADDING, Form.top + skin_height + PADDING + TSZE + 3, - MENU_ALIGN_TOP_RIGHT, NULL, #main_menu); + open_lmenu(Form.cwidth - PADDING -4, PADDING + TSZE + 3, + MENU_TOP_RIGHT, NULL, #main_menu); menu_id = OPEN_FILE; } void EventShowEncodingsList() { - open_lmenu(Form.left + Form.cwidth, Form.top + skin_height + Form.cheight - STATUSBAR_H + 12, - MENU_ALIGN_BOT_RIGHT, WB1.cur_encoding + 1, "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866"); + open_lmenu(Form.cwidth-4, Form.cheight - STATUSBAR_H + 12, + MENU_BOT_RIGHT, WB1.cur_encoding + 1, + "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866"); menu_id = ENCODINGS; } diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index b35b51fd4d..3235b93748 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -3,8 +3,8 @@ // 70.5 - get volume info and label -#define TITLE "Eolite File Manager 4.46c" -#define ABOUT_TITLE "EOLITE 4.46c" +#define TITLE "Eolite File Manager 4.46d" +#define ABOUT_TITLE "EOLITE 4.46d" #ifndef AUTOBUILD #include "lang.h--" @@ -172,17 +172,20 @@ void handle_param() param[strrchr(#param, '/')-1] = '\0'; strcpy(#path, #param + 3); properties_dialog(); + ExitProcess(); return; case 'd': strcpy(#file_path, #param + 3); itdir = dir_exists(#file_path); DisplayOperationForm(DELETE_FLAG); DeleteSingleElement(); + ExitProcess(); return; case 'v': cut_active = param[2] - '0'; strcpy(#path, #param + 4); PasteThread(); + ExitProcess(); return; } } diff --git a/programs/cmm/eolite/include/menu.h b/programs/cmm/eolite/include/menu.h index 96d6e79f94..9d5ec9b139 100644 --- a/programs/cmm/eolite/include/menu.h +++ b/programs/cmm/eolite/include/menu.h @@ -140,15 +140,13 @@ void EventShowListMenu() text = #file_actions; active_menu = MENU_FILE; } - open_lmenu(mouse.x+Form.left+5, mouse.y+Form.top+3 - +skin_height, MENU_ALIGN_TOP_LEFT, NULL, text); + open_lmenu(mouse.x, mouse.y+3, MENU_TOP_LEFT, NULL, text); } void EventShowBurgerMenu() { active_menu = MENU_BURGER; - open_lmenu(Form.width-10+Form.left, 35+Form.top+skin_height, - MENU_ALIGN_TOP_RIGHT, NULL, #burger_menu_items); + open_lmenu(Form.cwidth-6, 35, MENU_TOP_RIGHT, NULL, #burger_menu_items); } bool GetMenuClick() diff --git a/programs/cmm/examples/menu.c b/programs/cmm/examples/menu.c index 417eceb45c..0a3c7db81f 100644 --- a/programs/cmm/examples/menu.c +++ b/programs/cmm/examples/menu.c @@ -44,13 +44,13 @@ void main() if (id==1) ExitProcess(); if (id==butv.id) { menu_id = butv.id; - open_lmenu(Form.left+3 + butv.x, Form.top+skin_height + butv.y + butv.h, - MENU_ALIGN_TOP_LEFT, current_veg, #vegetables); + open_lmenu(butv.x, butv.y + butv.h, MENU_TOP_LEFT, + current_veg, #vegetables); } if (id==buta.id) { menu_id = buta.id; - open_lmenu(Form.left+5 + buta.x + buta.w, Form.top+skin_height + buta.y + buta.h, - MENU_ALIGN_TOP_RIGHT, current_animal, #animals); + open_lmenu(buta.x + buta.w, buta.y + buta.h, + MENU_TOP_RIGHT, current_animal, #animals); } break; diff --git a/programs/cmm/iconedit/iconedit.c b/programs/cmm/iconedit/iconedit.c index 95465b7812..79c331ec48 100644 --- a/programs/cmm/iconedit/iconedit.c +++ b/programs/cmm/iconedit/iconedit.c @@ -743,14 +743,14 @@ void EventCrop() void EventShowImageMenu() { - open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height + - image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #image_menu_items); + open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h, + MENU_TOP_LEFT, NULL, #image_menu_items); } void EventShowEditMenu() { - open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height + - image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #edit_menu_items); + open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h, + MENU_TOP_LEFT, NULL, #edit_menu_items); } void EventCheckMenuItemSelected() diff --git a/programs/cmm/lib/gui/menu.h b/programs/cmm/lib/gui/menu.h index bf44617419..609dbfcffd 100644 --- a/programs/cmm/lib/gui/menu.h +++ b/programs/cmm/lib/gui/menu.h @@ -3,10 +3,10 @@ :dword menu_process_id; -#define MENU_ALIGN_TOP_LEFT 0 -#define MENU_ALIGN_TOP_RIGHT 1 -#define MENU_ALIGN_BOT_LEFT 2 -#define MENU_ALIGN_BOT_RIGHT 3 +#define MENU_TOP_LEFT 0 +#define MENU_TOP_RIGHT 1 +#define MENU_BOT_LEFT 2 +#define MENU_BOT_RIGHT 3 :dword shared_mem = NULL; :char shared_name[] = "LMENU"; @@ -17,8 +17,8 @@ if (EDX) shared_mem = memopen(#shared_name, 16, SHM_WRITE); } ESDWORD[shared_mem ] = _selected; - ESDWORD[shared_mem + 4] = _x; - ESDWORD[shared_mem + 8] = _y; + ESDWORD[shared_mem + 4] = _x + Form.left + 5; + ESDWORD[shared_mem + 8] = _y + Form.top + skin_height; ESDWORD[shared_mem + 12] = _position; menu_process_id = RunProgram("/sys/develop/menu", _text1); } diff --git a/programs/cmm/misc/calypte.c b/programs/cmm/misc/calypte.c index d3f2b06a36..9b9c681e4b 100644 --- a/programs/cmm/misc/calypte.c +++ b/programs/cmm/misc/calypte.c @@ -437,8 +437,8 @@ void EventMenuClick() void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected) { - open_lmenu(Form.left+5 + _menu_item_x, Form.top+skin_height + TOPPANELH, - MENU_ALIGN_TOP_LEFT, _selected, _menu_list); + open_lmenu(_menu_item_x, TOPPANELH, MENU_TOP_LEFT, + _selected, _menu_list); menu_id = _id; } diff --git a/programs/cmm/quark/quark.c b/programs/cmm/quark/quark.c index b405eb4683..ba9a4bbf59 100644 --- a/programs/cmm/quark/quark.c +++ b/programs/cmm/quark/quark.c @@ -379,32 +379,29 @@ void EventMagnifyPlus() void EventShowCharsetsList() { menu_id = CHANGE_CHARSET; - open_lmenu(Form.left + Form.cwidth, Form.top + skin_height - + Form.cheight - 6, MENU_ALIGN_BOT_RIGHT, user_encoding+1, + open_lmenu(Form.cwidth-4, Form.cheight - 6, MENU_BOT_RIGHT, + user_encoding+1, "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866\nAUTO"); } void EventShowReopenMenu() { menu_id = REOPEN_IN_APP; - open_lmenu(Form.left+5 + reopenin_mx + 23, Form.top+29+skin_height, - MENU_ALIGN_TOP_RIGHT, NULL, + open_lmenu(reopenin_mx + 23, 29, MENU_TOP_RIGHT, NULL, "Tinypad\nTextEdit\nWebView\nFB2Read\nHexView\nOther"); } void EventShowThemesList() { menu_id = COLOR_SCHEME; - open_lmenu(Form.left+5 + theme_mx + 23, - Form.top+29+skin_height, MENU_ALIGN_TOP_RIGHT, + open_lmenu(theme_mx + 23, 29, MENU_TOP_RIGHT, curcol_scheme+1, #color_scheme_names); } void EventShowRmbMenu() { menu_id = RMB_MENU; - open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, - MENU_ALIGN_TOP_LEFT, NULL, #rmb_menu); + open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #rmb_menu); }