RPJosh
/
wlvncc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pointer: Translate contiguous scroll to discrete scroll

qemu-extended-key-event
Andri Yngvason 2020-07-19 21:55:40 +00:00
parent e55a845920
commit f7aab11128
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pointer.h
View File

@ -47,6 +47,9 @@ struct pointer {
int vertical_scroll_steps; int vertical_scroll_steps;
int horizontal_scroll_steps; int horizontal_scroll_steps;
double vertical_axis_value;
double horizontal_axis_value;
struct wl_cursor_theme* cursor_theme; struct wl_cursor_theme* cursor_theme;
struct wl_surface* cursor_surface; struct wl_surface* cursor_surface;

25
src/pointer.c
View File

@ -24,6 +24,8 @@
#include "pointer.h" #include "pointer.h"
#define STEP_SIZE 15.0
extern struct wl_shm* wl_shm; extern struct wl_shm* wl_shm;
extern struct wl_compositor* wl_compositor; extern struct wl_compositor* wl_compositor;
@ -228,7 +230,19 @@ static void pointer_button(void* data, struct wl_pointer* wl_pointer,
static void pointer_axis(void* data, struct wl_pointer* wl_pointer, uint32_t t, static void pointer_axis(void* data, struct wl_pointer* wl_pointer, uint32_t t,
enum wl_pointer_axis axis, wl_fixed_t value) enum wl_pointer_axis axis, wl_fixed_t value)
{ {
// TODO struct pointer_collection* self = data;
struct pointer* pointer =
pointer_collection_find_wl_pointer(self, wl_pointer);
switch (axis) {
case WL_POINTER_AXIS_VERTICAL_SCROLL:
pointer->vertical_axis_value += wl_fixed_to_double(value);
break;
case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
pointer->horizontal_axis_value += wl_fixed_to_double(value);
break;
default:;
}
} }
static void pointer_axis_source(void* data, struct wl_pointer* wl_pointer, static void pointer_axis_source(void* data, struct wl_pointer* wl_pointer,
@ -267,6 +281,15 @@ static void pointer_frame(void* data, struct wl_pointer* wl_pointer)
struct pointer* pointer = struct pointer* pointer =
pointer_collection_find_wl_pointer(self, wl_pointer); pointer_collection_find_wl_pointer(self, wl_pointer);
double vertical_steps = trunc(pointer->vertical_axis_value / STEP_SIZE);
pointer->vertical_axis_value -= vertical_steps * STEP_SIZE;
double horizontal_steps = trunc(pointer->horizontal_axis_value / STEP_SIZE);
pointer->horizontal_axis_value -= horizontal_steps * STEP_SIZE;
pointer->vertical_scroll_steps += vertical_steps;
pointer->horizontal_scroll_steps += horizontal_steps;
self->on_frame(self, pointer); self->on_frame(self, pointer);
pointer->vertical_scroll_steps = 0; pointer->vertical_scroll_steps = 0;