nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

gtk: fill in missing case in scroll_event().

Browse Source 
If gdk_event_get_scroll_deltas() return failure for a given
GdkEventScroll, it doesn't follow that that event has no usable
scrolling action in it at all. The fallback is to call
gdk_event_get_scroll_direction() instead, which is less precise but
still gives _something_ you can use. So in that situation, instead of
just returning false, we can fall through to the handling we use for
pre-GTK3 scroll events (which are always imprecise).

In particular, I've noticed recently that if you run GTK 3 PuTTY in
the virtual X display created by vnc4server, and connect to it using
xtightvncviewer, then scroll-wheel actions passed through from the VNC
client will cause scroll_event() to receive low-res GdkEventScroll
structures of exactly this kind. So scroll-wheel activity on the
terminal window wasn't causing a scroll in that environment, and with
this patch, it does.

(cherry picked from commit 0fd30113f1)
This commit is contained in:
Simon Tatham 2020-04-03 17:56:30 +01:00
parent 9331bb3c57
commit b267f35cf7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unix/gtkwin.c
View File

@ -2182,21 +2182,26 @@ gboolean button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data) gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
{ {
GtkFrontend *inst = (GtkFrontend *)data; GtkFrontend *inst = (GtkFrontend *)data;
GdkScrollDirection dir;
#if GTK_CHECK_VERSION(3,4,0) #if GTK_CHECK_VERSION(3,4,0)
gdouble dx, dy; gdouble dx, dy;
if (gdk_event_get_scroll_deltas((GdkEvent *)event, &dx, &dy)) { if (gdk_event_get_scroll_deltas((GdkEvent *)event, &dx, &dy)) {
return scroll_internal(inst, dy, event->state, event->x, event->y); return scroll_internal(inst, dy, event->state, event->x, event->y);
} else } else if (!gdk_event_get_scroll_direction((GdkEvent *)event, &dir)) {
return false; return false;
}
#else #else
dir = event->direction;
#endif
guint button; guint button;
GdkEventButton *event_button; GdkEventButton *event_button;
gboolean ret; gboolean ret;
if (event->direction == GDK_SCROLL_UP) if (dir == GDK_SCROLL_UP)
button = 4; button = 4;
else if (event->direction == GDK_SCROLL_DOWN) else if (dir == GDK_SCROLL_DOWN)
button = 5; button = 5;
else else
return false; return false;
@ -2216,7 +2221,6 @@ gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
ret = button_internal(inst, event_button); ret = button_internal(inst, event_button);
gdk_event_free((GdkEvent *)event_button); gdk_event_free((GdkEvent *)event_button);
return ret; return ret;
#endif
} }
#endif #endif