[mutter/wip/xinput2] frames: Use the triggering device when updating controls
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/xinput2] frames: Use the triggering device when updating controls
- Date: Sat, 6 Aug 2011 08:48:19 +0000 (UTC)
commit 8847281c312e8e953909061a5f5a687cbf7fdec9
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 f3d6373..238063f 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -52,6 +52,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);
@@ -1967,7 +1968,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;
@@ -1976,14 +1979,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);
@@ -2154,7 +2155,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);
/* No tooltip while in the process of clicking */
}
@@ -2168,7 +2171,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);
queue_tip (frames);
}
@@ -2674,7 +2679,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;
}
@@ -2692,7 +2699,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);
clear_tip (frames);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]