Fix toggling `x-gtk-use-native-input'.

* lisp/term/x-win.el (x-internal-focus-input-context):
(x-gtk-use-native-input-watcher): Update for changes to
`x-internal-focus-input-context'.

* src/xfns.c (Fx_internal_focus_input_context): New parameter
`focus'.

1 files changed, 15 insertions, 5 deletions

diff --git a/src/xfns.c b/src/xfns.c
index deaf4204a9f..4b10f5035a7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8567,18 +8567,28 @@ DEFUN ("x-gtk-debug", Fx_gtk_debug, Sx_gtk_debug, 1, 1, 0,
 #endif  /* USE_GTK */
 
 DEFUN ("x-internal-focus-input-context", Fx_internal_focus_input_context,
-       Sx_internal_focus_input_context, 1, 1, 0,
+       Sx_internal_focus_input_context, 2, 2, 0,
        doc: /* Focus and set the client window of FRAME's GTK input context.
+If FOCUS is nil, focus out and remove the client window instead.
 This should be called from a variable watcher for `x-gtk-use-native-input'.  */)
-  (Lisp_Object frame)
+  (Lisp_Object focus, Lisp_Object frame)
 {
 #ifdef USE_GTK
   struct frame *f = decode_window_system_frame (frame);
   GtkWidget *widget = FRAME_GTK_OUTER_WIDGET (f);
 
-  gtk_im_context_focus_in (FRAME_X_OUTPUT (f)->im_context);
-  gtk_im_context_set_client_window (FRAME_X_OUTPUT (f)->im_context,
-                                    gtk_widget_get_window (widget));
+  if (!NILP (focus))
+    {
+      gtk_im_context_focus_in (FRAME_X_OUTPUT (f)->im_context);
+      gtk_im_context_set_client_window (FRAME_X_OUTPUT (f)->im_context,
+                                        gtk_widget_get_window (widget));
+    }
+  else
+    {
+      gtk_im_context_focus_out (FRAME_X_OUTPUT (f)->im_context);
+      gtk_im_context_set_client_window (FRAME_X_OUTPUT (f)->im_context,
+                                        NULL);
+    }
 #endif
 
   return Qnil;