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

gdkseatdefault: Don't hide GdkWindow on grab failure

Browse Source 
Application is not expecting that.

Bug found due gdk_seat_grab() failure on Lock Screen. When user
Unlock the screen, the application is visible but does not receive
enter-event any more on X11/GNOME.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1485968
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1571422

Signed-off-by: Victor Toso <victortoso@redhat.com>
Signed-off-by: Carlos Garnacho <mrgarnacho@gmail.com>
This commit is contained in:
Victor Toso 2018-05-24 15:42:47 +02:00 committed by Matthias Clasen
parent f62ee9f74a
commit 2c8b95a518
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk/gdkseatdefault.c
View File

@ -115,8 +115,10 @@ gdk_seat_default_grab (GdkSeat *seat,
GdkSeatDefaultPrivate *priv; GdkSeatDefaultPrivate *priv;
guint32 evtime = event ? gdk_event_get_time (event) : GDK_CURRENT_TIME; guint32 evtime = event ? gdk_event_get_time (event) : GDK_CURRENT_TIME;
GdkGrabStatus status = GDK_GRAB_SUCCESS; GdkGrabStatus status = GDK_GRAB_SUCCESS;
gboolean was_visible;
priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat)); priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat));
was_visible = gdk_window_is_visible (window);
if (prepare_func) if (prepare_func)
(prepare_func) (seat, window, prepare_func_data); (prepare_func) (seat, window, prepare_func_data);
@ -163,9 +165,11 @@ gdk_seat_default_grab (GdkSeat *seat,
{ {
if (capabilities & ~GDK_SEAT_CAPABILITY_KEYBOARD) if (capabilities & ~GDK_SEAT_CAPABILITY_KEYBOARD)
gdk_device_ungrab (priv->master_pointer, evtime); gdk_device_ungrab (priv->master_pointer, evtime);
}
}
if (status != GDK_GRAB_SUCCESS && !was_visible)
gdk_window_hide (window); gdk_window_hide (window);
}
}
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;