aboutsummaryrefslogtreecommitdiffstats
path: root/src/pgtkterm.c
diff options
context:
space:
mode:
authorPo Lu2021-11-30 19:35:36 +0800
committerPo Lu2021-11-30 19:35:36 +0800
commitc3a440e520d661e0296a7ac2d97abc5e9cd65712 (patch)
tree0f65ca9fea93d72b4b761ef371a3661c5dc63738 /src/pgtkterm.c
parent9fe993371ba696d2ec3cdfd152b433ffbee79565 (diff)
downloademacs-c3a440e520d661e0296a7ac2d97abc5e9cd65712.tar.gz
emacs-c3a440e520d661e0296a7ac2d97abc5e9cd65712.zip
Calculate pixel deltas correctly
* src/pgtkterm.c (scroll_event): Fix scroll delta factor. (bug#52195)
Diffstat (limited to 'src/pgtkterm.c')
-rw-r--r--src/pgtkterm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 98143585cf9..0e98c8a587b 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -6034,8 +6034,8 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6034 inev.ie.kind = WHEEL_EVENT; 6034 inev.ie.kind = WHEEL_EVENT;
6035 inev.ie.modifiers |= down_modifier; 6035 inev.ie.modifiers |= down_modifier;
6036 inev.ie.arg = list3 (make_fixnum (nlines), 6036 inev.ie.arg = list3 (make_fixnum (nlines),
6037 make_float (-dpyinfo->scroll.acc_x * 10), 6037 make_float (-dpyinfo->scroll.acc_x * 100),
6038 make_float (-dpyinfo->scroll.acc_y * 10)); 6038 make_float (-dpyinfo->scroll.acc_y * 100));
6039 if (!x_coalesce_scroll_events) 6039 if (!x_coalesce_scroll_events)
6040 { 6040 {
6041 dpyinfo->scroll.acc_y = 0; 6041 dpyinfo->scroll.acc_y = 0;
@@ -6053,8 +6053,8 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6053 inev.ie.kind = WHEEL_EVENT; 6053 inev.ie.kind = WHEEL_EVENT;
6054 inev.ie.modifiers |= up_modifier; 6054 inev.ie.modifiers |= up_modifier;
6055 inev.ie.arg = list3 (make_fixnum (nlines), 6055 inev.ie.arg = list3 (make_fixnum (nlines),
6056 make_float (-dpyinfo->scroll.acc_x * 10), 6056 make_float (-dpyinfo->scroll.acc_x * 100),
6057 make_float (-dpyinfo->scroll.acc_y * 10)); 6057 make_float (-dpyinfo->scroll.acc_y * 100));
6058 6058
6059 if (!x_coalesce_scroll_events) 6059 if (!x_coalesce_scroll_events)
6060 { 6060 {
@@ -6071,8 +6071,8 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6071 inev.ie.kind = HORIZ_WHEEL_EVENT; 6071 inev.ie.kind = HORIZ_WHEEL_EVENT;
6072 inev.ie.modifiers |= up_modifier; 6072 inev.ie.modifiers |= up_modifier;
6073 inev.ie.arg = list3 (make_fixnum (nchars), 6073 inev.ie.arg = list3 (make_fixnum (nchars),
6074 make_float (-dpyinfo->scroll.acc_x * 10), 6074 make_float (-dpyinfo->scroll.acc_x * 100),
6075 make_float (-dpyinfo->scroll.acc_y * 10)); 6075 make_float (-dpyinfo->scroll.acc_y * 100));
6076 6076
6077 if (x_coalesce_scroll_events) 6077 if (x_coalesce_scroll_events)
6078 dpyinfo->scroll.acc_x -= dpyinfo->scroll.x_per_char * nchars; 6078 dpyinfo->scroll.acc_x -= dpyinfo->scroll.x_per_char * nchars;
@@ -6088,8 +6088,8 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6088 inev.ie.kind = HORIZ_WHEEL_EVENT; 6088 inev.ie.kind = HORIZ_WHEEL_EVENT;
6089 inev.ie.modifiers |= down_modifier; 6089 inev.ie.modifiers |= down_modifier;
6090 inev.ie.arg = list3 (make_fixnum (nchars), 6090 inev.ie.arg = list3 (make_fixnum (nchars),
6091 make_float (-dpyinfo->scroll.acc_x * 10), 6091 make_float (-dpyinfo->scroll.acc_x * 100),
6092 make_float (-dpyinfo->scroll.acc_y * 10)); 6092 make_float (-dpyinfo->scroll.acc_y * 100));
6093 6093
6094 if (x_coalesce_scroll_events) 6094 if (x_coalesce_scroll_events)
6095 dpyinfo->scroll.acc_x -= -dpyinfo->scroll.x_per_char * nchars; 6095 dpyinfo->scroll.acc_x -= -dpyinfo->scroll.x_per_char * nchars;