mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hook up axis events.

Browse Source
This commit is contained in:
Scott Moreau 2012-03-22 10:47:01 -06:00
parent 3c97b9017d
commit 210d079817
7 changed files with 75 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clients/simple-touch.c
View File

@ -111,6 +111,12 @@ input_device_handle_button(void *data,
{
}
static void
input_device_handle_axis(void *data, struct wl_input_device *input_device,
uint32_t time, uint32_t axis, int32_t value)
{
}
static void
input_device_handle_key(void *data, struct wl_input_device *input_device,
uint32_t time, uint32_t key, uint32_t state)
@ -227,6 +233,7 @@ input_device_handle_touch_cancel(void *data,
static const struct wl_input_device_listener input_device_listener = {
input_device_handle_motion,
input_device_handle_button,
input_device_handle_axis,
input_device_handle_key,
input_device_handle_pointer_enter,
input_device_handle_pointer_leave,

8
clients/window.c
View File

@ -1520,6 +1520,13 @@ input_handle_button(void *data,
input_ungrab(input, time);
}
static void
input_handle_axis(void *data,
struct wl_input_device *input_device,
uint32_t time, uint32_t axis, int32_t value)
{
}
static void
input_handle_key(void *data, struct wl_input_device *input_device,
uint32_t time, uint32_t key, uint32_t state)
@ -1690,6 +1697,7 @@ input_handle_touch_cancel(void *data,
static const struct wl_input_device_listener input_device_listener = {
input_handle_motion,
input_handle_button,
input_handle_axis,
input_handle_key,
input_handle_pointer_enter,
input_handle_pointer_leave,

11
src/compositor-wayland.c
View File

@ -519,6 +519,16 @@ input_handle_button(void *data,
notify_button(c->base.input_device, time, button, state);
}
static void
input_handle_axis(void *data, struct wl_input_device *input_device,
uint32_t time, uint32_t axis, int32_t value)
{
struct wayland_input *input = data;
struct wayland_compositor *c = input->compositor;
notify_axis(c->base.input_device, time, axis, value);
}
static void
input_handle_key(void *data, struct wl_input_device *input_device,
uint32_t time, uint32_t key, uint32_t state)
@ -586,6 +596,7 @@ input_handle_keyboard_leave(void *data,
static const struct wl_input_device_listener input_device_listener = {
input_handle_motion,
input_handle_button,
input_handle_axis,
input_handle_key,
input_handle_pointer_enter,
input_handle_pointer_leave,

24
src/compositor-x11.c
View File

@ -485,14 +485,28 @@ x11_compositor_deliver_button_event(struct x11_compositor *c,
button = BTN_RIGHT;
break;
case 4:
if (state)
notify_axis(c->base.input_device,
weston_compositor_get_time(),
WL_INPUT_DEVICE_AXIS_VERTICAL_SCROLL, 1);
return;
case 5:
if (state)
notify_axis(c->base.input_device,
weston_compositor_get_time(),
WL_INPUT_DEVICE_AXIS_VERTICAL_SCROLL, -1);
return;
case 6:
if (state)
notify_axis(c->base.input_device,
weston_compositor_get_time(),
WL_INPUT_DEVICE_AXIS_HORIZONTAL_SCROLL, 1);
return;
case 7:
/* X11 sends wheel events as buttons events. But
* linux input treats as REL_WHEEL, therefore not
* button type at all. When we update the input
* protocol and get the 'axis' event, we'll send
* scroll events as axis events. */
if (state)
notify_axis(c->base.input_device,
weston_compositor_get_time(),
WL_INPUT_DEVICE_AXIS_HORIZONTAL_SCROLL, -1);
return;
}

14
src/compositor.c
View File

@ -1549,6 +1549,20 @@ notify_button(struct wl_input_device *device,
}
WL_EXPORT void
notify_axis(struct wl_input_device *device,
uint32_t time, uint32_t axis, int32_t value)
{
struct weston_input_device *wd = (struct weston_input_device *) device;
struct weston_compositor *compositor = wd->compositor;
weston_compositor_activity(compositor);
if (device->pointer_focus_resource)
wl_resource_post_event(device->pointer_focus_resource,
WL_INPUT_DEVICE_AXIS, time, axis, value);
}
static void
update_modifier_state(struct weston_input_device *device,
uint32_t key, uint32_t state)

3
src/compositor.h
View File

@ -370,6 +370,9 @@ void
notify_button(struct wl_input_device *device,
uint32_t time, int32_t button, int32_t state);
void
notify_axis(struct wl_input_device *device,
uint32_t time, uint32_t axis, int32_t value);
void
notify_key(struct wl_input_device *device,
uint32_t time, uint32_t key, uint32_t state);

16
src/evdev.c
View File

@ -227,8 +227,8 @@ evdev_process_absolute_motion_touchpad(struct evdev_input_device *device,
}
static inline void
evdev_process_relative_motion(struct evdev_input_device *device,
struct input_event *e)
evdev_process_relative(struct evdev_input_device *device,
struct input_event *e, uint32_t time)
{
switch (e->code) {
case REL_X:
@ -239,6 +239,16 @@ evdev_process_relative_motion(struct evdev_input_device *device,
device->rel.dy += e->value;
device->type |= EVDEV_RELATIVE_MOTION;
break;
case REL_WHEEL:
notify_axis(&device->master->base.input_device,
time,
WL_INPUT_DEVICE_AXIS_VERTICAL_SCROLL, e->value);
break;
case REL_HWHEEL:
notify_axis(&device->master->base.input_device,
time,
WL_INPUT_DEVICE_AXIS_HORIZONTAL_SCROLL, e->value);
break;
}
}
@ -344,7 +354,7 @@ evdev_process_events(struct evdev_input_device *device,
evdev_flush_motion(device, time);
switch (e->type) {
case EV_REL:
evdev_process_relative_motion(device, e);
evdev_process_relative(device, e, time);
break;
case EV_ABS:
evdev_process_absolute(device, e);