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

core: also display mouse codes with /debug key

Browse Source
This commit is contained in:
Sébastien Helleu
2023-03-17 22:49:50 +01:00
parent 64a553f91f
commit 99ca276556
6 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-command.c
+2 -2
View File
@@ -7804,8 +7804,8 @@ command_init ()
" hdata: display infos about hdata (with free: remove all hdata "
"in memory)\n"
"infolists: display infos about infolists\n"
" key: enable keyboard debug: display raw codes, expanded "
"key name and associated command ('q' to quit this mode)\n"
" key: enable keyboard and mouse debug: display raw codes, "
"expanded key name and associated command ('q' to quit this mode)\n"
" libs: display infos about external libraries used\n"
" memory: display infos about memory usage\n"
" mouse: toggle debug for mouse\n"
src/gui/curses/gui-curses-key.c
+2 -2
View File
@@ -458,7 +458,7 @@ gui_key_flush (int paste)
length_key_str = strlen (key_str);
/* set last key used in buffer if combo buffer is empty */
if (gui_key_grab || gui_mouse_event_pending || !gui_key_combo_buffer[0])
if (gui_key_grab || gui_mouse_event_pending || !gui_key_combo[0])
last_key_used = i;
}
@@ -468,7 +468,7 @@ gui_key_flush (int paste)
gui_key_buffer_remove (0, last_key_used + 1);
if (!gui_key_grab && !gui_mouse_event_pending)
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
}
/*
src/gui/curses/gui-curses-mouse.c
+6 -3
View File
@@ -436,6 +436,9 @@ gui_mouse_event_end ()
const char *mouse_key;
int bare_event;
if (gui_key_debug)
gui_key_debug_print_key (gui_key_combo, NULL, NULL, NULL, 1);
gui_mouse_event_pending = 0;
/* end mouse event timer */
@@ -446,7 +449,7 @@ gui_mouse_event_end ()
}
/* get key from mouse code */
mouse_key = gui_mouse_event_code2key (gui_key_combo_buffer);
mouse_key = gui_mouse_event_code2key (gui_key_combo);
if (mouse_key && mouse_key[0])
{
bare_event = string_match (mouse_key, "*-event-*", 1);
@@ -455,7 +458,7 @@ gui_mouse_event_end ()
if (!bare_event)
gui_mouse_grab_end (mouse_key);
}
else
else if (!gui_key_debug)
{
/* execute command (if found) */
(void) gui_key_focus (mouse_key,
@@ -465,5 +468,5 @@ gui_mouse_event_end ()
gui_mouse_event_reset ();
}
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
}
src/gui/gui-bar-item.c
+1 -1
View File
@@ -879,7 +879,7 @@ gui_bar_item_input_text_cb (const void *pointer, void *data,
{
snprintf (str_key_debug, sizeof (str_key_debug),
"%s%s",
_("keyboard debug ('q' to quit debug mode)"),
_("keyboard and mouse debug ('q' to quit debug mode)"),
str_cursor);
return strdup (str_key_debug);
}
src/gui/gui-key.c
+94 -76
View File
@@ -85,7 +85,7 @@ int gui_key_debug = 0; /* 1 for key debug: display raw codes, */
int gui_key_verbose = 0; /* 1 to see some messages */
char gui_key_combo_buffer[1024]; /* buffer used for combos */
char gui_key_combo[1024]; /* buffer used for combos */
int gui_key_grab = 0; /* 1 if grab mode enabled (alt-k) */
int gui_key_grab_raw = 0; /* grab raw key code? */
int gui_key_grab_count = 0; /* number of keys pressed in grab mode */
@@ -115,7 +115,7 @@ gui_key_init ()
{
int context;
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
gui_key_grab = 0;
gui_key_grab_count = 0;
gui_key_last_activity_time = time (NULL);
@@ -227,7 +227,7 @@ gui_key_grab_end_timer_cb (const void *pointer, void *data, int remaining_calls)
(void) remaining_calls;
/* get expanded name (for example: \x01+U => ctrl-u) */
rc = gui_key_expand (gui_key_combo_buffer, &key_name, &key_name_alias);
rc = gui_key_expand (gui_key_combo, &key_name, &key_name_alias);
if (rc && key_name && key_name_alias)
{
/*
@@ -293,7 +293,7 @@ gui_key_grab_end_timer_cb (const void *pointer, void *data, int remaining_calls)
gui_key_grab = 0;
gui_key_grab_count = 0;
gui_key_grab_command = 0;
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
return WEECHAT_RC_OK;
}
@@ -2251,16 +2251,20 @@ end:
/*
* Prints a key in debug mode:
* - raw combo (eg: "^[[A")
* - key name (eg: "meta-[A")
* - key name with alias (eg: "up")
* - command bound to key or message "no key binding"
* - for keyboard:
* - key name (eg: "meta-[A")
* - key name with alias (eg: "up")
* - command bound to key or message "no key binding"
* - for mouse:
* - "mouse"
*/
void
gui_key_debug_print_key (const char *combo, const char *key_name,
const char *key_name_alias, const char *command)
const char *key_name_alias, const char *command,
int mouse)
{
char *combo2, str_command[4096];
char *combo2, *ptr_combo2, str_command[4096];
if (command)
{
@@ -2281,19 +2285,45 @@ gui_key_debug_print_key (const char *combo, const char *key_name,
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
}
combo2 = string_replace (combo, "\x01", "^");
gui_chat_printf (
NULL,
"%s %s\"%s%s%s\"%s -> %s -> %s %s",
_("debug:"),
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
combo2,
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
key_name,
key_name_alias,
str_command);
combo2 = strdup (combo);
for (ptr_combo2 = combo2; ptr_combo2[0]; ptr_combo2++)
{
if ((ptr_combo2[0] == '\x01') || (ptr_combo2[0] == '\x1B'))
ptr_combo2[0] = '^';
}
if (mouse)
{
gui_chat_printf (
NULL,
"%s %s\"%s%s%s\"%s %s[%s%s%s]",
_("debug:"),
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
combo2,
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
_("mouse"),
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
}
else
{
gui_chat_printf (
NULL,
"%s %s\"%s%s%s\"%s -> %s -> %s %s",
_("debug:"),
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
combo2,
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
key_name,
key_name_alias,
str_command);
}
free (combo2);
}
@@ -2320,21 +2350,20 @@ gui_key_pressed (const char *key_str)
key_name_alias = NULL;
/* add key to buffer */
insert_into_input = (gui_key_combo_buffer[0] == '\0');
length = strlen (gui_key_combo_buffer);
insert_into_input = (gui_key_combo[0] == '\0');
length = strlen (gui_key_combo);
length_key = strlen (key_str);
if (length + length_key + 1 <= (int)sizeof (gui_key_combo_buffer))
strcat (gui_key_combo_buffer, key_str);
if (length + length_key + 1 <= (int)sizeof (gui_key_combo))
strcat (gui_key_combo, key_str);
if (gui_key_debug)
if (gui_key_debug
&& !gui_mouse_event_pending
&& (strcmp (gui_key_combo, "q") == 0))
{
if (strcmp (gui_key_combo_buffer, "q") == 0)
{
gui_key_debug = 0;
gui_key_combo_buffer[0] = '\0';
gui_bar_item_update ("input_text");
goto end_no_input;
}
gui_key_debug = 0;
gui_key_combo[0] = '\0';
gui_bar_item_update ("input_text");
goto end_no_input;
}
/* if we are in "show mode", increase counter and return */
@@ -2352,34 +2381,27 @@ gui_key_pressed (const char *key_str)
/* mouse event pending */
if (gui_mouse_event_pending)
{
if (gui_key_debug)
pos = strstr (gui_key_combo, "\x1B[M");
if (pos)
{
gui_key_combo_buffer[0] = '\0';
}
else
{
pos = strstr (gui_key_combo_buffer, "\x1B[M");
if (pos)
{
pos[0] = '\0';
if (!gui_window_bare_display)
gui_mouse_event_end ();
gui_mouse_event_init ();
}
}
goto end_no_input;
}
if (strstr (gui_key_combo_buffer, "\x01[[M"))
{
gui_key_combo_buffer[0] = '\0';
if (!gui_key_debug)
pos[0] = '\0';
if (!gui_window_bare_display)
gui_mouse_event_end ();
gui_mouse_event_init ();
}
goto end_no_input;
}
rc_expand = gui_key_expand (gui_key_combo_buffer,
&key_name, &key_name_alias);
if (strstr (gui_key_combo, "\x01[[M"))
{
if (gui_key_debug)
gui_key_debug_print_key (gui_key_combo, NULL, NULL, NULL, 1);
gui_key_combo[0] = '\0';
gui_mouse_event_init ();
goto end_no_input;
}
rc_expand = gui_key_expand (gui_key_combo, &key_name, &key_name_alias);
ptr_key = NULL;
exact_match = 0;
@@ -2446,7 +2468,7 @@ gui_key_pressed (const char *key_str)
{
/*
* key is found, but it can be partial match
* (in this case, gui_key_combo_buffer is kept and we'll wait for
* (in this case, gui_key_combo is kept and we'll wait for
* the next key)
*/
if (exact_match)
@@ -2454,11 +2476,9 @@ gui_key_pressed (const char *key_str)
/* exact combo found => execute command */
if (gui_key_debug)
{
gui_key_debug_print_key (gui_key_combo_buffer,
key_name,
key_name_alias,
ptr_key->command);
gui_key_combo_buffer[0] = '\0';
gui_key_debug_print_key (gui_key_combo, key_name,
key_name_alias, ptr_key->command, 0);
gui_key_combo[0] = '\0';
}
else
{
@@ -2466,8 +2486,8 @@ gui_key_pressed (const char *key_str)
"key_combo_%s", gui_key_context_string[context]);
rc = hook_signal_send (signal_name,
WEECHAT_HOOK_SIGNAL_STRING,
gui_key_combo_buffer);
gui_key_combo_buffer[0] = '\0';
gui_key_combo);
gui_key_combo[0] = '\0';
if ((rc != WEECHAT_RC_OK_EAT) && ptr_key->command)
{
commands = string_split_command (ptr_key->command, ';');
@@ -2495,14 +2515,14 @@ gui_key_pressed (const char *key_str)
"key_combo_%s", gui_key_context_string[context]);
if (hook_signal_send (signal_name,
WEECHAT_HOOK_SIGNAL_STRING,
gui_key_combo_buffer) == WEECHAT_RC_OK_EAT)
gui_key_combo) == WEECHAT_RC_OK_EAT)
{
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
goto end_no_input;
}
if (gui_key_focus (gui_key_combo_buffer, GUI_KEY_CONTEXT_CURSOR))
if (gui_key_focus (gui_key_combo, GUI_KEY_CONTEXT_CURSOR))
{
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
goto end_no_input;
}
}
@@ -2512,9 +2532,9 @@ gui_key_pressed (const char *key_str)
"key_combo_%s", gui_key_context_string[context]);
if (hook_signal_send (signal_name,
WEECHAT_HOOK_SIGNAL_STRING,
gui_key_combo_buffer) == WEECHAT_RC_OK_EAT)
gui_key_combo) == WEECHAT_RC_OK_EAT)
{
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
goto end_no_input;
}
}
@@ -2525,12 +2545,10 @@ gui_key_pressed (const char *key_str)
/* key is complete */
if (gui_key_debug)
{
gui_key_debug_print_key (gui_key_combo_buffer,
key_name,
key_name_alias,
NULL);
gui_key_debug_print_key (gui_key_combo, key_name, key_name_alias,
NULL, 0);
}
gui_key_combo_buffer[0] = '\0';
gui_key_combo[0] = '\0';
}
/* in debug mode, don't insert anything in input */
src/gui/gui-key.h
+4 -1
View File
@@ -77,7 +77,7 @@ extern int gui_default_keys_count[GUI_KEY_NUM_CONTEXTS];
extern char *gui_key_context_string[GUI_KEY_NUM_CONTEXTS];
extern int gui_key_debug;
extern int gui_key_verbose;
extern char gui_key_combo_buffer[];
extern char gui_key_combo[];
extern int gui_key_grab;
extern int gui_key_grab_count;
extern int *gui_key_buffer;
@@ -112,6 +112,9 @@ extern int gui_key_unbind (struct t_gui_buffer *buffer, int context,
const char *key);
extern int gui_key_unbind_plugin (const char *context, const char *key);
extern int gui_key_focus (const char *key, int context);
extern void gui_key_debug_print_key (const char *combo, const char *key_name,
const char *key_name_alias,
const char *command, int mouse);
extern int gui_key_pressed (const char *key_str);
extern void gui_key_free (int context,
struct t_gui_key **keys,