summaryrefslogtreecommitdiff
path: root/gtk/gtksettings.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2013-11-13 12:20:07 +0100
committerAlexander Larsson <alexl@redhat.com>2013-11-13 12:23:06 +0100
commit4226f97d540ecd8cb5995184bfba7a1102560740 (patch)
tree8be015371a590bba0143c3ebb337ee934c4cdcfd /gtk/gtksettings.c
parentca89f5ab93da6745fb7f5d3483ed2943fce6f94e (diff)
downloadgtk+-4226f97d540ecd8cb5995184bfba7a1102560740.tar.gz
broadway: Support ipad on-screen keyboard
We add a custom im module for broadway that calls some broadway specific APIs to show/hide the keyboard on focus in/out. We then forward this to the browser, and on the ipad we focus an input field to activate the keyboard.
Diffstat (limited to 'gtk/gtksettings.c')
-rw-r--r--gtk/gtksettings.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index e61a4b7be5..329624bb22 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -44,6 +44,10 @@
#include "wayland/gdkwayland.h"
#endif
+#ifdef GDK_WINDOWING_BROADWAY
+#include "broadway/gdkbroadway.h"
+#endif
+
#ifdef GDK_WINDOWING_QUARTZ
#include "quartz/gdkquartz.h"
#endif
@@ -1670,11 +1674,22 @@ gtk_settings_get_for_screen (GdkScreen *screen)
{
#ifdef GDK_WINDOWING_QUARTZ
if (GDK_IS_QUARTZ_SCREEN (screen))
- settings = g_object_new (GTK_TYPE_SETTINGS,
- "gtk-key-theme-name", "Mac",
- "gtk-shell-shows-app-menu", TRUE,
- "gtk-shell-shows-menubar", TRUE,
- NULL);
+ {
+ settings = g_object_new (GTK_TYPE_SETTINGS,
+ "gtk-key-theme-name", "Mac",
+ "gtk-shell-shows-app-menu", TRUE,
+ "gtk-shell-shows-menubar", TRUE,
+ NULL);
+ }
+ else
+#endif
+#ifdef GDK_WINDOWING_BROADWAY
+ if (GDK_IS_BROADWAY_DISPLAY (gdk_screen_get_display (screen)))
+ {
+ settings = g_object_new (GTK_TYPE_SETTINGS,
+ "gtk-im-module", "broadway",
+ NULL);
+ }
else
#endif
settings = g_object_new (GTK_TYPE_SETTINGS, NULL);