From 5fd5872b37ce1ef2d547dee2e83500a39bada030 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 24 Jan 2011 02:32:50 +0100 Subject: [PATCH] Avoid toplevel tracking on slave device after ungrab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit slave devices don't have coordinates themselves, as they depend on a master, this only changes if they have a grab in effect, so only keep toplevel tracking enabled in such situation. Fixes Bug #640313 - BadDevice X error when ungrabbing a SLAVE device, noticed by Jesse van den Kieboom. --- gdk/gdkdisplay.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index c4f0e4b8b2..22aebd7550 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -913,7 +913,7 @@ switch_to_pointer_grab (GdkDisplay *display, GdkPointerWindowInfo *info; GList *old_grabs; GdkModifierType state; - int x, y; + int x = 0, y = 0; /* Temporarily unset pointer to make sure we send the crossing events below */ old_grabs = g_hash_table_lookup (display->device_grabs, device); @@ -966,7 +966,14 @@ switch_to_pointer_grab (GdkDisplay *display, g_object_unref (info->toplevel_under_pointer); info->toplevel_under_pointer = NULL; - new_toplevel = get_current_toplevel (display, device, &x, &y, &state); + /* Ungrabbed slave devices don't have a position by + * itself, rather depend on its master pointer, so + * it doesn't make sense to track any position for + * these after the grab + */ + if (grab || gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_SLAVE) + new_toplevel = get_current_toplevel (display, device, &x, &y, &state); + if (new_toplevel) { /* w is now toplevel and x,y in toplevel coords */