From 4c1535eb6b988e63ddae8390fe89a71a20d6f9de Mon Sep 17 00:00:00 2001
From: Jeff Walsh <jawalsh@localhost.localdomain>
Date: Fri, 17 Jan 2020 10:47:49 +1100
Subject: [PATCH] Handle keyboard fd correctly to fix cursor blink

---
 src/pgtkterm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 48a5a96f42c1..a8ae16dbbc50 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -4302,6 +4302,8 @@ pgtk_delete_terminal (struct terminal *terminal)
       dpyinfo->gdpy = NULL;
     }
 
+  delete_keyboard_wait_descriptor(0);
+
   pgtk_delete_display (dpyinfo);
   unblock_input ();
 }
@@ -6269,6 +6271,11 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
 
   xsettings_initialize (dpyinfo);
 
+  /* According to w32term.c this will stop the emacs console handling
+     code from handling keyboard input when we want gtk to do that for
+     us */
+  add_keyboard_wait_descriptor (0);
+
   pgtk_selection_init();
 
   pgtk_im_init (dpyinfo);