isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

*/event: Never manipulate the event queue directly

Browse Source 
Always use _clutter_event_push() instead.
This commit is contained in:
Emmanuele Bassi 2011-01-19 16:34:49 +00:00
parent 400ecdfc81
commit 0f56abf569
4 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/egl/clutter-event-tslib.c
View File

@ -274,7 +274,7 @@ clutter_event_dispatch (GSource *source,
clicked = FALSE; clicked = FALSE;
} }
g_queue_push_head (clutter_context->events_queue, event); _clutter_event_push (event, FALSE);
} }
/* Pop an event off the queue if any */ /* Pop an event off the queue if any */

5
clutter/evdev/clutter-device-manager-evdev.c
View File

@ -139,13 +139,10 @@ clutter_event_check (GSource *source)
static void static void
queue_event (ClutterEvent *event) queue_event (ClutterEvent *event)
{ {
ClutterMainContext *context;
if (event == NULL) if (event == NULL)
return; return;
context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (context->events_queue, event);
} }
static void static void

26
clutter/wayland/clutter-input-device-wayland.c
View File

@ -74,7 +74,6 @@ clutter_backend_wayland_handle_motion (void *data,
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageWayland *stage_wayland = device->pointer_focus; ClutterStageWayland *stage_wayland = device->pointer_focus;
ClutterMainContext *clutter_context;
ClutterEvent *event; ClutterEvent *event;
event = clutter_event_new (CLUTTER_MOTION); event = clutter_event_new (CLUTTER_MOTION);
@ -90,8 +89,7 @@ clutter_backend_wayland_handle_motion (void *data,
device->x = x; device->x = x;
device->y = y; device->y = y;
clutter_context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (clutter_context->events_queue, event);
} }
static void static void
@ -102,7 +100,6 @@ clutter_backend_wayland_handle_button (void *data,
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageWayland *stage_wayland = device->pointer_focus; ClutterStageWayland *stage_wayland = device->pointer_focus;
ClutterMainContext *clutter_context;
ClutterEvent *event; ClutterEvent *event;
ClutterEventType type; ClutterEventType type;
@ -132,8 +129,7 @@ clutter_backend_wayland_handle_button (void *data,
break; break;
} }
clutter_context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (clutter_context->events_queue, event);
} }
static void static void
@ -144,7 +140,6 @@ clutter_backend_wayland_handle_key (void *data,
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageWayland *stage_wayland = device->keyboard_focus; ClutterStageWayland *stage_wayland = device->keyboard_focus;
ClutterMainContext *clutter_context;
ClutterEvent *event; ClutterEvent *event;
event = _clutter_key_event_new_from_evdev ((ClutterInputDevice *) device, event = _clutter_key_event_new_from_evdev ((ClutterInputDevice *) device,
@ -153,8 +148,7 @@ clutter_backend_wayland_handle_key (void *data,
_time, key, state, _time, key, state,
&device->modifier_state); &device->modifier_state);
clutter_context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (clutter_context->events_queue, event);
} }
static void static void
@ -166,7 +160,6 @@ clutter_backend_wayland_handle_pointer_focus (void *data,
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageWayland *stage_wayland; ClutterStageWayland *stage_wayland;
ClutterMainContext *clutter_context;
ClutterEvent *event; ClutterEvent *event;
if (device->pointer_focus) if (device->pointer_focus)
@ -181,8 +174,7 @@ clutter_backend_wayland_handle_pointer_focus (void *data,
event->crossing.source = CLUTTER_ACTOR (stage_wayland->wrapper); event->crossing.source = CLUTTER_ACTOR (stage_wayland->wrapper);
event->crossing.device = CLUTTER_INPUT_DEVICE (device); event->crossing.device = CLUTTER_INPUT_DEVICE (device);
clutter_context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (clutter_context->events_queue, event);
device->pointer_focus = NULL; device->pointer_focus = NULL;
_clutter_input_device_set_stage (CLUTTER_INPUT_DEVICE (device), NULL); _clutter_input_device_set_stage (CLUTTER_INPUT_DEVICE (device), NULL);
@ -204,8 +196,7 @@ clutter_backend_wayland_handle_pointer_focus (void *data,
event->motion.source = CLUTTER_ACTOR (stage_wayland->wrapper); event->motion.source = CLUTTER_ACTOR (stage_wayland->wrapper);
event->motion.device = CLUTTER_INPUT_DEVICE (device); event->motion.device = CLUTTER_INPUT_DEVICE (device);
clutter_context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (clutter_context->events_queue, event);
device->surface_x = sx; device->surface_x = sx;
device->surface_y = sy; device->surface_y = sy;
@ -226,7 +217,6 @@ clutter_backend_wayland_handle_keyboard_focus (void *data,
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageWayland *stage_wayland; ClutterStageWayland *stage_wayland;
ClutterMainContext *clutter_context;
ClutterEvent *event; ClutterEvent *event;
uint32_t *k, *end; uint32_t *k, *end;
@ -242,8 +232,7 @@ clutter_backend_wayland_handle_keyboard_focus (void *data,
event->stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED; event->stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED;
event->stage_state.new_state = 0; event->stage_state.new_state = 0;
clutter_context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (clutter_context->events_queue, event);
} }
if (surface) if (surface)
@ -261,8 +250,7 @@ clutter_backend_wayland_handle_keyboard_focus (void *data,
for (k = keys->data; k < end; k++) for (k = keys->data; k < end; k++)
device->modifier_state |= device->xkb->map->modmap[*k]; device->modifier_state |= device->xkb->map->modmap[*k];
clutter_context = _clutter_context_get_default (); _clutter_event_push (event, FALSE);
g_queue_push_head (clutter_context->events_queue, event);
} }
} }

6
clutter/win32/clutter-event-win32.c
View File

@ -207,14 +207,10 @@ get_modifier_state (WPARAM wparam)
static void static void
take_and_queue_event (ClutterEvent *event) take_and_queue_event (ClutterEvent *event)
{ {
ClutterMainContext *clutter_context;
clutter_context = _clutter_context_get_default ();
/* The event is added directly to the queue instead of using /* The event is added directly to the queue instead of using
clutter_event_put so that it can avoid a copy. This takes clutter_event_put so that it can avoid a copy. This takes
ownership of the event */ ownership of the event */
g_queue_push_head (clutter_context->events_queue, event); _clutter_event_push (event, FALSE);
} }
static inline void static inline void