Code cleanup for paste detection

6 files changed, 30 insertions, 6 deletions

diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c
index f02030c15..249eb46ee 100644
--- a/src/gui/curses/gui-curses-keyboard.c
+++ b/src/gui/curses/gui-curses-keyboard.c
@@ -155,9 +155,7 @@ gui_keyboard_default_bindings ()
 void
 gui_keyboard_read ()
 {
-    int i, key, insert_ok, input_draw, paste_lines;
-    int accept_paste, cancel_paste, text_added_to_buffer;
-    char key_str[32], *key_utf, *input_old;
+    int key, accept_paste, cancel_paste, text_added_to_buffer, paste_lines;
     
     accept_paste = 0;
     cancel_paste = 0;
@@ -225,6 +223,17 @@ gui_keyboard_read ()
             }
         }
     }
+}
+
+/*
+ * gui_keyboard_flush: flush keyboard buffer
+ */
+
+void
+gui_keyboard_flush ()
+{
+    int i, key, insert_ok, input_draw;
+    char key_str[32], *key_utf, *input_old;
     
     /* if there's no paste pending, then we use buffer and do actions
        according to keys */
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index 29d09c68f..118b2d0a4 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -197,6 +197,8 @@ gui_main_loop ()
                 gui_keyboard_read ();
             }
         }
+        else
+            gui_keyboard_flush ();
 #endif
         
         /* read sockets (servers, child process when connecting, FIFO pipe) */
diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h
index a68456eba..190a29143 100644
--- a/src/gui/curses/gui-curses.h
+++ b/src/gui/curses/gui-curses.h
@@ -87,6 +87,7 @@ extern void gui_chat_calculate_line_diff (t_gui_window *, t_gui_line **, int *,
 /* keyboard functions */
 extern void gui_keyboard_default_bindings ();
 extern void gui_keyboard_read ();
+extern void gui_keyboard_flush ();
 
 /* window functions */
 extern void gui_window_wprintw (WINDOW *, char *, ...);
diff --git a/weechat/src/gui/curses/gui-curses-keyboard.c b/weechat/src/gui/curses/gui-curses-keyboard.c
index f02030c15..249eb46ee 100644
--- a/weechat/src/gui/curses/gui-curses-keyboard.c
+++ b/weechat/src/gui/curses/gui-curses-keyboard.c
@@ -155,9 +155,7 @@ gui_keyboard_default_bindings ()
 void
 gui_keyboard_read ()
 {
-    int i, key, insert_ok, input_draw, paste_lines;
-    int accept_paste, cancel_paste, text_added_to_buffer;
-    char key_str[32], *key_utf, *input_old;
+    int key, accept_paste, cancel_paste, text_added_to_buffer, paste_lines;
     
     accept_paste = 0;
     cancel_paste = 0;
@@ -225,6 +223,17 @@ gui_keyboard_read ()
             }
         }
     }
+}
+
+/*
+ * gui_keyboard_flush: flush keyboard buffer
+ */
+
+void
+gui_keyboard_flush ()
+{
+    int i, key, insert_ok, input_draw;
+    char key_str[32], *key_utf, *input_old;
     
     /* if there's no paste pending, then we use buffer and do actions
        according to keys */
diff --git a/weechat/src/gui/curses/gui-curses-main.c b/weechat/src/gui/curses/gui-curses-main.c
index 29d09c68f..118b2d0a4 100644
--- a/weechat/src/gui/curses/gui-curses-main.c
+++ b/weechat/src/gui/curses/gui-curses-main.c
@@ -197,6 +197,8 @@ gui_main_loop ()
                 gui_keyboard_read ();
             }
         }
+        else
+            gui_keyboard_flush ();
 #endif
         
         /* read sockets (servers, child process when connecting, FIFO pipe) */
diff --git a/weechat/src/gui/curses/gui-curses.h b/weechat/src/gui/curses/gui-curses.h
index a68456eba..190a29143 100644
--- a/weechat/src/gui/curses/gui-curses.h
+++ b/weechat/src/gui/curses/gui-curses.h
@@ -87,6 +87,7 @@ extern void gui_chat_calculate_line_diff (t_gui_window *, t_gui_line **, int *,
 /* keyboard functions */
 extern void gui_keyboard_default_bindings ();
 extern void gui_keyboard_read ();
+extern void gui_keyboard_flush ();
 
 /* window functions */
 extern void gui_window_wprintw (WINDOW *, char *, ...);