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

display: get button events state from helper functions

Browse Source
This commit is contained in:
Carlos Garnacho 2011-06-08 18:57:28 +02:00 committed by Jasper St. Pierre
parent 1c3b695848
commit 3e3ad71a68
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/display.c
View File

@ -1940,7 +1940,7 @@ event_callback (XEvent *event,
{
Window xwindow = meta_input_event_get_window (display, event);
Time evtime = meta_input_event_get_time (display, event);
guint n_button;
guint n_button, state;
if (window && !window->override_redirect &&
((evtype == KeyPress) || (evtype == ButtonPress)))
@ -1980,6 +1980,7 @@ event_callback (XEvent *event,
break;
case ButtonPress:
meta_input_event_get_button (display, event, &n_button);
meta_input_event_get_state (display, event, &state);
if (display->grab_op == META_GRAB_OP_COMPOSITOR)
break;
@ -2031,7 +2032,7 @@ event_callback (XEvent *event,
* frame, the other is our focus_window_grab on unmodified
* button 1. So for all such events we focus the window.
*/
unmodified = (event->xbutton.state & grab_mask) == 0;
unmodified = (state & grab_mask) == 0;
if (unmodified || n_button == 1)
{
/* don't focus if frame received, will be lowered in