diff --git a/src/keyboard.c b/src/keyboard.c
index 226306cf7543fc1823fb167b115baa2ad54f7c03..c5d8c7814199781863188c7e892acfe3bca77ae6 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
#include "keyboard.h"
#include "command.h"
#include "ncmpc.h"
+#include "ncmpc_curses.h"
#include "Compiler.h"
#include <glib.h>
#include <unistd.h>
+static command_t
+get_keyboard_command(void)
+{
+ int key = wgetch(stdscr);
+ if (key == ERR || key == '\0')
+ return CMD_NONE;
+
+#ifdef HAVE_GETMOUSE
+ if (key == KEY_MOUSE)
+ return CMD_MOUSE_EVENT;
+#endif
+
+ return get_key_command(key);
+}
+
static gboolean
keyboard_event(gcc_unused GIOChannel *source,
gcc_unused GIOCondition condition,
command_t cmd = get_keyboard_command();
if (cmd != CMD_NONE)
- if (do_input_event(cmd) != 0)
+ if (!do_input_event(cmd))
return FALSE;
end_input_event();
g_io_add_watch(channel, G_IO_IN, keyboard_event, NULL);
g_io_channel_unref(channel);
}
+
+void
+keyboard_unread(int key)
+{
+ ungetch(key);
+
+ command_t cmd = get_keyboard_command();
+ if (cmd != CMD_NONE)
+ do_input_event(cmd);
+}