summaryrefslogtreecommitdiff
path: root/mate-panel/panel-toplevel.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-23 07:40:19 +0100
committerinfirit <[email protected]>2014-11-23 07:45:53 +0100
commit91ae83fa5dce263b568909cbe143fa4f833057c8 (patch)
tree963eede4e9e5e0aac2e8c90dd3f7a91ecd8106b1 /mate-panel/panel-toplevel.c
parentb75dcdb46cce1e2dc864e361902b293f7103a5e3 (diff)
downloadmate-panel-91ae83fa5dce263b568909cbe143fa4f833057c8.tar.bz2
mate-panel-91ae83fa5dce263b568909cbe143fa4f833057c8.tar.xz
Gtk3: Port gdk_keyboard_grab to gdk_device
Based on gnome-panel commits: menu: 434e491bc4a280037638fb828529856276de3512 toplevel: e0bf14009416f19484bd0431a85744db7d907eb9 force-quit: 2760d89026ea5cf5bf25a4b8ceaf9f6dd2651043
Diffstat (limited to 'mate-panel/panel-toplevel.c')
-rw-r--r--mate-panel/panel-toplevel.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index 1e0ab359..4232e56b 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -444,6 +444,7 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
#if GTK_CHECK_VERSION (3, 0, 0)
GdkDisplay *display;
GdkDevice *pointer;
+ GdkDevice *keyboard;
GdkDeviceManager *device_manager;
#endif
@@ -503,6 +504,7 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
display = gdk_window_get_display (window);
device_manager = gdk_display_get_device_manager (display);
pointer = gdk_device_manager_get_client_pointer (device_manager);
+ keyboard = gdk_device_get_associated_device (pointer);
gdk_device_grab (pointer, window,
GDK_OWNERSHIP_NONE, FALSE,
@@ -510,17 +512,24 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
cursor, time_);
g_object_unref (cursor);
+
+ if (grab_keyboard)
+ gdk_device_grab (keyboard, window,
+ GDK_OWNERSHIP_NONE, FALSE,
+ GDK_KEY_PRESS | GDK_KEY_RELEASE,
+ NULL, time_);
+}
#else
gdk_pointer_grab (window, FALSE,
GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
NULL, cursor, time_);
gdk_cursor_unref (cursor);
-#endif
if (grab_keyboard)
gdk_keyboard_grab (window, FALSE, time_);
}
+#endif
static void panel_toplevel_end_grab_op (PanelToplevel* toplevel, guint32 time_)
{
@@ -528,6 +537,7 @@ static void panel_toplevel_end_grab_op (PanelToplevel* toplevel, guint32 time_)
#if GTK_CHECK_VERSION (3, 0, 0)
GdkDisplay *display;
GdkDevice *pointer;
+ GdkDevice *keyboard;
GdkDeviceManager *device_manager;
#endif
@@ -544,12 +554,14 @@ static void panel_toplevel_end_grab_op (PanelToplevel* toplevel, guint32 time_)
display = gtk_widget_get_display (widget);
device_manager = gdk_display_get_device_manager (display);
pointer = gdk_device_manager_get_client_pointer (device_manager);
+ keyboard = gdk_device_get_associated_device (pointer);
gdk_device_ungrab (pointer, time_);
+ gdk_device_ungrab (keyboard, time_);
#else
gdk_pointer_ungrab (time_);
-#endif
gdk_keyboard_ungrab (time_);
+#endif
}
static void panel_toplevel_cancel_grab_op(PanelToplevel* toplevel, guint32 time_)