From e6d016e64030bfb6bd8b2ed49b5aef0d71f16a31 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Mon, 7 Jan 2013 20:47:01 +0000
Subject: [PATCH] Temp fix for checking printable chars

Use result of wget_wch to check for special keys
---
 src/input_win.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/input_win.c b/src/input_win.c
index 554f939e..50565107 100644
--- a/src/input_win.c
+++ b/src/input_win.c
@@ -51,7 +51,6 @@ static int rows, cols;
 
 static int _handle_edit(const wint_t ch, char *input, int *size);
 static int _printable(const wint_t ch);
-static gboolean _special_key(const wint_t ch);
 static void _clear_input(void);
 static void _go_to_end(int display_size);
 
@@ -115,7 +114,7 @@ inp_get_char(char *input, int *size)
 
     // echo off, and get some more input
     noecho();
-    wget_wch(inp_win, &ch);
+    int result = wget_wch(inp_win, &ch);
 
     gboolean in_command = FALSE;
     if ((display_size > 0 && input[0] == '/') ||
@@ -124,10 +123,10 @@ inp_get_char(char *input, int *size)
     }
 
     if (prefs_get_states()) {
-        if (ch == ERR) {
+        if (result == ERR) {
             prof_handle_idle();
         }
-        if (prefs_get_outtype() && (ch != ERR) && !in_command
+        if (prefs_get_outtype() && (result != ERR) && !in_command
                                                 && _printable(ch)) {
             prof_handle_activity();
         }
@@ -135,7 +134,7 @@ inp_get_char(char *input, int *size)
 
     // if it wasn't an arrow key etc
     if (!_handle_edit(ch, input, size)) {
-        if (_printable(ch)) {
+        if (_printable(ch) && result != KEY_CODE_YES) {
             inp_x = getcurx(inp_win);
 
             // handle insert if not at end of input
@@ -465,19 +464,11 @@ _go_to_end(int display_size)
 static int
 _printable(const wint_t ch)
 {
-   return (ch != ERR && ch != '\n' &&
-            ch != KEY_PPAGE && ch != KEY_NPAGE && ch != KEY_MOUSE &&
-            ch != KEY_F(1) && ch != KEY_F(2) && ch != KEY_F(3) &&
-            ch != KEY_F(4) && ch != KEY_F(5) && ch != KEY_F(6) &&
-            ch != KEY_F(7) && ch != KEY_F(8) && ch != KEY_F(9) &&
-            ch != KEY_F(10) && ch!= KEY_F(11) && ch != KEY_F(12) &&
-            ch != KEY_IC && ch != KEY_EIC && ch != KEY_RESIZE &&
-            !_special_key(ch));
-}
+    char bytes[MB_CUR_MAX+1];
+    size_t utf_len = wcrtomb(bytes, ch, NULL);
+    bytes[utf_len] = '\0';
+ 
+    gunichar unichar = g_utf8_get_char(bytes);
+    return g_unichar_isprint(unichar) && (ch != KEY_MOUSE);
 
-static gboolean
-_special_key(const wint_t ch)
-{
-    char *str = unctrl(ch);
-    return ((strlen(str) > 1) && g_str_has_prefix(str, "^"));
 }