diff --git a/src/keyboard.c b/src/keyboard.c
index c5d8c7814199781863188c7e892acfe3bca77ae6..e2234f3cee8a7e2373cce1d9af6da82b385f1164 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
#include "command.h"
#include "ncmpc.h"
#include "ncmpc_curses.h"
+#include "screen.h"
#include "Compiler.h"
#include <glib.h>
#include <unistd.h>
-static command_t
-get_keyboard_command(void)
+static bool
+ignore_key(int key)
{
- int key = wgetch(stdscr);
- if (key == ERR || key == '\0')
- return CMD_NONE;
+ return key == ERR || key == '\0';
+}
+gcc_pure
+static command_t
+translate_key(int key)
+{
#ifdef HAVE_GETMOUSE
if (key == KEY_MOUSE)
return CMD_MOUSE_EVENT;
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)
{
- ungetch(key);
+ if (ignore_key(key))
+ return;
- command_t cmd = get_keyboard_command();
+ command_t cmd = translate_key(key);
if (cmd != CMD_NONE)
do_input_event(cmd);
}