diff --git a/src/keyboard.c b/src/keyboard.c
index 5042af2a3648e9e0b1237e54b44de3fda42cb8a4..e2234f3cee8a7e2373cce1d9af6da82b385f1164 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
#include <unistd.h>
+static bool
+ignore_key(int key)
+{
+ return key == ERR || key == '\0';
+}
+
gcc_pure
static command_t
translate_key(int key)
{
- if (key == ERR || key == '\0')
- return CMD_NONE;
-
#ifdef HAVE_GETMOUSE
if (key == KEY_MOUSE)
return CMD_MOUSE_EVENT;
return get_key_command(key);
}
-static command_t
-get_keyboard_command(void)
-{
- return translate_key(wgetch(screen.main_window.w));
-}
-
static gboolean
keyboard_event(gcc_unused GIOChannel *source,
gcc_unused GIOCondition condition,
gcc_unused gpointer data)
{
+ int key = wgetch(screen.main_window.w);
+ if (ignore_key(key))
+ return true;
+
+ command_t cmd = translate_key(key);
+ if (cmd == CMD_NONE)
+ return true;
+
begin_input_event();
- command_t cmd = get_keyboard_command();
- if (cmd != CMD_NONE)
- if (!do_input_event(cmd))
- return FALSE;
+ if (!do_input_event(cmd))
+ return FALSE;
end_input_event();
return TRUE;
void
keyboard_unread(int key)
{
+ if (ignore_key(key))
+ return;
+
command_t cmd = translate_key(key);
if (cmd != CMD_NONE)
do_input_event(cmd);