isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-26 12:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix button check in meta_window_client_message

Browse Source 
Fixes a regression introduced in 3a3be74e37

https://bugzilla.gnome.org/show_bug.cgi?id=692718
This commit is contained in:
Adel Gadllah 2013-02-09 11:29:07 +01:00
parent b3c572b8e3
commit d482590c84
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/window.c
View File

@ -6321,6 +6321,9 @@ meta_window_change_workspace_by_index (MetaWindow *window,
#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10
#define _NET_WM_MOVERESIZE_CANCEL 11
/* Copied from the old gtk+/xi2 branch */
#define XIMaskIsSet(ptr, bit) (((unsigned char *) (ptr))[(bit) >> 3] & (1 << ((bit) & 7)))
gboolean
meta_window_client_message (MetaWindow *window,
XEvent *event)
@ -6703,11 +6706,11 @@ meta_window_client_message (MetaWindow *window,
&buttons, &mods, &group);
meta_error_trap_pop (window->display);
if (mods.effective & Button1Mask)
if (XIMaskIsSet (buttons.mask, Button1))
button = 1;
else if (mods.effective & Button2Mask)
else if (XIMaskIsSet (buttons.mask, Button2))
button = 2;
else if (mods.effective & Button3Mask)
else if (XIMaskIsSet (buttons.mask, Button3))
button = 3;
else
button = 0;