From 8e3b9be79ca0ae520c136797ed55bd64942f2887 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 19 Jul 2011 21:02:21 +0200 Subject: [PATCH] window: make guess_grab_pointer() more reliable Now either the current focus keyboard or the client pointer (i.e. the pointer paired to the last keyboard that had the window focus) are used to guess the pointer that should be grabbed. --- src/core/window.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/window.c b/src/core/window.c index cebc673f1..73c7c7952 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -10760,10 +10760,8 @@ meta_window_get_client_pointer (MetaWindow *window) MetaDevice * meta_window_guess_grab_pointer (MetaWindow *window) { - /* FIXME: This ought to be the very last resort, ideally - * the current/last focus device should be used to find - * this out, or the client pointer. - */ - return meta_device_map_lookup (window->display->device_map, - META_CORE_POINTER_ID); + if (window->focus_keyboard) + return meta_device_get_paired_device (window->focus_keyboard); + + return meta_window_get_client_pointer (window); }