isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-10 18:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

keybindings: Use meta_device_grab() for keyboard active grabs

Browse Source
This commit is contained in:
Carlos Garnacho
2011-06-21 18:27:39 +02:00
parent 61a7789c83
commit 2484e8cd64
4 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/display.c
View File

@@ -3628,12 +3628,16 @@ meta_display_begin_grab_op (MetaDisplay *display,
{
if (grab_window)
grab_info->grab_have_keyboard =
meta_window_grab_all_keys (grab_window, timestamp);
meta_window_grab_all_keys (grab_window,
grab_info->grab_keyboard,
timestamp);
else
grab_info->grab_have_keyboard =
meta_screen_grab_all_keys (screen, timestamp);
meta_screen_grab_all_keys (screen,
grab_info->grab_keyboard,
timestamp);
if (!grab_info->grab_have_keyboard)
{
meta_topic (META_DEBUG_WINDOW_OPS,
@@ -3847,9 +3851,13 @@ meta_display_end_grab_op (MetaDisplay *display,
meta_topic (META_DEBUG_WINDOW_OPS,
"Ungrabbing all keys timestamp %u\n", timestamp);
if (grab_info->grab_window)
meta_window_ungrab_all_keys (grab_info->grab_window, timestamp);
meta_window_ungrab_all_keys (grab_info->grab_window,
grab_info->grab_keyboard,
timestamp);
else
meta_screen_ungrab_all_keys (grab_info->grab_screen, timestamp);
meta_screen_ungrab_all_keys (grab_info->grab_screen,
grab_info->grab_keyboard,
timestamp);
}
#ifdef HAVE_XSYNC