[gtk+] inspector: Use seat grabs for the "inspect widget" feature
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] inspector: Use seat grabs for the "inspect widget" feature
- Date: Wed, 16 Dec 2015 18:49:22 +0000 (UTC)
commit 3f7eefb922811430c0c04671f15a02c15592fd8c
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Dec 16 19:28:53 2015 +0100
inspector: Use seat grabs for the "inspect widget" feature
And remove some usages of GdkDeviceManager API.
gtk/inspector/inspect-button.c | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c
index c0df8de..3a1eb03 100644
--- a/gtk/inspector/inspect-button.c
+++ b/gtk/inspector/inspect-button.c
@@ -316,16 +316,13 @@ property_query_event (GtkWidget *widget,
gpointer data)
{
GtkInspectorWindow *iw = (GtkInspectorWindow *)data;
- GdkDevice *device;
if (event->type == GDK_BUTTON_RELEASE)
{
- device = gdk_event_get_device (event);
-
g_signal_handlers_disconnect_by_func (widget, property_query_event, data);
gtk_grab_remove (widget);
if (iw->grabbed)
- gdk_device_ungrab (device, GDK_CURRENT_TIME);
+ gdk_seat_ungrab (gdk_event_get_seat (event));
reemphasize_window (GTK_WIDGET (iw));
on_inspect_widget (widget, event, data);
@@ -342,9 +339,8 @@ property_query_event (GtkWidget *widget,
{
g_signal_handlers_disconnect_by_func (widget, property_query_event, data);
gtk_grab_remove (widget);
- device = gdk_device_get_associated_device (gdk_event_get_device (event));
if (iw->grabbed)
- gdk_device_ungrab (device, GDK_CURRENT_TIME);
+ gdk_seat_ungrab (gdk_event_get_seat (event));
reemphasize_window (GTK_WIDGET (iw));
clear_flash (iw);
@@ -359,7 +355,6 @@ gtk_inspector_on_inspect (GtkWidget *button,
GtkInspectorWindow *iw)
{
GdkDisplay *display;
- GdkDevice *device;
GdkCursor *cursor;
GdkGrabStatus status;
@@ -378,12 +373,10 @@ gtk_inspector_on_inspect (GtkWidget *button,
display = gdk_display_get_default ();
cursor = gdk_cursor_new_from_name (display, "crosshair");
- device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (display));
- status = gdk_device_grab (device,
- gtk_widget_get_window (iw->invisible),
- GDK_OWNERSHIP_NONE, TRUE,
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
- cursor, GDK_CURRENT_TIME);
+ status = gdk_seat_grab (gdk_display_get_default_seat (display),
+ gtk_widget_get_window (iw->invisible),
+ GDK_SEAT_CAPABILITY_ALL_POINTING, TRUE,
+ cursor, NULL, NULL, NULL);
g_object_unref (cursor);
iw->grabbed = status == GDK_GRAB_SUCCESS;
@@ -487,13 +480,11 @@ void
gtk_inspector_window_select_widget_under_pointer (GtkInspectorWindow *iw)
{
GdkDisplay *display;
- GdkDeviceManager *dm;
GdkDevice *device;
GtkWidget *widget;
display = gdk_display_get_default ();
- dm = gdk_display_get_device_manager (display);
- device = gdk_device_manager_get_client_pointer (dm);
+ device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
widget = find_widget_at_pointer (device);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]