AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-19 00:20:09 +00:00
Code Issues Projects Releases Wiki Activity

GtkCellRendererAccel: Use gdk_seat_grab()

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=759309
This commit is contained in:
Carlos Garnacho 2015-11-26 19:54:31 +01:00
parent e4eeec2163
commit 5cbbb90e31
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/gtkcellrendereraccel.c
View File

@ -96,7 +96,6 @@ struct _GtkCellRendererAccelPrivate
guint accel_key; guint accel_key;
guint keycode; guint keycode;
GdkDevice *grab_keyboard;
GdkDevice *grab_pointer; GdkDevice *grab_pointer;
}; };
@ -441,8 +440,7 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell,
GtkWidget *label; GtkWidget *label;
GtkWidget *eventbox; GtkWidget *eventbox;
gboolean editable; gboolean editable;
GdkDevice *device, *keyboard, *pointer; GdkDevice *device, *pointer;
guint32 timestamp;
GdkWindow *window; GdkWindow *window;
celltext = GTK_CELL_RENDERER_TEXT (cell); celltext = GTK_CELL_RENDERER_TEXT (cell);
@ -465,34 +463,15 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell,
return NULL; return NULL;
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD) if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
{ pointer = gdk_device_get_associated_device (device);
keyboard = device;
pointer = gdk_device_get_associated_device (device);
}
else else
{ pointer = device;
pointer = device;
keyboard = gdk_device_get_associated_device (device);
}
timestamp = gdk_event_get_time (event); if (gdk_seat_grab (gdk_device_get_seat (pointer), window,
GDK_SEAT_CAPABILITY_ALL, FALSE,
if (gdk_device_grab (keyboard, window, NULL, event, NULL, NULL) != GDK_GRAB_SUCCESS)
GDK_OWNERSHIP_WINDOW, FALSE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, timestamp) != GDK_GRAB_SUCCESS)
return NULL; return NULL;
if (gdk_device_grab (pointer, window,
GDK_OWNERSHIP_WINDOW, FALSE,
GDK_BUTTON_PRESS_MASK,
NULL, timestamp) != GDK_GRAB_SUCCESS)
{
gdk_device_ungrab (keyboard, timestamp);
return NULL;
}
priv->grab_keyboard = keyboard;
priv->grab_pointer = pointer; priv->grab_pointer = pointer;
eventbox = gtk_cell_editable_event_box_new (cell, priv->accel_mode, path); eventbox = gtk_cell_editable_event_box_new (cell, priv->accel_mode, path);
@ -521,11 +500,9 @@ gtk_cell_renderer_accel_ungrab (GtkCellRendererAccel *accel)
{ {
GtkCellRendererAccelPrivate *priv = accel->priv; GtkCellRendererAccelPrivate *priv = accel->priv;
if (priv->grab_keyboard) if (priv->grab_pointer)
{ {
gdk_device_ungrab (priv->grab_keyboard, GDK_CURRENT_TIME); gdk_seat_ungrab (gdk_device_get_seat (priv->grab_pointer));
gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME);
priv->grab_keyboard = NULL;
priv->grab_pointer = NULL; priv->grab_pointer = NULL;
} }
} }