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

wayland: Check there is valid pointer or keyboard focus for events

Browse Source
This commit is contained in:
Rob Bradford 2013-08-04 15:33:30 +01:00
parent 558f142818
commit 66044b665f
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,9 +74,14 @@ clutter_wayland_handle_motion (void *data,
wl_fixed_t x, wl_fixed_t y) wl_fixed_t x, wl_fixed_t y)
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageCogl *stage_cogl = device->pointer_focus; ClutterStageCogl *stage_cogl;
ClutterEvent *event; ClutterEvent *event;
if (!device->pointer_focus)
return;
stage_cogl = device->pointer_focus;
event = clutter_event_new (CLUTTER_MOTION); event = clutter_event_new (CLUTTER_MOTION);
event->motion.stage = stage_cogl->wrapper; event->motion.stage = stage_cogl->wrapper;
event->motion.device = CLUTTER_INPUT_DEVICE (device); event->motion.device = CLUTTER_INPUT_DEVICE (device);
@ -98,10 +103,15 @@ clutter_wayland_handle_button (void *data,
uint32_t button, uint32_t state) uint32_t button, uint32_t state)
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageCogl *stage_cogl = device->pointer_focus; ClutterStageCogl *stage_cogl;
ClutterEvent *event; ClutterEvent *event;
ClutterEventType type; ClutterEventType type;
if (!device->pointer_focus)
return;
stage_cogl = device->pointer_focus;
if (state) if (state)
type = CLUTTER_BUTTON_PRESS; type = CLUTTER_BUTTON_PRESS;
else else
@ -140,10 +150,14 @@ clutter_wayland_handle_axis (void *data,
wl_fixed_t value) wl_fixed_t value)
{ {
ClutterInputDeviceWayland *device = data; ClutterInputDeviceWayland *device = data;
ClutterStageCogl *stage_cogl = device->pointer_focus; ClutterStageCogl *stage_cogl;
ClutterEvent *event; ClutterEvent *event;
gdouble delta_x, delta_y; gdouble delta_x, delta_y;
if (!device->pointer_focus)
return;
stage_cogl = device->pointer_focus;
event = clutter_event_new (CLUTTER_SCROLL); event = clutter_event_new (CLUTTER_SCROLL);
event->scroll.time = _clutter_wayland_get_time(); event->scroll.time = _clutter_wayland_get_time();
event->scroll.stage = stage_cogl->wrapper; event->scroll.stage = stage_cogl->wrapper;
@ -272,6 +286,8 @@ clutter_wayland_handle_key (void *data,
ClutterStageCogl *stage_cogl = device->keyboard_focus; ClutterStageCogl *stage_cogl = device->keyboard_focus;
ClutterEvent *event; ClutterEvent *event;
if (!device->keyboard_focus)
return;
if (!device->xkb) if (!device->xkb)
return; return;