File vim-9.1-revert-v9.1.86.patch of Package vim

Overview Repositories Revisions Requests Users Attributes Meta

File vim-9.1-revert-v9.1.86.patch of Package vim (Revision 88d42acb28aa8d46d264eaaf3bd836f2)

Currently displaying revision 88d42acb28aa8d46d264eaaf3bd836f2 , Show latest

From bba8d5cabd62724778bd373c9b58f29005ddd3cb Mon Sep 17 00:00:00 2001
From: bzoltan1 <zoltan@bakter.hu>
Date: Fri, 1 Mar 2024 16:18:37 +0200
Subject: [PATCH] Revert "patch 9.1.0086: Problem when scrolling using slow
 touchpads scroll event"

This reverts commit 725c7c31a4c7603e688511d769b0addaab442d07.
---
 src/gui_gtk_x11.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index d4a8b9364..6023827b8 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2049,7 +2049,7 @@ button_press_event(GtkWidget *widget,
 }
 
 /*
- * GTK+ abstracts scrolling via the GdkEventScroll.
+ * GTK+ 2 abstracts scrolling via the GdkEventScroll.
  */
     static gboolean
 scroll_event(GtkWidget *widget,
@@ -2060,9 +2060,7 @@ scroll_event(GtkWidget *widget,
     int_u   vim_modifiers;
 #if GTK_CHECK_VERSION(3,4,0)
     static double  acc_x, acc_y;
-#if !GTK_CHECK_VERSION(3,22,0)
     static guint32 last_smooth_event_time;
-#endif
 #define DT_X11     1
 #define DT_WAYLAND 2
     static int display_type;
@@ -2089,25 +2087,12 @@ scroll_event(GtkWidget *widget,
 	    break;
 #if GTK_CHECK_VERSION(3,4,0)
 	case GDK_SCROLL_SMOOTH:
-	    if (event->is_stop)
-	    {
-		acc_x = acc_y = 0;
-		// this event tells us to stop, without an actual moving
-		return FALSE;
-	    }
-#if GTK_CHECK_VERSION(3,22,0)
-	    if (gdk_device_get_axes(event->device) & GDK_AXIS_FLAG_WHEEL)
-		// this is from a wheel (as oppose to a touchpad / trackpoint)
-#else
 	    if (event->time - last_smooth_event_time > 50)
 		// reset our accumulations after 50ms of silence
-#endif
 		acc_x = acc_y = 0;
 	    acc_x += event->delta_x;
 	    acc_y += event->delta_y;
-#if !GTK_CHECK_VERSION(3,22,0)
 	    last_smooth_event_time = event->time;
-#endif
 	    break;
 #endif
 	default: // This shouldn't happen
-- 
2.43.0

Places

File vim-9.1-revert-v9.1.86.patch of Package vim (Revision 88d42acb28aa8d46d264eaaf3bd836f2)

Places