summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorStefan Tauner <[email protected]>2012-08-23 16:37:30 +0200
committerStefan Tauner <[email protected]>2012-08-23 16:37:30 +0200
commitae71d9d2a8cb95fee662a997bde3329796b3cdb3 (patch)
treecf82c814b1e85c98149a71bbfa5a264f3f797a21 /src/core
parentd4b44167b9b14ee37479061ca3cd413ace1bd3ad (diff)
downloadmarco-ae71d9d2a8cb95fee662a997bde3329796b3cdb3.tar.bz2
marco-ae71d9d2a8cb95fee662a997bde3329796b3cdb3.tar.xz
Fix key handling while drag and drop is active
This is still not fixed "upstream" (i.e. in metacity) but many distributions ship with this patch. The patch is from Matthias Clasen (Redhat). See https://bugzilla.gnome.org/show_bug.cgi?id=135056#c33 and https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/111939 for details.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/display.c b/src/core/display.c
index f07a4e69..09047493 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -3464,7 +3464,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
meta_display_set_grab_op_cursor (display, screen, op, FALSE, grab_xwindow,
timestamp);
- if (!display->grab_have_pointer)
+ if (!display->grab_have_pointer && !grab_op_is_keyboard (op))
{
meta_topic (META_DEBUG_WINDOW_OPS,
"XGrabPointer() failed\n");