aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0085: X11 scroll size changes after accessing clipboard

Browse Source 
Problem:  X11 scroll size changes after accessing clipboard
          (Ernie Rael)
Solution: use GDK_SCROLL_MASK for X11 and GDK_SMOOTH_SCROLL_MASK for
          Wayland (lilydjwg)

because GDK_SCROLL_SMOOTH events don't work well for x11 (see comments).

fixes #13994
closes: #13997

Signed-off-by: lilydjwg <lilydjwg@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
lilydjwg 2024-02-09 19:13:12 +01:00 committed by Christian Brabandt
parent bd2f45a6e5
commit c4d4a1e041
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/gui_gtk_x11.c
View File

@ -2061,6 +2061,11 @@ scroll_event(GtkWidget *widget,
#if GTK_CHECK_VERSION(3,4,0) #if GTK_CHECK_VERSION(3,4,0)
static double acc_x, acc_y; static double acc_x, acc_y;
static guint32 last_smooth_event_time; static guint32 last_smooth_event_time;
#define DT_X11 1
#define DT_WAYLAND 2
static display_type;
if (!display_type)
display_type = gui_mch_get_display() ? DT_X11 : DT_WAYLAND;
#endif #endif
if (gtk_socket_id != 0 && !gtk_widget_has_focus(widget)) if (gtk_socket_id != 0 && !gtk_widget_has_focus(widget))
@ -2103,7 +2108,9 @@ scroll_event(GtkWidget *widget,
vim_modifiers = modifiers_gdk2mouse(event->state); vim_modifiers = modifiers_gdk2mouse(event->state);
#if GTK_CHECK_VERSION(3,4,0) #if GTK_CHECK_VERSION(3,4,0)
if (event->direction == GDK_SCROLL_SMOOTH) // on x11, despite not requested, when we copy into primary clipboard,
// we'll get smooth events. Unsmooth ones will also come along.
if (event->direction == GDK_SCROLL_SMOOTH && display_type == DT_WAYLAND)
{ {
while (acc_x >= 1.0) while (acc_x >= 1.0)
{ // right { // right
@ -2131,6 +2138,8 @@ scroll_event(GtkWidget *widget,
} }
} }
else else
#undef DT_X11
#undef DT_WAYLAND
#endif #endif
gui_send_mouse_event(button, (int)event->x, (int)event->y, gui_send_mouse_event(button, (int)event->x, (int)event->y,
FALSE, vim_modifiers); FALSE, vim_modifiers);
@ -3998,20 +4007,37 @@ gui_mch_init(void)
#endif #endif
// Determine which events we will filter. // Determine which events we will filter.
gtk_widget_set_events(gui.drawarea, gint event_mask =
GDK_EXPOSURE_MASK | GDK_EXPOSURE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_SCROLL_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK |
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK;
#if GTK_CHECK_VERSION(3,4,0) #if GTK_CHECK_VERSION(3,4,0)
GDK_SMOOTH_SCROLL_MASK | if (GDK_IS_X11_DISPLAY(gdk_display_get_default()))
{
// for X11, if we were using smooth scroll events, we
// would get an scroll without deltas on the very first user scroll* and
// get both "unsmooth" scroll and smooth scroll events after
// copying into the primary selection
//
// *: https://bugzilla.gnome.org/show_bug.cgi?id=675959
event_mask |= GDK_SCROLL_MASK;
}
else
{
// for Wayland, touchpads don't generate "unsmooth" scroll events. Both
// touchpads and wheels generate smooth scroll events expectedly.
event_mask |= GDK_SMOOTH_SCROLL_MASK;
}
#else
event_mask |= GDK_SCROLL_MASK;
#endif #endif
GDK_KEY_PRESS_MASK | gtk_widget_set_events(gui.drawarea, event_mask);
GDK_KEY_RELEASE_MASK |
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK);
gtk_widget_show(gui.drawarea); gtk_widget_show(gui.drawarea);
gui_gtk_form_put(GTK_FORM(gui.formwin), gui.drawarea, 0, 0); gui_gtk_form_put(GTK_FORM(gui.formwin), gui.drawarea, 0, 0);

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
85,
/**/ /**/
84, 84,
/**/ /**/