colors: return bool instead of int

[ncmpc.git] / src / keyboard.c

diff --git a/src/keyboard.c b/src/keyboard.c
index 80a1eeeae16f41e199fa11dab8cb73ba8216ecd9..e2234f3cee8a7e2373cce1d9af6da82b385f1164 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -21,19 +21,23 @@
 #include "command.h"
 #include "ncmpc.h"
 #include "ncmpc_curses.h"
+#include "screen.h"
 #include "Compiler.h"
 
 #include <glib.h>
 
 #include <unistd.h>
 
-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;
@@ -47,12 +51,18 @@ 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;
@@ -65,3 +75,14 @@ keyboard_init(void)
        g_io_add_watch(channel, G_IO_IN, keyboard_event, NULL);
        g_io_channel_unref(channel);
 }
+
+void
+keyboard_unread(int key)
+{
+       if (ignore_key(key))
+               return;
+
+       command_t cmd = translate_key(key);
+       if (cmd != CMD_NONE)
+               do_input_event(cmd);
+}