From: Max Kellermann <max.kellermann@gmail.com>
Date: Mon, 20 Mar 2017 19:02:01 +0000 (+0100)
Subject: keyboard: no begin/end_input_event() on unknown key codes
X-Git-Tag: v0.27~32
X-Git-Url: https://git.tokkee.org/?p=ncmpc.git;a=commitdiff_plain;h=ade1f0e22efa26d9d992e6acb9bc415b40f30c6b

keyboard: no begin/end_input_event() on unknown key codes
---

diff --git a/src/keyboard.c b/src/keyboard.c
index edf7e61..e2234f3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -38,9 +38,6 @@ gcc_pure
 static command_t
 translate_key(int key)
 {
-	if (ignore_key(key))
-		return CMD_NONE;
-
 #ifdef HAVE_GETMOUSE
 	if (key == KEY_MOUSE)
 		return CMD_MOUSE_EVENT;
@@ -49,23 +46,23 @@ translate_key(int key)
 	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;
@@ -82,6 +79,9 @@ keyboard_init(void)
 void
 keyboard_unread(int key)
 {
+	if (ignore_key(key))
+		return;
+
 	command_t cmd = translate_key(key);
 	if (cmd != CMD_NONE)
 		do_input_event(cmd);