brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Use the Stage state tracking

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-01-26 08:27:39 +00:00
parent 8c184f53cb
commit 2b547442a3
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,6 @@ clutter_wayland_handle_keyboard_focus (void *data,
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageCogl *stage_cogl; ClutterStageCogl *stage_cogl;
ClutterEvent *event;
uint32_t *k, *end; uint32_t *k, *end;
if (device->keyboard_focus) if (device->keyboard_focus)
@ -219,14 +218,9 @@ clutter_wayland_handle_keyboard_focus (void *data,
stage_cogl = device->keyboard_focus; stage_cogl = device->keyboard_focus;
device->keyboard_focus = NULL; device->keyboard_focus = NULL;
event = clutter_event_new (CLUTTER_STAGE_STATE); _clutter_stage_update_state (stage_cogl->wrapper,
event->stage_state.time = _time; CLUTTER_STAGE_STATE_ACTIVATED,
event->stage_state.stage = stage_cogl->wrapper; 0);
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);
} }
if (surface) if (surface)
@ -234,17 +228,14 @@ clutter_wayland_handle_keyboard_focus (void *data,
stage_cogl = wl_surface_get_user_data (surface); stage_cogl = wl_surface_get_user_data (surface);
device->keyboard_focus = stage_cogl; device->keyboard_focus = stage_cogl;
event = clutter_event_new (CLUTTER_STAGE_STATE); _clutter_stage_update_state (stage_cogl->wrapper,
event->stage_state.stage = stage_cogl->wrapper; 0,
event->stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED; CLUTTER_STAGE_STATE_ACTIVATED);
event->stage_state.new_state = CLUTTER_STAGE_STATE_ACTIVATED;
end = (uint32_t *)((guint8 *)keys->data + keys->size); end = (uint32_t *)((guint8 *)keys->data + keys->size);
device->modifier_state = 0; device->modifier_state = 0;
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_event_push (event, FALSE);
} }
} }