1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00

core: split alias list into two lists

This commit is contained in:
Sébastien Helleu
2023-03-07 08:07:12 +01:00
parent 7f1f6a6e84
commit d94979fe3e
+21 -15
View File
@@ -71,14 +71,14 @@ char *gui_key_context_string[GUI_KEY_NUM_CONTEXTS] =
char *gui_key_focus_string[GUI_KEY_NUM_FOCUS] =
{ "*", "chat", "bar", "item" };
char *gui_key_unsafe_list[] =
{ "comma", "space", NULL };
char *gui_key_modifier_list[] =
{ "ctrl-", "meta-", "meta2-", "shift-", NULL };
char *gui_key_safe_list[] =
{ "ctrl-", "meta-", "meta2-", "shift-", "f0", "f1", "f2", "f3", "f4", "f5",
"f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16",
"f17", "f18", "f19", "f20", "home", "insert", "delete", "end", "backspace",
"pgup", "pgdn", "up", "down", "right", "left", "tab", "return", NULL };
char *gui_key_alias_list[] =
{ "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11",
"f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20",
"home", "insert", "delete", "end", "backspace", "pgup", "pgdn",
"up", "down", "right", "left", "tab", "return", "comma", "space", NULL };
int gui_key_debug = 0; /* 1 for key debug: display raw codes, */
/* do not execute associated actions */
@@ -1193,20 +1193,26 @@ gui_key_is_safe (int context, const char *key)
return 1;
}
for (i = 0; gui_key_unsafe_list[i]; i++)
if (strncmp (key, "comma", 5) == 0)
return 0;
if (strncmp (key, "space", 5) == 0)
return 0;
for (i = 0; gui_key_modifier_list[i]; i++)
{
if (strncmp (key, gui_key_unsafe_list[i],
strlen (gui_key_unsafe_list[i])) == 0)
if (strncmp (key, gui_key_modifier_list[i],
strlen (gui_key_modifier_list[i])) == 0)
{
/* key is not safe */
return 0;
/* key is safe */
return 1;
}
}
for (i = 0; gui_key_safe_list[i]; i++)
for (i = 0; gui_key_alias_list[i]; i++)
{
if (strncmp (key, gui_key_safe_list[i],
strlen (gui_key_safe_list[i])) == 0)
if (strncmp (key, gui_key_alias_list[i],
strlen (gui_key_alias_list[i])) == 0)
{
/* key is safe */
return 1;