Merge branch 'win32-runtime-immodule-swap-gtk4' into 'master'

GDK W32: Support switching IM contexts at runtime (GTK4) See merge request GNOME/gtk!372
GorrillaRibs · Oct 7, 2018 · 10fef2f · 10fef2f
2 parents 8e2fb9c + 66c0336
commit 10fef2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
@@ -2124,6 +2124,7 @@ gdk_event_translate (MSG  *msg,
 			 (gulong) msg->wParam,
 			 (gpointer) msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "",
 			 _gdk_input_codepage));
+      gdk_display_setting_changed (display, "gtk-im-module");
       break;
 
     case WM_SYSKEYUP:

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
@@ -180,6 +180,15 @@ _gdk_win32_get_setting (const gchar *name,
             }
         }
     }
+  else if (strcmp ("gtk-im-module", name) == 0)
+    {
+      if (_gdk_input_locale_is_ime)
+        g_value_set_string (value, "ime");
+      else
+        g_value_set_string (value, "");
+
+      return TRUE;
+    }
 
   return FALSE;
 }