sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Bug 1013 - Per device grabs are not obeyed in pointer device propagation.

Browse source 
* clutter/clutter-event.c: (clutter_event_get_device_id): swap
arguments of g_return_val_if_fail around.
* clutter/clutter-event.h: added *device field to crossing events as
well.
* clutter/clutter-main.c: (emit_pointer_event): added a device
argument and check for per device grabs if this device is passed.
(clutter_do_event): pass the device if present for all pointer event
emissions.
(generate_enter_leave_events): copy the device from the motion events
when generating enter/leave events.
This commit is contained in:
Øyvind Kolås 2008-07-01 11:51:20 +00:00
parent 7798958772
commit 6f68ae35b7
4 changed files with 65 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2008-07-01 Øyvind Kolås <pippin@o-hand.com>
Bug 1013 - Per device grabs are not obeyed in pointer device propagation.
* clutter/clutter-event.c: (clutter_event_get_device_id): swap
arguments of g_return_val_if_fail around.
* clutter/clutter-event.h: added *device field to crossing events as
well.
* clutter/clutter-main.c: (emit_pointer_event): added a device
argument and check for per device grabs if this device is passed.
(clutter_do_event): pass the device if present for all pointer event
emissions.
(generate_enter_leave_events): copy the device from the motion events
when generating enter/leave events.
2008-07-01 Chris Lord <chris@openedhand.com>
* clutter/clutter-texture.c:

2
clutter/clutter-event.c
View file

@ -329,7 +329,7 @@ clutter_event_get_device_id (ClutterEvent *event)
{
ClutterInputDevice *device = NULL;
g_return_val_if_fail (-1, event != NULL);
g_return_val_if_fail (event != NULL, -1);
switch (event->type)
{

1
clutter/clutter-event.h
View file

@ -298,6 +298,7 @@ struct _ClutterCrossingEvent
ClutterActor *source;
gint x;
gint y;
ClutterInputDevice *device; /* future use */
ClutterActor *related;
};

52
clutter/clutter-main.c
View file

@ -1537,20 +1537,38 @@ done:
#undef MAX_EVENT_DEPTH
}
/*
* Emits a pointer event after having prepared the event for delivery (setting
* source, computing click_count, generating enter/leave etc.).
*/
static inline void
emit_pointer_event (ClutterEvent *event)
emit_pointer_event (ClutterEvent *event,
ClutterInputDevice *device)
{
/* Using the global variable directly, since it has to be initialized
* at this point
*/
ClutterMainContext *context = ClutterCntx;
if (G_UNLIKELY (context->pointer_grab_actor != NULL))
if (G_UNLIKELY (context->pointer_grab_actor != NULL &&
device == NULL))
{
/* global grab */
clutter_actor_event (context->pointer_grab_actor, event, FALSE);
}
else if (G_UNLIKELY (device != NULL &&
device->pointer_grab_actor != NULL))
{
/* per device grab */
clutter_actor_event (device->pointer_grab_actor, event, FALSE);
}
else
{
/* no grab, time to capture and bubble */
emit_event (event, FALSE);
}
}
static inline void
emit_keyboard_event (ClutterEvent *event)
@ -1590,6 +1608,8 @@ generate_enter_leave_events (ClutterEvent *event)
{
ClutterEvent cev;
cev.crossing.device = event->motion.device;
if (context->motion_last_actor)
{
cev.crossing.type = CLUTTER_LEAVE;
@ -1599,6 +1619,7 @@ generate_enter_leave_events (ClutterEvent *event)
cev.crossing.y = event->motion.y;
cev.crossing.source = last_actor;
cev.crossing.stage = event->any.stage;
/* unref in free */
cev.crossing.related = motion_current_actor;
@ -1689,7 +1710,7 @@ clutter_do_event (ClutterEvent *event)
case CLUTTER_ENTER:
case CLUTTER_LEAVE:
emit_pointer_event (event);
emit_pointer_event (event, event->crossing.device);
break;
case CLUTTER_DESTROY_NOTIFY:
@ -1827,7 +1848,7 @@ clutter_do_event (ClutterEvent *event)
x, y);
event->button.source = stage;
emit_pointer_event (event);
emit_pointer_event (event, event->button.device);
}
break;
}
@ -1866,7 +1887,26 @@ clutter_do_event (ClutterEvent *event)
/* Generate click count */
event_click_count_generate (event);
}
emit_pointer_event (event);
if (device == NULL)
{
switch (event->type)
{
case CLUTTER_BUTTON_PRESS:
case CLUTTER_BUTTON_RELEASE:
device = event->button.device;
break;
case CLUTTER_SCROLL:
device = event->scroll.device;
break;
case CLUTTER_MOTION:
/* already handled in the MOTION case of the switch */
default:
break;
}
}
emit_pointer_event (event, device);
break;
}