[mutter/wip/xinput2r: 59/68] frames: Use the triggering device when updating controls

[Jasper St. Pierre <jstpierre src gnome org>]

commit dfe33a46034af7ff2449f4bf4618fae8b24c8ebc
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Jul 27 00:29:32 2011 +0200

    frames: Use the triggering device when updating controls

 src/ui/frames.c |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 20461d2..e5e7ad5 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -51,6 +51,7 @@ static void meta_frames_unmap         (GtkWidget       *widget);
 
 static void meta_frames_update_prelit_control (MetaFrames      *frames,
                                                MetaUIFrame     *frame,
+                                               GdkDevice       *device,
                                                MetaFrameControl control);
 static gboolean meta_frames_button_press_event    (GtkWidget           *widget,
                                                    GdkEventButton      *event);
@@ -1582,7 +1583,9 @@ meta_frames_button_release_event    (GtkWidget           *widget,
        * prelit so to let the user know that it can now be pressed.
        * :)
        */
-      meta_frames_update_prelit_control (frames, frame, control);
+      meta_frames_update_prelit_control (frames, frame, 
+                                         gdk_event_get_device ((GdkEvent *) event),
+                                         control);
     }
   
   return TRUE;
@@ -1591,14 +1594,12 @@ meta_frames_button_release_event    (GtkWidget           *widget,
 static void
 meta_frames_update_prelit_control (MetaFrames      *frames,
                                    MetaUIFrame     *frame,
+                                   GdkDevice       *device,
                                    MetaFrameControl control)
 {
   MetaFrameControl old_control;
-  GdkDevice *device;
   MetaCursor cursor;
 
-  device = gtk_get_current_event_device ();
-
   meta_verbose ("Updating prelit control from %u to %u\n",
                 frame->prelit_control, control);
   
@@ -1767,7 +1768,9 @@ meta_frames_motion_notify_event     (GtkWidget           *widget,
            control = META_FRAME_CONTROL_NONE;
         
         /* Update prelit control and cursor */
-        meta_frames_update_prelit_control (frames, frame, control);
+        meta_frames_update_prelit_control (frames, frame,
+                                           gdk_event_get_device ((GdkEvent *) event),
+                                           control);
       }
       break;
     case META_GRAB_OP_NONE:
@@ -1779,7 +1782,9 @@ meta_frames_motion_notify_event     (GtkWidget           *widget,
         control = get_control (frames, frame, x, y);
 
         /* Update prelit control and cursor */
-        meta_frames_update_prelit_control (frames, frame, control);
+        meta_frames_update_prelit_control (frames, frame, 
+                                           gdk_event_get_device ((GdkEvent *) event),
+                                           control);
       }
       break;
 
@@ -2099,7 +2104,9 @@ meta_frames_enter_notify_event      (GtkWidget           *widget,
     return FALSE;
 
   control = get_control (frames, frame, event->x, event->y);
-  meta_frames_update_prelit_control (frames, frame, control);
+  meta_frames_update_prelit_control (frames, frame, 
+                                     gdk_event_get_device ((GdkEvent *) event),
+                                     control);
   
   return TRUE;
 }
@@ -2117,7 +2124,9 @@ meta_frames_leave_notify_event      (GtkWidget           *widget,
   if (frame == NULL)
     return FALSE;
 
-  meta_frames_update_prelit_control (frames, frame, META_FRAME_CONTROL_NONE);
+  meta_frames_update_prelit_control (frames, frame, 
+                                     gdk_event_get_device ((GdkEvent *) event),
+                                     META_FRAME_CONTROL_NONE);
   
   return TRUE;
 }