mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-07 04:34:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/seatop_default: handle continuous scroll events

Browse source 
The implementation is similar to how swaybar handles these events,
except that swaybar does it in a pointer frame event handler.

Fixes #8014
This commit is contained in:
Konstantin Pospelov 2025-04-23 20:06:24 +02:00
parent 0e19d85d37
commit bae4512ec5
3 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/sway/input/cursor.h
View file

@ -8,6 +8,7 @@
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "config.h" #include "config.h"
#define SWAY_CONTINUOUS_SCROLL_TIMEOUT 1000
#define SWAY_CURSOR_PRESSED_BUTTONS_CAP 32 #define SWAY_CURSOR_PRESSED_BUTTONS_CAP 32
#define SWAY_SCROLL_UP KEY_MAX + 1 #define SWAY_SCROLL_UP KEY_MAX + 1

6
include/sway/input/seat.h
View file

@ -80,9 +80,15 @@ struct sway_drag {
struct wl_listener destroy; struct wl_listener destroy;
}; };
struct sway_scroll_axis {
double value;
uint32_t time_msec;
};
struct sway_seat { struct sway_seat {
struct wlr_seat *wlr_seat; struct wlr_seat *wlr_seat;
struct sway_cursor *cursor; struct sway_cursor *cursor;
struct sway_scroll_axis axis[2];
// Seat scene tree structure // Seat scene tree structure
// - scene_tree // - scene_tree

32
sway/input/seatop_default.c
View file

@ -702,6 +702,35 @@ static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
} }
} }
static int calc_scroll_steps(struct sway_seat *seat,
struct wlr_pointer_axis_event *event, float scroll_factor) {
if (event->delta_discrete) {
return roundf(scroll_factor * event->delta_discrete /
WLR_POINTER_AXIS_DISCRETE_STEP);
}
if (!sway_assert(event->orientation < 2, "axis out of range")) {
return 0;
}
struct sway_scroll_axis *axis = &seat->axis[event->orientation];
if (event->time_msec - axis->time_msec > SWAY_CONTINUOUS_SCROLL_TIMEOUT) {
axis->value = 0;
}
axis->value += scroll_factor * event->delta;
axis->time_msec = event->time_msec;
if (axis->value > WLR_POINTER_AXIS_DISCRETE_STEP) {
axis->value -= WLR_POINTER_AXIS_DISCRETE_STEP;
return 1;
}
if (axis->value < -WLR_POINTER_AXIS_DISCRETE_STEP) {
axis->value += WLR_POINTER_AXIS_DISCRETE_STEP;
return -1;
}
return 0;
}
static void handle_pointer_axis(struct sway_seat *seat, static void handle_pointer_axis(struct sway_seat *seat,
struct wlr_pointer_axis_event *event) { struct wlr_pointer_axis_event *event) {
struct sway_input_device *input_device = struct sway_input_device *input_device =
@ -758,8 +787,9 @@ static void handle_pointer_axis(struct sway_seat *seat,
struct sway_node *active = struct sway_node *active =
seat_get_active_tiling_child(seat, tabcontainer); seat_get_active_tiling_child(seat, tabcontainer);
list_t *siblings = container_get_siblings(cont); list_t *siblings = container_get_siblings(cont);
int desired = list_find(siblings, active->sway_container) + int desired = list_find(siblings, active->sway_container) +
roundf(scroll_factor * event->delta_discrete / WLR_POINTER_AXIS_DISCRETE_STEP); calc_scroll_steps(seat, event, scroll_factor);
if (desired < 0) { if (desired < 0) {
desired = 0; desired = 0;
} else if (desired >= siblings->length) { } else if (desired >= siblings->length) {