From 2b547442a373794fd0b3dbb5799ad732bf091d03 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 26 Jan 2012 08:27:39 +0000 Subject: [PATCH] wayland: Use the Stage state tracking --- .../wayland/clutter-input-device-wayland.c | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/clutter/wayland/clutter-input-device-wayland.c b/clutter/wayland/clutter-input-device-wayland.c index 1abd57ad1..af5aed286 100644 --- a/clutter/wayland/clutter-input-device-wayland.c +++ b/clutter/wayland/clutter-input-device-wayland.c @@ -211,7 +211,6 @@ clutter_wayland_handle_keyboard_focus (void *data, { ClutterInputDeviceWayland *device = data; ClutterStageCogl *stage_cogl; - ClutterEvent *event; uint32_t *k, *end; if (device->keyboard_focus) @@ -219,14 +218,9 @@ clutter_wayland_handle_keyboard_focus (void *data, stage_cogl = device->keyboard_focus; device->keyboard_focus = NULL; - event = clutter_event_new (CLUTTER_STAGE_STATE); - event->stage_state.time = _time; - event->stage_state.stage = stage_cogl->wrapper; - event->stage_state.stage = stage_cogl->wrapper; - event->stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED; - event->stage_state.new_state = 0; - - _clutter_event_push (event, FALSE); + _clutter_stage_update_state (stage_cogl->wrapper, + CLUTTER_STAGE_STATE_ACTIVATED, + 0); } if (surface) @@ -234,17 +228,14 @@ clutter_wayland_handle_keyboard_focus (void *data, stage_cogl = wl_surface_get_user_data (surface); device->keyboard_focus = stage_cogl; - event = clutter_event_new (CLUTTER_STAGE_STATE); - event->stage_state.stage = stage_cogl->wrapper; - event->stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED; - event->stage_state.new_state = CLUTTER_STAGE_STATE_ACTIVATED; + _clutter_stage_update_state (stage_cogl->wrapper, + 0, + CLUTTER_STAGE_STATE_ACTIVATED); end = (uint32_t *)((guint8 *)keys->data + keys->size); device->modifier_state = 0; for (k = keys->data; k < end; k++) device->modifier_state |= device->xkb->map->modmap[*k]; - - _clutter_event_push (event, FALSE); } }