mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-08 13:16:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge bae4512ec5 into d9e615c507

Browse source
This commit is contained in:
Konstantin Pospelov 2025-10-01 10:33:26 +01:00 • committed by GitHub
commit ffe9a79d23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 38 additions and 1 deletions
Show stats 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 "config.h"
#define SWAY_CONTINUOUS_SCROLL_TIMEOUT 1000
#define SWAY_CURSOR_PRESSED_BUTTONS_CAP 32
#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 sway_scroll_axis {
double value;
uint32_t time_msec;
};
struct sway_seat {
struct wlr_seat *wlr_seat;
struct sway_cursor *cursor;
struct sway_scroll_axis axis[2];
// Seat scene tree structure
// - scene_tree

32
sway/input/seatop_default.c
View file

@ -703,6 +703,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,
struct wlr_pointer_axis_event *event) {
struct sway_input_device *input_device =
@ -759,8 +788,9 @@ static void handle_pointer_axis(struct sway_seat *seat,
struct sway_node *active =
seat_get_active_tiling_child(seat, tabcontainer);
list_t *siblings = container_get_siblings(cont);
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) {
desired = 0;
} else if (desired >= siblings->length) {