mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-19 06:54:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded axis event timestamp

Browse Source
This commit is contained in:
Kovid Goyal
2026-01-05 20:13:33 +05:30
parent e825005861
commit 32f7f8d321
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glfw/internal.h vendored
View File

@@ -885,7 +885,7 @@ void _glfwPlatformRemoveTimer(unsigned long long timer_id);
int _glfwPlatformSetWindowBlur(_GLFWwindow* handle, int value); int _glfwPlatformSetWindowBlur(_GLFWwindow* handle, int value);
MonitorGeometry _glfwPlatformGetMonitorGeometry(_GLFWmonitor* monitor); MonitorGeometry _glfwPlatformGetMonitorGeometry(_GLFWmonitor* monitor);
bool _glfwPlatformGrabKeyboard(bool grab); bool _glfwPlatformGrabKeyboard(bool grab);
void glfw_handle_scroll_event_for_momentum(_GLFWwindow *w, const GLFWScrollEvent *ev, monotonic_t timestamp, bool stopped, bool is_finger_based); void glfw_handle_scroll_event_for_momentum(_GLFWwindow *w, const GLFWScrollEvent *ev, bool stopped, bool is_finger_based);
char* _glfw_strdup(const char* source); char* _glfw_strdup(const char* source);

18
glfw/momentum-scroll.c vendored
View File

@@ -10,7 +10,7 @@
typedef struct ScrollSample { typedef struct ScrollSample {
double dx, dy; double dx, dy;
monotonic_t timestamp, local_timestamp; monotonic_t timestamp;
} ScrollSample; } ScrollSample;
#define DEQUE_DATA_TYPE ScrollSample #define DEQUE_DATA_TYPE ScrollSample
@@ -59,8 +59,8 @@ cancel_existing_scroll(void) {
} }
static void static void
add_sample(double dx, double dy, monotonic_t timestamp) { add_sample(double dx, double dy) {
deque_push_back(&s.samples, (ScrollSample){dx, dy, timestamp, monotonic()}, NULL); deque_push_back(&s.samples, (ScrollSample){dx, dy, monotonic()}, NULL);
} }
static void static void
@@ -73,7 +73,7 @@ last_sample_delta(double *dx, double *dy) {
static void static void
trim_old_samples(monotonic_t now) { trim_old_samples(monotonic_t now) {
const ScrollSample *ss; const ScrollSample *ss;
while ((ss = deque_peek_front(&s.samples)) && (now - ss->local_timestamp) > ms_to_monotonic_t(150)) while ((ss = deque_peek_front(&s.samples)) && (now - ss->timestamp) > ms_to_monotonic_t(150))
deque_pop_front(&s.samples, NULL); deque_pop_front(&s.samples, NULL);
} }
@@ -102,12 +102,12 @@ set_velocity_from_samples(void) {
// Use weighted average - more recent samples have higher weight // Use weighted average - more recent samples have higher weight
double total_dx = 0.0, total_dy = 0.0, total_weight = 0.0; double total_dx = 0.0, total_dy = 0.0, total_weight = 0.0;
monotonic_t first_time = deque_peek_front(&s.samples)->local_timestamp; monotonic_t first_time = deque_peek_front(&s.samples)->timestamp;
monotonic_t last_time = deque_peek_back(&s.samples)->local_timestamp; monotonic_t last_time = deque_peek_back(&s.samples)->timestamp;
double time_span = MAX(1, last_time - first_time); double time_span = MAX(1, last_time - first_time);
for (size_t i = 0; i < deque_size(&s.samples); i++) { for (size_t i = 0; i < deque_size(&s.samples); i++) {
const ScrollSample *ss = deque_at(&s.samples, i); const ScrollSample *ss = deque_at(&s.samples, i);
double weight = 1.0 + (ss->local_timestamp - first_time) / time_span; double weight = 1.0 + (ss->timestamp - first_time) / time_span;
total_dx += ss->dx * weight; total_dy += ss->dy * weight; total_dx += ss->dx * weight; total_dy += ss->dy * weight;
total_weight += weight; total_weight += weight;
} }
@@ -154,7 +154,7 @@ start_momentum_scroll(void) {
void void
glfw_handle_scroll_event_for_momentum( glfw_handle_scroll_event_for_momentum(
_GLFWwindow *w, const GLFWScrollEvent *ev, monotonic_t timestamp, bool stopped, bool is_finger_based _GLFWwindow *w, const GLFWScrollEvent *ev, bool stopped, bool is_finger_based
) { ) {
if (!w || (w->id != s.window_id && s.window_id) || s.state != PHYSICAL_EVENT_IN_PROGRESS) cancel_existing_scroll(); if (!w || (w->id != s.window_id && s.window_id) || s.state != PHYSICAL_EVENT_IN_PROGRESS) cancel_existing_scroll();
if (!w) return; if (!w) return;
@@ -167,7 +167,7 @@ glfw_handle_scroll_event_for_momentum(
s.window_id = w->id; s.window_id = w->id;
s.keyboard_modifiers = ev->keyboard_modifiers; s.keyboard_modifiers = ev->keyboard_modifiers;
if (is_finger_based) { if (is_finger_based) {
add_sample(ev->x_offset, ev->y_offset, timestamp); add_sample(ev->x_offset, ev->y_offset);
s.state = stopped ? MOMENTUM_IN_PROGRESS : PHYSICAL_EVENT_IN_PROGRESS; s.state = stopped ? MOMENTUM_IN_PROGRESS : PHYSICAL_EVENT_IN_PROGRESS;
} else { } else {
s.state = stopped ? NONE : PHYSICAL_EVENT_IN_PROGRESS; s.state = stopped ? NONE : PHYSICAL_EVENT_IN_PROGRESS;

3
glfw/wl_init.c vendored
View File

@@ -225,8 +225,7 @@ pointer_handle_frame(void *data UNUSED, struct wl_pointer *pointer UNUSED) {
ev.x_offset *= scale; ev.y_offset *= scale; ev.x_offset *= scale; ev.y_offset *= scale;
ev.x_offset *= -1; ev.x_offset *= -1;
glfw_handle_scroll_event_for_momentum( glfw_handle_scroll_event_for_momentum(
window, &ev, MAX(info.y_start_time, info.x_start_time), info.y_stop_received || info.x_stop_received, window, &ev, info.y_stop_received || info.x_stop_received, info.source_type == WL_POINTER_AXIS_SOURCE_FINGER);
info.source_type == WL_POINTER_AXIS_SOURCE_FINGER);
/* clear pointer_curr_axis_info for next frame */ /* clear pointer_curr_axis_info for next frame */
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
} }