KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Eolite: fix paste

Browse Source 
WebView: fix space in the end of value
menu: refine params


git-svn-id: svn://kolibrios.org@8020 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-06-03 22:21:39 +00:00
parent 83f1ae7375
commit c9389437b7
12 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

264
programs/cmm/TWB/colors.h
View File

@ -9,146 +9,146 @@ struct color_spec {
collection_int text_colors; collection_int text_colors;
struct color_spec color_specs[] = { struct color_spec color_specs[] = {
"aliceblue", 0xF0F8FF, "aliceblue", 0xF0F8FF,
"antiquewhite", 0xFAEBD7, "antiquewhite", 0xFAEBD7,
"aqua", 0x00FFFF, "aqua", 0x00FFFF,
"aquamarine", 0x7FFFD4, "aquamarine", 0x7FFFD4,
"azure", 0xF0FFFF, "azure", 0xF0FFFF,
"beige", 0xF5F5DC, "beige", 0xF5F5DC,
"bisque", 0xFFE4C4, "bisque", 0xFFE4C4,
"black", 0x000000, "black", 0x000000,
"blanchedalmond",0xFFEBCD, "blanchedalmond", 0xFFEBCD,
"blue", 0x0000FF, "blue", 0x0000FF,
"blueviolet", 0x8A2BE2, "blueviolet", 0x8A2BE2,
"brown", 0xA52A2A, "brown", 0xA52A2A,
"burlywood", 0xDEB887, "burlywood", 0xDEB887,
"cadetblue", 0x5F9EA0, "cadetblue", 0x5F9EA0,
"chartreuse", 0x7FFF00, "chartreuse", 0x7FFF00,
"chocolate", 0xD2691E, "chocolate", 0xD2691E,
"coral", 0xFF7F50, "coral", 0xFF7F50,
"cornflowerblue",0x6495ED, "cornflowerblue", 0x6495ED,
"cornsilk", 0xFFF8DC, "cornsilk", 0xFFF8DC,
"crimson", 0xDC143C, "crimson", 0xDC143C,
"cyan", 0x00FFFF, "cyan", 0x00FFFF,
"darkblue", 0x00008B, "darkblue", 0x00008B,
"darkcyan", 0x008B8B, "darkcyan", 0x008B8B,
"darkgoldenrod", 0xB8860B, "darkgoldenrod", 0xB8860B,
"darkgray", 0xA9A9A9, "darkgray", 0xA9A9A9,
"darkgreen", 0x006400, "darkgreen", 0x006400,
"darkkhaki", 0xBDB76B, "darkkhaki", 0xBDB76B,
"darkmagenta", 0x8B008B, "darkmagenta", 0x8B008B,
"darkolivegreen",0x556B2F, "darkolivegreen", 0x556B2F,
"darkorange", 0xFF8C00, "darkorange", 0xFF8C00,
"darkorchid", 0x9932CC, "darkorchid", 0x9932CC,
"darkred", 0x8B0000, "darkred", 0x8B0000,
"darksalmon", 0xE9967A, "darksalmon", 0xE9967A,
"darkseagreen", 0x8FBC8F, "darkseagreen", 0x8FBC8F,
"darkslateblue", 0x483D8B, "darkslateblue", 0x483D8B,
"darkslategray", 0x2F4F4F, "darkslategray", 0x2F4F4F,
"darkturquoise", 0x00CED1, "darkturquoise", 0x00CED1,
"darkviolet", 0x9400D3, "darkviolet", 0x9400D3,
"deeppink", 0xFF1493, "deeppink", 0xFF1493,
"deepskyblue", 0x00BFFF, "deepskyblue", 0x00BFFF,
"dimgray", 0x696969, "dimgray", 0x696969,
"dodgerblue", 0x1E90FF, "dodgerblue", 0x1E90FF,
"firebrick", 0xB22222, "firebrick", 0xB22222,
"floralwhite", 0xFFFAF0, "floralwhite", 0xFFFAF0,
"forestgreen", 0x228B22, "forestgreen", 0x228B22,
"fuchsia", 0xFF00FF, "fuchsia", 0xFF00FF,
"gainsboro", 0xDCDCDC, "gainsboro", 0xDCDCDC,
"ghostwhite", 0xF8F8FF, "ghostwhite", 0xF8F8FF,
"gold", 0xFFD700, "gold", 0xFFD700,
"goldenrod", 0xDAA520, "goldenrod", 0xDAA520,
"gray", 0x808080, "gray", 0x808080,
"green", 0x008000, "green", 0x008000,
"greenyellow", 0xADFF2F, "greenyellow", 0xADFF2F,
"honeydew", 0xF0FFF0, "honeydew", 0xF0FFF0,
"hotpink", 0xFF69B4, "hotpink", 0xFF69B4,
"indianred", 0xCD5C5C, "indianred", 0xCD5C5C,
"indigo", 0x4B0082, "indigo", 0x4B0082,
"ivory", 0xFFFFF0, "ivory", 0xFFFFF0,
"khaki", 0xF0E68C, "khaki", 0xF0E68C,
"lavender", 0xE6E6FA, "lavender", 0xE6E6FA,
"lavenderblush", 0xFFF0F5, "lavenderblush", 0xFFF0F5,
"lawngreen", 0x7CFC00, "lawngreen", 0x7CFC00,
"lemonchiffon", 0xFFFACD, "lemonchiffon", 0xFFFACD,
"lightblue", 0xADD8E6, "lightblue", 0xADD8E6,
"lightcoral", 0xF08080, "lightcoral", 0xF08080,
"lightcyan", 0xE0FFFF, "lightcyan", 0xE0FFFF,
"lightgoldenrodyellow", 0xFAFAD2, "lightgoldenrodyellow", 0xFAFAD2,
"lightgreen", 0x90EE90, "lightgreen", 0x90EE90,
"lightgrey", 0xD3D3D3, "lightgrey", 0xD3D3D3,
"lightpink", 0xFFB6C1, "lightpink", 0xFFB6C1,
"lightsalmon", 0xFFA07A, "lightsalmon", 0xFFA07A,
"lightseagreen", 0x20B2AA, "lightseagreen", 0x20B2AA,
"lightskyblue", 0x87CEFA, "lightskyblue", 0x87CEFA,
"lightslategray",0x778899, "lightslategray", 0x778899,
"lightsteelblue",0xB0C4DE, "lightsteelblue", 0xB0C4DE,
"lightyellow", 0xFFFFE0, "lightyellow", 0xFFFFE0,
"lime", 0x00FF00, "lime", 0x00FF00,
"limegreen", 0x32CD32, "limegreen", 0x32CD32,
"linen", 0xFAF0E6, "linen", 0xFAF0E6,
"magenta", 0xFF00FF, "magenta", 0xFF00FF,
"maroon", 0x800000, "maroon", 0x800000,
"mediumaquamarine",0x66CDAA, "mediumaquamarine", 0x66CDAA,
"mediumblue", 0x0000CD, "mediumblue", 0x0000CD,
"mediumorchid", 0xBA55D3, "mediumorchid", 0xBA55D3,
"mediumpurple", 0x9370DB, "mediumpurple", 0x9370DB,
"mediumseagreen",0x3CB371, "mediumseagreen", 0x3CB371,
"mediumslateblue",0x7B68EE, "mediumslateblue", 0x7B68EE,
"mediumspringgreen",0x00FA9A, "mediumspringgreen",0x00FA9A,
"mediumturquoise",0x48D1CC, "mediumturquoise",0x48D1CC,
"mediumvioletred",0xC71585, "mediumvioletred",0xC71585,
"midnightblue", 0x191970, "midnightblue", 0x191970,
"mintcream", 0xF5FFFA, "mintcream", 0xF5FFFA,
"mistyrose", 0xFFE4E1, "mistyrose", 0xFFE4E1,
"moccasin", 0xFFE4B5, "moccasin", 0xFFE4B5,
"navajowhite", 0xFFDEAD, "navajowhite", 0xFFDEAD,
"navy", 0x000080, "navy", 0x000080,
"oldlace", 0xFDF5E6, "oldlace", 0xFDF5E6,
"olive", 0x808000, "olive", 0x808000,
"olivedrab", 0x6B8E23, "olivedrab", 0x6B8E23,
"orange", 0xFFA500, "orange", 0xFFA500,
"orangered", 0xFF4500, "orangered", 0xFF4500,
"orchid", 0xDA70D6, "orchid", 0xDA70D6,
"palegoldenrod", 0xEEE8AA, "palegoldenrod", 0xEEE8AA,
"palegreen", 0x98FB98, "palegreen", 0x98FB98,
"paleturquoise", 0xAFEEEE, "paleturquoise", 0xAFEEEE,
"palevioletred", 0xDB7093, "palevioletred", 0xDB7093,
"papayawhip", 0xFFEFD5, "papayawhip", 0xFFEFD5,
"peachpuff", 0xFFDAB9, "peachpuff", 0xFFDAB9,
"peru", 0xCD853F, "peru", 0xCD853F,
"pink", 0xFFC0CB, "pink", 0xFFC0CB,
"plum", 0xDDA0DD, "plum", 0xDDA0DD,
"powderblue", 0xB0E0E6, "powderblue", 0xB0E0E6,
"purple", 0x800080, "purple", 0x800080,
"red", 0xFF0000, "red", 0xFF0000,
"rosybrown", 0xBC8F8F, "rosybrown", 0xBC8F8F,
"royalblue", 0x4169E1, "royalblue", 0x4169E1,
"saddlebrown", 0x8B4513, "saddlebrown", 0x8B4513,
"salmon", 0xFA8072, "salmon", 0xFA8072,
"sandybrown", 0xF4A460, "sandybrown", 0xF4A460,
"seagreen", 0x2E8B57, "seagreen", 0x2E8B57,
"seashell", 0xFFF5EE, "seashell", 0xFFF5EE,
"sienna", 0xA0522D, "sienna", 0xA0522D,
"silver", 0xC0C0C0, "silver", 0xC0C0C0,
"skyblue", 0x87CEEB, "skyblue", 0x87CEEB,
"slateblue", 0x6A5ACD, "slateblue", 0x6A5ACD,
"slategray", 0x708090, "slategray", 0x708090,
"snow", 0xFFFAFA, "snow", 0xFFFAFA,
"springgreen", 0x00FF7F, "springgreen", 0x00FF7F,
"steelblue", 0x4682B4, "steelblue", 0x4682B4,
"tan", 0xD2B48C, "tan", 0xD2B48C,
"teal", 0x008080, "teal", 0x008080,
"thistle", 0xD8BFD8, "thistle", 0xD8BFD8,
"tomato", 0xFF6347, "tomato", 0xFF6347,
"turquoise", 0x40E0D0, "turquoise", 0x40E0D0,
"violet", 0xEE82EE, "violet", 0xEE82EE,
"wheat", 0xF5DEB3, "wheat", 0xF5DEB3,
"white", 0xFFFFFF, "white", 0xFFFFFF,
"whitesmoke", 0xF5F5F5, "whitesmoke", 0xF5F5F5,
"yellow", 0xFFFF00, "yellow", 0xFFFF00,
"yellowgreen", 0x9ACD32, "yellowgreen", 0x9ACD32,
0}; 0};
dword StrToCol(char* htmlcolor) dword StrToCol(char* htmlcolor)

26
programs/cmm/TWB/img.h
View File

@ -56,19 +56,6 @@ void _img::set_data(dword _data, _data_len)
data.set(getid, _data); 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) void _img::draw(int _x, _y, _start, _height)
{ {
int i, img_x, img_y; 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) void ImageCache::Images(dword left1, top1, width1)

1
programs/cmm/TWB/parse_tag.h
View File

@ -106,6 +106,7 @@ bool _tag::get_next_param()
ESBYTE[i+1] = '\0'; ESBYTE[i+1] = '\0';
} }
strlwr(#attr); strlwr(#attr);
strrtrim(#val);
attributes.add(#attr); attributes.add(#attr);
values.add(#val); values.add(#val);

2
programs/cmm/appearance/appearance.c
View File

@ -132,7 +132,7 @@ void main()
select_list.ProcessMouse(mouse.x, mouse.y); select_list.ProcessMouse(mouse.x, mouse.y);
SelectList_Draw(); SelectList_Draw();
EventSetNewCurrent(); 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; break;

15
programs/cmm/browser/WebView.c
View File

@ -32,7 +32,7 @@
#define URL_SIZE 4000 #define URL_SIZE 4000
char version[]="WebView 2.65"; char version[]="WebView 2.65b";
#include "texts.h" #include "texts.h"
#include "cache.h" #include "cache.h"
@ -789,27 +789,28 @@ void DrawProgress()
void EventShowPageMenu() 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; menu_id = VIEW_SOURCE;
} }
void EventShowLinkMenu() 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; menu_id = IN_NEW_TAB;
} }
void EventShowMainMenu() void EventShowMainMenu()
{ {
open_lmenu(Form.left + Form.cwidth - PADDING, Form.top + skin_height + PADDING + TSZE + 3, open_lmenu(Form.cwidth - PADDING -4, PADDING + TSZE + 3,
MENU_ALIGN_TOP_RIGHT, NULL, #main_menu); MENU_TOP_RIGHT, NULL, #main_menu);
menu_id = OPEN_FILE; menu_id = OPEN_FILE;
} }
void EventShowEncodingsList() void EventShowEncodingsList()
{ {
open_lmenu(Form.left + Form.cwidth, Form.top + skin_height + Form.cheight - STATUSBAR_H + 12, open_lmenu(Form.cwidth-4, Form.cheight - STATUSBAR_H + 12,
MENU_ALIGN_BOT_RIGHT, WB1.cur_encoding + 1, "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866"); MENU_BOT_RIGHT, WB1.cur_encoding + 1,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866");
menu_id = ENCODINGS; menu_id = ENCODINGS;
} }

7
programs/cmm/eolite/Eolite.c
View File

@ -3,8 +3,8 @@
// 70.5 - get volume info and label // 70.5 - get volume info and label
#define TITLE "Eolite File Manager 4.46c" #define TITLE "Eolite File Manager 4.46d"
#define ABOUT_TITLE "EOLITE 4.46c" #define ABOUT_TITLE "EOLITE 4.46d"
#ifndef AUTOBUILD #ifndef AUTOBUILD
#include "lang.h--" #include "lang.h--"
@ -172,17 +172,20 @@ void handle_param()
param[strrchr(#param, '/')-1] = '\0'; param[strrchr(#param, '/')-1] = '\0';
strcpy(#path, #param + 3); strcpy(#path, #param + 3);
properties_dialog(); properties_dialog();
ExitProcess();
return; return;
case 'd': case 'd':
strcpy(#file_path, #param + 3); strcpy(#file_path, #param + 3);
itdir = dir_exists(#file_path); itdir = dir_exists(#file_path);
DisplayOperationForm(DELETE_FLAG); DisplayOperationForm(DELETE_FLAG);
DeleteSingleElement(); DeleteSingleElement();
ExitProcess();
return; return;
case 'v': case 'v':
cut_active = param[2] - '0'; cut_active = param[2] - '0';
strcpy(#path, #param + 4); strcpy(#path, #param + 4);
PasteThread(); PasteThread();
ExitProcess();
return; return;
} }
} }

6
programs/cmm/eolite/include/menu.h
View File

@ -140,15 +140,13 @@ void EventShowListMenu()
text = #file_actions; text = #file_actions;
active_menu = MENU_FILE; active_menu = MENU_FILE;
} }
open_lmenu(mouse.x+Form.left+5, mouse.y+Form.top+3 open_lmenu(mouse.x, mouse.y+3, MENU_TOP_LEFT, NULL, text);
+skin_height, MENU_ALIGN_TOP_LEFT, NULL, text);
} }
void EventShowBurgerMenu() void EventShowBurgerMenu()
{ {
active_menu = MENU_BURGER; active_menu = MENU_BURGER;
open_lmenu(Form.width-10+Form.left, 35+Form.top+skin_height, open_lmenu(Form.cwidth-6, 35, MENU_TOP_RIGHT, NULL, #burger_menu_items);
MENU_ALIGN_TOP_RIGHT, NULL, #burger_menu_items);
} }
bool GetMenuClick() bool GetMenuClick()

8
programs/cmm/examples/menu.c
View File

@ -44,13 +44,13 @@ void main()
if (id==1) ExitProcess(); if (id==1) ExitProcess();
if (id==butv.id) { if (id==butv.id) {
menu_id = butv.id; menu_id = butv.id;
open_lmenu(Form.left+3 + butv.x, Form.top+skin_height + butv.y + butv.h, open_lmenu(butv.x, butv.y + butv.h, MENU_TOP_LEFT,
MENU_ALIGN_TOP_LEFT, current_veg, #vegetables); current_veg, #vegetables);
} }
if (id==buta.id) { if (id==buta.id) {
menu_id = buta.id; menu_id = buta.id;
open_lmenu(Form.left+5 + buta.x + buta.w, Form.top+skin_height + buta.y + buta.h, open_lmenu(buta.x + buta.w, buta.y + buta.h,
MENU_ALIGN_TOP_RIGHT, current_animal, #animals); MENU_TOP_RIGHT, current_animal, #animals);
} }
break; break;

8
programs/cmm/iconedit/iconedit.c
View File

@ -743,14 +743,14 @@ void EventCrop()
void EventShowImageMenu() void EventShowImageMenu()
{ {
open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height + open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h,
image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #image_menu_items); MENU_TOP_LEFT, NULL, #image_menu_items);
} }
void EventShowEditMenu() void EventShowEditMenu()
{ {
open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height + open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h,
image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #edit_menu_items); MENU_TOP_LEFT, NULL, #edit_menu_items);
} }
void EventCheckMenuItemSelected() void EventCheckMenuItemSelected()

12
programs/cmm/lib/gui/menu.h
View File

@ -3,10 +3,10 @@
:dword menu_process_id; :dword menu_process_id;
#define MENU_ALIGN_TOP_LEFT 0 #define MENU_TOP_LEFT 0
#define MENU_ALIGN_TOP_RIGHT 1 #define MENU_TOP_RIGHT 1
#define MENU_ALIGN_BOT_LEFT 2 #define MENU_BOT_LEFT 2
#define MENU_ALIGN_BOT_RIGHT 3 #define MENU_BOT_RIGHT 3
:dword shared_mem = NULL; :dword shared_mem = NULL;
:char shared_name[] = "LMENU"; :char shared_name[] = "LMENU";
@ -17,8 +17,8 @@
if (EDX) shared_mem = memopen(#shared_name, 16, SHM_WRITE); if (EDX) shared_mem = memopen(#shared_name, 16, SHM_WRITE);
} }
ESDWORD[shared_mem ] = _selected; ESDWORD[shared_mem ] = _selected;
ESDWORD[shared_mem + 4] = _x; ESDWORD[shared_mem + 4] = _x + Form.left + 5;
ESDWORD[shared_mem + 8] = _y; ESDWORD[shared_mem + 8] = _y + Form.top + skin_height;
ESDWORD[shared_mem + 12] = _position; ESDWORD[shared_mem + 12] = _position;
menu_process_id = RunProgram("/sys/develop/menu", _text1); menu_process_id = RunProgram("/sys/develop/menu", _text1);
} }

4
programs/cmm/misc/calypte.c
View File

@ -437,8 +437,8 @@ void EventMenuClick()
void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected) void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected)
{ {
open_lmenu(Form.left+5 + _menu_item_x, Form.top+skin_height + TOPPANELH, open_lmenu(_menu_item_x, TOPPANELH, MENU_TOP_LEFT,
MENU_ALIGN_TOP_LEFT, _selected, _menu_list); _selected, _menu_list);
menu_id = _id; menu_id = _id;
} }

13
programs/cmm/quark/quark.c
View File

@ -379,32 +379,29 @@ void EventMagnifyPlus()
void EventShowCharsetsList() void EventShowCharsetsList()
{ {
menu_id = CHANGE_CHARSET; menu_id = CHANGE_CHARSET;
open_lmenu(Form.left + Form.cwidth, Form.top + skin_height open_lmenu(Form.cwidth-4, Form.cheight - 6, MENU_BOT_RIGHT,
+ Form.cheight - 6, MENU_ALIGN_BOT_RIGHT, user_encoding+1, user_encoding+1,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866\nAUTO"); "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866\nAUTO");
} }
void EventShowReopenMenu() void EventShowReopenMenu()
{ {
menu_id = REOPEN_IN_APP; menu_id = REOPEN_IN_APP;
open_lmenu(Form.left+5 + reopenin_mx + 23, Form.top+29+skin_height, open_lmenu(reopenin_mx + 23, 29, MENU_TOP_RIGHT, NULL,
MENU_ALIGN_TOP_RIGHT, NULL,
"Tinypad\nTextEdit\nWebView\nFB2Read\nHexView\nOther"); "Tinypad\nTextEdit\nWebView\nFB2Read\nHexView\nOther");
} }
void EventShowThemesList() void EventShowThemesList()
{ {
menu_id = COLOR_SCHEME; menu_id = COLOR_SCHEME;
open_lmenu(Form.left+5 + theme_mx + 23, open_lmenu(theme_mx + 23, 29, MENU_TOP_RIGHT,
Form.top+29+skin_height, MENU_ALIGN_TOP_RIGHT,
curcol_scheme+1, #color_scheme_names); curcol_scheme+1, #color_scheme_names);
} }
void EventShowRmbMenu() void EventShowRmbMenu()
{ {
menu_id = RMB_MENU; menu_id = RMB_MENU;
open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #rmb_menu);
MENU_ALIGN_TOP_LEFT, NULL, #rmb_menu);
} }