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.
This commit is contained in:
Carlos Garnacho 2011-07-19 21:02:21 +02:00
parent e6f0af9abc
commit f6d9b29ad0

View File

@ -10558,10 +10558,8 @@ meta_window_get_client_pointer (MetaWindow *window)
MetaDevice * MetaDevice *
meta_window_guess_grab_pointer (MetaWindow *window) meta_window_guess_grab_pointer (MetaWindow *window)
{ {
/* FIXME: This ought to be the very last resort, ideally if (window->focus_keyboard)
* the current/last focus device should be used to find return meta_device_get_paired_device (window->focus_keyboard);
* this out, or the client pointer.
*/ return meta_window_get_client_pointer (window);
return meta_device_map_lookup (window->display->device_map,
META_CORE_POINTER_ID);
} }