blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Store wayland backend axis source

This commit is contained in:
nyorain 2017-06-22 17:58:53 +02:00
parent 272030652a
commit dbde1f7340
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/wayland/wl_seat.c
View File

@ -77,7 +77,7 @@ static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
wlr_event.orientation = axis; wlr_event.orientation = axis;
wlr_event.time_sec = time / 1000; wlr_event.time_sec = time / 1000;
wlr_event.time_usec = time * 1000; wlr_event.time_usec = time * 1000;
wlr_event.source = WLR_AXIS_SOURCE_CONTINUOUS; wlr_event.source = dev->pointer->state->axis_source;
wl_signal_emit(&dev->pointer->events.axis, &wlr_event); wl_signal_emit(&dev->pointer->events.axis, &wlr_event);
} }
@ -87,7 +87,9 @@ static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) {
static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer,
uint32_t axis_source) { uint32_t axis_source) {
struct wlr_input_device *dev = data;
assert(dev && dev->pointer && dev->pointer->state);
dev->pointer->state->axis_source = axis_source;
} }
static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer,

1
include/backend/wayland.h
View File

@ -44,6 +44,7 @@ struct wlr_input_device_state {
}; };
struct wlr_pointer_state { struct wlr_pointer_state {
enum wlr_axis_source axis_source;
struct wlr_output *current_output; struct wlr_output *current_output;
}; };