Skip to content

Commit

Permalink
[Wayland] Fix axis events handling
Browse files Browse the repository at this point in the history 
This was very buggy, we were counting the events twice...

* always use pointer frame, it's available since v5
* drop axis handler
* use axis_discrete or axis_120 (v >= 8) instead
* fail on some protocol minimum version checks
* simplify output protocol version check

Fixes #120
  • Loading branch information
@lbonn
lbonn committed Mar 1, 2024
1 parent 217d6c4 commit 37b8e9f
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 59 deletions.
12 changes: 4 additions & 8 deletions include/wayland-internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,12 @@ struct _wayland_seat {
/* Supported interface versions */
#define WL_COMPOSITOR_INTERFACE_VERSION 3
#define WL_SHM_INTERFACE_VERSION 1
#define WL_SEAT_INTERFACE_VERSION 5
#define WL_SEAT_INTERFACE_MIN_VERSION 5
#define WL_SEAT_INTERFACE_MAX_VERSION 8
#define WL_OUTPUT_INTERFACE_MIN_VERSION 2
#define WL_OUTPUT_INTERFACE_MAX_VERSION 4
#define WL_LAYER_SHELL_INTERFACE_VERSION 1
#define WL_KEYBOARD_SHORTCUTS_INHIBITOR_INTERFACE_VERSION 1
#define WL_OUTPUT_INTERFACE_MIN_VERSION 2

#ifdef WL_OUTPUT_NAME_SINCE_VERSION
#define WL_OUTPUT_INTERFACE_MAX_VERSION WL_OUTPUT_NAME_SINCE_VERSION
#else
#define WL_OUTPUT_INTERFACE_MAX_VERSION 2
#endif

extern wayland_stuff *wayland;

Expand Down
112 changes: 61 additions & 51 deletions source/wayland/display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,18 +609,28 @@ static void wayland_pointer_send_events(wayland_seat *self) {
self->button.button = 0;
}

if (self->wheel.vertical != 0) {
if (abs(self->wheel.vertical) >= 120) {
gint v120 = self->wheel.vertical;
nk_bindings_seat_handle_scroll(wayland->bindings_seat, NULL,
NK_BINDINGS_SCROLL_AXIS_VERTICAL,
self->wheel.vertical);
self->wheel.vertical = 0;
v120 / 120);
if (v120 > 0) {
self->wheel.vertical = v120 % 120;
} else {
self->wheel.vertical = -((-v120) % 120);
}
}

if (self->wheel.horizontal != 0) {
if (abs(self->wheel.horizontal) >= 120) {
gint v120 = self->wheel.horizontal;
nk_bindings_seat_handle_scroll(wayland->bindings_seat, NULL,
NK_BINDINGS_SCROLL_AXIS_HORIZONTAL,
self->wheel.horizontal);
self->wheel.horizontal = 0;
v120 / 120);
if (v120 > 0) {
self->wheel.horizontal = v120 % 120;
} else {
self->wheel.horizontal = -((-v120) % 120);
}
}

rofi_view_maybe_update(state);
Expand Down Expand Up @@ -772,12 +782,6 @@ static void wayland_pointer_motion(void *data, struct wl_pointer *pointer,
self->motion.x = wl_fixed_to_int(x);
self->motion.y = wl_fixed_to_int(y);
self->motion.time = time;

if (wl_pointer_get_version(self->pointer) >= WL_POINTER_FRAME_SINCE_VERSION) {
return;
}

wayland_pointer_send_events(self);
}

static void wayland_pointer_button(void *data, struct wl_pointer *pointer,
Expand All @@ -792,26 +796,11 @@ static void wayland_pointer_button(void *data, struct wl_pointer *pointer,
self->button.time = time;
self->button.pressed = (state == WL_POINTER_BUTTON_STATE_PRESSED);
self->button.button = button;

wayland_pointer_send_events(self);
}

static void wayland_pointer_axis(void *data, struct wl_pointer *pointer,
uint32_t time, enum wl_pointer_axis axis,
wl_fixed_t value) {
wayland_seat *self = data;

switch (axis) {
case WL_POINTER_AXIS_VERTICAL_SCROLL:
self->wheel.vertical += (gint)(wl_fixed_to_double(value) / 10.);
break;
case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
self->wheel.horizontal += (gint)(wl_fixed_to_double(value) / 10.);
break;
}

wayland_pointer_send_events(self);
}
wl_fixed_t value) {}

static void wayland_pointer_frame(void *data, struct wl_pointer *pointer) {
wayland_seat *self = data;
Expand All @@ -832,15 +821,36 @@ static void wayland_pointer_axis_discrete(void *data,
int32_t discrete) {
wayland_seat *self = data;

// values are multiplied by 120 for compatibility with the
// new high-resolution events
switch (axis) {
case WL_POINTER_AXIS_VERTICAL_SCROLL:
self->wheel.vertical += discrete * 120;
break;
case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
self->wheel.horizontal += discrete * 120;
break;
}
}

#ifdef WL_POINTER_AXIS_VALUE120_SINCE_VERSION
static void wayland_pointer_axis120(void *data,
struct wl_pointer *wl_pointer,
enum wl_pointer_axis axis,
int32_t value120)
{
wayland_seat *self = data;

switch (axis) {
case WL_POINTER_AXIS_VERTICAL_SCROLL:
self->wheel.vertical += discrete;
self->wheel.vertical += value120;
break;
case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
self->wheel.horizontal += discrete;
self->wheel.horizontal += value120;
break;
}
}
#endif

static const struct wl_pointer_listener wayland_pointer_listener = {
.enter = wayland_pointer_enter,
Expand All @@ -851,6 +861,9 @@ static const struct wl_pointer_listener wayland_pointer_listener = {
.frame = wayland_pointer_frame,
.axis_source = wayland_pointer_axis_source,
.axis_stop = wayland_pointer_axis_stop,
#ifdef WL_POINTER_AXIS_VALUE120_SINCE_VERSION
.axis_value120 = wayland_pointer_axis120,
#endif
.axis_discrete = wayland_pointer_axis_discrete,
};

Expand All @@ -859,12 +872,7 @@ static void wayland_keyboard_release(wayland_seat *self) {
return;
}

if (wl_keyboard_get_version(self->keyboard) >=
WL_KEYBOARD_RELEASE_SINCE_VERSION) {
wl_keyboard_release(self->keyboard);
} else {
wl_keyboard_destroy(self->keyboard);
}
wl_keyboard_release(self->keyboard);

self->repeat.key = 0;
if (self->repeat.source != NULL) {
Expand Down Expand Up @@ -1068,12 +1076,7 @@ static void wayland_pointer_release(wayland_seat *self) {
}
#endif

if (wl_pointer_get_version(self->pointer) >=
WL_POINTER_RELEASE_SINCE_VERSION) {
wl_pointer_release(self->pointer);
} else {
wl_pointer_destroy(self->pointer);
}
wl_pointer_release(self->pointer);

self->pointer = NULL;
}
Expand All @@ -1082,11 +1085,7 @@ static void wayland_seat_release(wayland_seat *self) {
wayland_keyboard_release(self);
wayland_pointer_release(self);

if (wl_seat_get_version(self->seat) >= WL_SEAT_RELEASE_SINCE_VERSION) {
wl_seat_release(self->seat);
} else {
wl_seat_destroy(self->seat);
}
wl_seat_release(self->seat);

g_hash_table_remove(wayland->seats, self->seat);

Expand Down Expand Up @@ -1280,17 +1279,28 @@ static void wayland_registry_handle_global(void *data,
wayland->shm = wl_registry_bind(registry, name, &wl_shm_interface,
MIN(version, WL_SHM_INTERFACE_VERSION));
} else if (g_strcmp0(interface, wl_seat_interface.name) == 0) {
if (version < WL_SEAT_INTERFACE_MIN_VERSION) {
g_error("Minimum version of wayland seat interface is %u, got %u", WL_SEAT_INTERFACE_MIN_VERSION,
version);
return;
}
version = MIN(version, WL_SEAT_INTERFACE_MAX_VERSION);

wayland_seat *seat = g_new0(wayland_seat, 1);
seat->context = wayland;
seat->global_name = name;
seat->seat = wl_registry_bind(registry, name, &wl_seat_interface,
MIN(version, WL_SEAT_INTERFACE_VERSION));
seat->seat = wl_registry_bind(registry, name, &wl_seat_interface, version);
g_hash_table_insert(wayland->seats, seat->seat, seat);

wl_seat_add_listener(seat->seat, &wayland_seat_listener, seat);
} else if (g_strcmp0(interface, wl_output_interface.name) == 0) {
version = CLAMP(version, WL_OUTPUT_INTERFACE_MIN_VERSION,
WL_OUTPUT_INTERFACE_MAX_VERSION);
if (version < WL_OUTPUT_INTERFACE_MIN_VERSION) {
g_error("Minimum version of wayland output interface is %u, got %u", WL_OUTPUT_INTERFACE_MIN_VERSION,
version);
return;
}
version = MIN(version, WL_OUTPUT_INTERFACE_MAX_VERSION);

wayland_output *output = g_new0(wayland_output, 1);
output->context = wayland;
output->global_name = name;
Expand Down

0 comments on commit 37b8e9f

Please sign in to comment.