applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keyboard: Don't rely on events to grab keyboard

Browse source 
Rather than relying on us being in the middle of processing an event to
grab the keyboard, get the keyboard for the first seat of the display.

https://bugzilla.gnome.org/show_bug.cgi?id=769314
This commit is contained in:
Bastien Nocera 2016-09-08 13:39:47 +02:00
parent b10a1ac935
commit 6c7746abb3
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
panels/keyboard/cc-keyboard-shortcut-editor.c
View file

@ -170,23 +170,30 @@ is_custom_shortcut (CcKeyboardShortcutEditor *self)
}
static void
grab_seat (CcKeyboardShortcutEditor *self,
GdkEvent *event)
grab_seat (CcKeyboardShortcutEditor *self)
{
GdkGrabStatus status;
GdkDevice *pointer;
GdkDevice *device;
GdkWindow *window;
GList *seats;
if (!event)
event = gtk_get_current_event ();
device = gdk_event_get_device (event);
window = gtk_widget_get_window (GTK_WIDGET (self));
if (!device || !window)
if (!window)
return;
seats = gdk_display_list_seats (gdk_window_get_display (window));
if (!seats)
return;
device = gdk_seat_get_keyboard (seats->data);
g_list_free (seats);
if (!device) {
g_debug ("Keyboard grab unsuccessful, no keyboard in seat");
return;
}
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
pointer = gdk_device_get_associated_device (device);
else
@ -197,7 +204,7 @@ grab_seat (CcKeyboardShortcutEditor *self,
GDK_SEAT_CAPABILITY_KEYBOARD,
FALSE,
NULL,
event,
NULL,
NULL,
NULL);
@ -442,7 +449,7 @@ edit_custom_shortcut_button_toggled_cb (CcKeyboardShortcutEditor *self,
GtkToggleButton *button)
{
if (gtk_toggle_button_get_active (button))
grab_seat (self, NULL);
grab_seat (self);
else
release_grab (self);
}