From 4c4f21c0012fe9a2106359e2375efee07df34876 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 8 Jun 2011 18:57:28 +0200
Subject: [PATCH] display: get button events state from helper functions

---
 src/core/display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/display.c b/src/core/display.c
index 18621f996..cbbcf48f0 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1721,7 +1721,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)))
@@ -1761,6 +1761,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;
@@ -1810,7 +1811,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)
                 {