callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'win32-runtime-immodule-swap' into 'gtk-3-24'

Browse Source 
GDK W32: Support switching input modules at runtime

See merge request GNOME/gtk!366
This commit is contained in:
LRN 2018-10-06 15:52:52 +00:00
commit 259c8e6373
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/win32/gdkevents-win32.c
View File

@ -2242,6 +2242,25 @@ _gdk_win32_window_fill_min_max_info (GdkWindow *window,
return TRUE;
}
static void
gdk_settings_notify (GdkWindow *window,
const char *name,
GdkSettingAction action)
{
GdkEvent *new_event;
if (!g_str_has_prefix (name, "gtk-"))
return;
new_event = gdk_event_new (GDK_SETTING);
new_event->setting.window = window;
new_event->setting.send_event = FALSE;
new_event->setting.action = action;
new_event->setting.name = (char*) name;
_gdk_win32_append_event (new_event);
}
#define GDK_ANY_BUTTON_MASK (GDK_BUTTON1_MASK | \
GDK_BUTTON2_MASK | \
GDK_BUTTON3_MASK | \
@ -2456,6 +2475,7 @@ gdk_event_translate (MSG *msg,
(gulong) msg->wParam,
(gpointer) msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "",
_gdk_input_codepage));
gdk_settings_notify (window, "gtk-im-module", GDK_SETTING_ACTION_CHANGED);
break;
case WM_SYSKEYUP:

9
gdk/win32/gdkproperty-win32.c
View File

@ -389,6 +389,15 @@ _gdk_win32_screen_get_setting (GdkScreen *screen,
}
}
}
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;
}