brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellGlobal: repurpose the stage_gdk_window as the IBus window

Browse Source 
And use it directly in the IBus event handling (by pushing it down
to StIMText)

https://bugzilla.gnome.org/show_bug.cgi?id=707467
This commit is contained in:
Giovanni Campagna 2013-09-11 17:44:24 +02:00
parent 11c2933e23
commit 9d1f789937
3 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/shell-global.c
View File

@ -52,7 +52,7 @@ struct _ShellGlobal {
ClutterStage *stage; ClutterStage *stage;
Window stage_xwindow; Window stage_xwindow;
GdkWindow *stage_gdk_window; GdkWindow *ibus_window;
MetaDisplay *meta_display; MetaDisplay *meta_display;
GdkDisplay *gdk_display; GdkDisplay *gdk_display;
@ -793,13 +793,9 @@ gnome_shell_gdk_event_handler (GdkEvent *event_gdk,
{ {
if (event_gdk->type == GDK_KEY_PRESS || event_gdk->type == GDK_KEY_RELEASE) if (event_gdk->type == GDK_KEY_PRESS || event_gdk->type == GDK_KEY_RELEASE)
{ {
ClutterActor *stage; ShellGlobal *global = data;
Window stage_xwindow;
stage = CLUTTER_ACTOR (data); if (event_gdk->key.window == global->ibus_window)
stage_xwindow = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
if (GDK_WINDOW_XID (event_gdk->key.window) == stage_xwindow)
{ {
ClutterDeviceManager *device_manager = clutter_device_manager_get_default (); ClutterDeviceManager *device_manager = clutter_device_manager_get_default ();
ClutterInputDevice *keyboard = clutter_device_manager_get_core_device (device_manager, ClutterInputDevice *keyboard = clutter_device_manager_get_core_device (device_manager,
@ -809,7 +805,7 @@ gnome_shell_gdk_event_handler (GdkEvent *event_gdk,
CLUTTER_KEY_PRESS : CLUTTER_KEY_RELEASE); CLUTTER_KEY_PRESS : CLUTTER_KEY_RELEASE);
event_clutter->key.time = event_gdk->key.time; event_clutter->key.time = event_gdk->key.time;
event_clutter->key.flags = CLUTTER_EVENT_NONE; event_clutter->key.flags = CLUTTER_EVENT_NONE;
event_clutter->key.stage = CLUTTER_STAGE (stage); event_clutter->key.stage = CLUTTER_STAGE (global->stage);
event_clutter->key.source = NULL; event_clutter->key.source = NULL;
/* This depends on ClutterModifierType and GdkModifierType being /* This depends on ClutterModifierType and GdkModifierType being
@ -852,8 +848,9 @@ _shell_global_set_plugin (ShellGlobal *global,
global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen)); global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen));
global->stage_xwindow = clutter_x11_get_stage_window (global->stage); global->stage_xwindow = clutter_x11_get_stage_window (global->stage);
global->stage_gdk_window = gdk_x11_window_foreign_new_for_display (global->gdk_display, global->ibus_window = gdk_x11_window_foreign_new_for_display (global->gdk_display,
global->stage_xwindow); global->stage_xwindow);
st_im_text_set_event_window (global->ibus_window);
g_signal_connect (global->stage, "notify::width", g_signal_connect (global->stage, "notify::width",
G_CALLBACK (global_stage_notify_width), global); G_CALLBACK (global_stage_notify_width), global);
@ -882,7 +879,7 @@ _shell_global_set_plugin (ShellGlobal *global,
g_signal_connect (global->meta_display, "notify::focus-window", g_signal_connect (global->meta_display, "notify::focus-window",
G_CALLBACK (focus_window_changed), global); G_CALLBACK (focus_window_changed), global);
gdk_event_handler_set (gnome_shell_gdk_event_handler, global->stage, NULL); gdk_event_handler_set (gnome_shell_gdk_event_handler, global, NULL);
global->focus_manager = st_focus_manager_get_for_stage (global->stage); global->focus_manager = st_focus_manager_get_for_stage (global->stage);
} }

30
src/st/st-im-text.c
View File

@ -41,7 +41,6 @@
#endif #endif
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <clutter/x11/clutter-x11.h>
#include <glib.h> #include <glib.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -203,25 +202,14 @@ st_im_text_get_paint_volume (ClutterActor *self,
return clutter_paint_volume_set_from_allocation (volume, self); return clutter_paint_volume_set_from_allocation (volume, self);
} }
/* Returns a new reference to window */ static GdkWindow *event_window;
static GdkWindow *
window_for_actor (ClutterActor *actor) void
st_im_text_set_event_window (GdkWindow *window)
{ {
GdkDisplay *display = gdk_display_get_default (); g_assert (event_window == NULL);
ClutterActor *stage;
Window xwindow;
GdkWindow *window;
stage = clutter_actor_get_stage (actor); event_window = window;
xwindow = clutter_x11_get_stage_window ((ClutterStage *)stage);
window = gdk_x11_window_lookup_for_display (display, xwindow);
if (window)
g_object_ref (window);
else
window = gdk_x11_window_foreign_new_for_display (display, xwindow);
return window;
} }
static void static void
@ -229,7 +217,8 @@ st_im_text_realize (ClutterActor *actor)
{ {
StIMTextPrivate *priv = ST_IM_TEXT (actor)->priv; StIMTextPrivate *priv = ST_IM_TEXT (actor)->priv;
priv->window = window_for_actor (actor); g_assert (event_window != NULL);
priv->window = g_object_ref (event_window);
gtk_im_context_set_client_window (priv->im_context, priv->window); gtk_im_context_set_client_window (priv->im_context, priv->window);
} }
@ -291,7 +280,8 @@ key_event_to_gdk (ClutterKeyEvent *event_clutter)
event_gdk = (GdkEventKey *)gdk_event_new ((event_clutter->type == CLUTTER_KEY_PRESS) ? event_gdk = (GdkEventKey *)gdk_event_new ((event_clutter->type == CLUTTER_KEY_PRESS) ?
GDK_KEY_PRESS : GDK_KEY_RELEASE); GDK_KEY_PRESS : GDK_KEY_RELEASE);
event_gdk->window = window_for_actor ((ClutterActor *)event_clutter->stage); g_assert (event_window != NULL);
event_gdk->window = g_object_ref (event_window);
event_gdk->send_event = FALSE; event_gdk->send_event = FALSE;
event_gdk->time = event_clutter->time; event_gdk->time = event_clutter->time;
/* This depends on ClutterModifierType and GdkModifierType being /* This depends on ClutterModifierType and GdkModifierType being

2
src/st/st-im-text.h
View File

@ -68,6 +68,8 @@ void st_im_text_set_input_hints (StIMText *imtext,
GtkInputHints hints); GtkInputHints hints);
GtkInputHints st_im_text_get_input_hints (StIMText *imtext); GtkInputHints st_im_text_get_input_hints (StIMText *imtext);
void st_im_text_set_event_window (GdkWindow *window);
G_END_DECLS G_END_DECLS
#endif /* __ST_IM_TEXT_H__ */ #endif /* __ST_IM_TEXT_H__ */