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

inspector: Use seat grabs for the "inspect widget" feature

Browse Source 
And remove some usages of GdkDeviceManager API.
This commit is contained in:
Carlos Garnacho
2015-12-16 19:28:53 +01:00
parent 32c9db8600
commit 3f7eefb922
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/inspector/inspect-button.c
View File

@ -316,16 +316,13 @@ property_query_event (GtkWidget *widget,
gpointer data) gpointer data)
{ {
GtkInspectorWindow *iw = (GtkInspectorWindow *)data; GtkInspectorWindow *iw = (GtkInspectorWindow *)data;
GdkDevice *device;
if (event->type == GDK_BUTTON_RELEASE) if (event->type == GDK_BUTTON_RELEASE)
{ {
device = gdk_event_get_device (event);
g_signal_handlers_disconnect_by_func (widget, property_query_event, data); g_signal_handlers_disconnect_by_func (widget, property_query_event, data);
gtk_grab_remove (widget); gtk_grab_remove (widget);
if (iw->grabbed) if (iw->grabbed)
gdk_device_ungrab (device, GDK_CURRENT_TIME); gdk_seat_ungrab (gdk_event_get_seat (event));
reemphasize_window (GTK_WIDGET (iw)); reemphasize_window (GTK_WIDGET (iw));
on_inspect_widget (widget, event, data); 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); g_signal_handlers_disconnect_by_func (widget, property_query_event, data);
gtk_grab_remove (widget); gtk_grab_remove (widget);
device = gdk_device_get_associated_device (gdk_event_get_device (event));
if (iw->grabbed) if (iw->grabbed)
gdk_device_ungrab (device, GDK_CURRENT_TIME); gdk_seat_ungrab (gdk_event_get_seat (event));
reemphasize_window (GTK_WIDGET (iw)); reemphasize_window (GTK_WIDGET (iw));
clear_flash (iw); clear_flash (iw);
@ -359,7 +355,6 @@ gtk_inspector_on_inspect (GtkWidget *button,
GtkInspectorWindow *iw) GtkInspectorWindow *iw)
{ {
GdkDisplay *display; GdkDisplay *display;
GdkDevice *device;
GdkCursor *cursor; GdkCursor *cursor;
GdkGrabStatus status; GdkGrabStatus status;
@ -378,12 +373,10 @@ gtk_inspector_on_inspect (GtkWidget *button,
display = gdk_display_get_default (); display = gdk_display_get_default ();
cursor = gdk_cursor_new_from_name (display, "crosshair"); cursor = gdk_cursor_new_from_name (display, "crosshair");
device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (display)); status = gdk_seat_grab (gdk_display_get_default_seat (display),
status = gdk_device_grab (device, gtk_widget_get_window (iw->invisible),
gtk_widget_get_window (iw->invisible), GDK_SEAT_CAPABILITY_ALL_POINTING, TRUE,
GDK_OWNERSHIP_NONE, TRUE, cursor, NULL, NULL, NULL);
GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
cursor, GDK_CURRENT_TIME);
g_object_unref (cursor); g_object_unref (cursor);
iw->grabbed = status == GDK_GRAB_SUCCESS; iw->grabbed = status == GDK_GRAB_SUCCESS;
@ -487,13 +480,11 @@ void
gtk_inspector_window_select_widget_under_pointer (GtkInspectorWindow *iw) gtk_inspector_window_select_widget_under_pointer (GtkInspectorWindow *iw)
{ {
GdkDisplay *display; GdkDisplay *display;
GdkDeviceManager *dm;
GdkDevice *device; GdkDevice *device;
GtkWidget *widget; GtkWidget *widget;
display = gdk_display_get_default (); display = gdk_display_get_default ();
dm = gdk_display_get_device_manager (display); device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
device = gdk_device_manager_get_client_pointer (dm);
widget = find_widget_at_pointer (device); widget = find_widget_at_pointer (device);