From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#51891: 29.0.50; [PATCH] Pixel delta support for wheel events on X Date: Thu, 18 Nov 2021 18:27:44 +0800 Message-ID: <87v90ppxlr.fsf@yahoo.com> References: <87zgq4uvh0.fsf.ref@yahoo.com> <87zgq4uvh0.fsf@yahoo.com> <871r3gnrrn.fsf@gmail.com> <875ysrtyak.fsf@yahoo.com> <871r3ftsjy.fsf@yahoo.com> <83r1bezz2u.fsf@gnu.org> <87r1beqpy8.fsf@yahoo.com> <83tug9yl28.fsf@gnu.org> <87zgq1q0uy.fsf@yahoo.com> Reply-To: Po Lu Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9425"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: rpluim@gmail.com, 51891@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Nov 18 11:29:29 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mnefZ-0002IX-Bn for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 Nov 2021 11:29:29 +0100 Original-Received: from localhost ([::1]:47456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnefW-0004CN-GN for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 Nov 2021 05:29:26 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:33726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnef8-00049z-FI for bug-gnu-emacs@gnu.org; Thu, 18 Nov 2021 05:29:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnef8-0004TO-6h for bug-gnu-emacs@gnu.org; Thu, 18 Nov 2021 05:29:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnef8-0005Gz-36 for bug-gnu-emacs@gnu.org; Thu, 18 Nov 2021 05:29:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Po Lu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 18 Nov 2021 10:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51891 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 51891-submit@debbugs.gnu.org id=B51891.163723128220164 (code B ref 51891); Thu, 18 Nov 2021 10:29:02 +0000 Original-Received: (at 51891) by debbugs.gnu.org; 18 Nov 2021 10:28:02 +0000 Original-Received: from localhost ([127.0.0.1]:34894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnee9-0005Ew-GR for submit@debbugs.gnu.org; Thu, 18 Nov 2021 05:28:02 -0500 Original-Received: from sonic315-22.consmr.mail.ne1.yahoo.com ([66.163.190.148]:36383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnee6-0005Eb-UJ for 51891@debbugs.gnu.org; Thu, 18 Nov 2021 05:27:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1637231273; bh=eIvKINRzSR8EiP5PUBv4ugL34ZalimNtgnuHTt23e6w=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=p4g/bE+HQQAmxI3WrExUy8NawY6+OdqcBeXRSdSUq29C5pTMRFd/AsQMLgN8Op6nUtIqXwZ8Gn9YI29FNGdRdvtDZSzas89bZ5UA1BD3fEhGW9Ai6AgLYI94IQ+SYN7Y3frw0OuXvD9rCq9PNZQOg7YaBh0BWFN3Z6WNVwUB602o4nQb2OQ5Fkrdv44qy0ZtpAfykDMgtzsHnXP0/oEqGYclb362LEtFFYOB6wdD5toayxEeVbzvSze+P9WuQBmaGCMmkwSJVUJ1NxUz9MPwIlM3JaYIen+ASKRVsgFf973lAO45nwIa3nPJxP67x0WZsXYIoKbS9AdvicUUVxK+8A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1637231273; bh=cHvic5g1gsOg7nS7xdBF7YEs4qKo7Y7rViuV6yrEypx=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=Rx2zdliYdaziCmEkQFAQZ0+ui+AqBD8/I9510zD8a3kQGAP5Ft+rlf3Ah5cefAJfpfvEMlufPtlRg1tMjPRMnW89DB+IqCUMVZqgm28LwXAT2vIyjKARQxr0szo9EipfRzPEzJcIyfy6nOZmp/gk3jXKA19OqAd2EGfUVocRP08caLjGOkxivLq0jpqPVGG442elf1XC5apNOUDVu4EvvYB4Xw7ZwC8tWQgmZ0+yOyyOQahhuWywzBBy9jD6R6zNCMFAVfE41qENiqa8spVJ0kzNjkXRo0klCHdIU+WFZCjTO2EPpq5oT2MmC7ja+nFcrg//ivDZK/gS7oOkBcf8ww== X-YMail-OSG: .WBR.AMVM1nXhjQ_UTm1erSbCTPQj.FBwGOByi1v4vkU_x7nJOEKcRSrgUSc8oN L5XKyhzhcDwAuCQ4VLMk3BW0ilk2LMkpnKyYy_qAqrNAJGbum6tyTzF1.jN_Re2tuKRX50A2MwOd Pe_rHPxwcpuYWSZfCTO3i7jUUnJjqfFl0okezrtoTLkGFpXsmU22W5TJm5QPkQo41R7rS3l4WFJN zO005nsX7X9F1Tnab2Pwirih6LRAmN05yumSbG_ZNoGA8MxYYyHsnAClsxfEFc76msQ7iv2If6Vj yVOaTTL5cQchmApameJRE.m7VwoQyuoOMQLfpKg8Km7_7pmL6QcTBaTGPUCujuffJ84fMl9A7R76 R47wHIePrrYs6XwKMZ0kJP91VUQfc6yGNDJCklrSaIPmaDcZyUrYkt5H9rNDQGIBEXpRQg5fUzc_ .eKgEEiHFCVKX40zGYtE5EkLPHuFdGbgDAugXjFGpxDpLvB_CdILpJzCB5IxM0LroIDLTyJ00Jyg 9BQQraPzufTZtNeLKMUXBFjEMS_xJ5vN64ZpXPxMlvdaKuZR_jdtXzOI2.LXBmo_8EqQmAYjacPR cpjmDHWpPgJbLUmwL_Yn92CmwIbcwSVXJUjjaQwpYBqtajPAflGwpVCqHVYksthtiTavfmoAIXVv RBpPXEjVXwNf8J6azZBraFdfKkwLVqOZS42cfp.ng2cR0H_NFCasQuRBvxhAmQpGyDIrBmJ070B9 LyvPayq3CW6_rQJNb1MTtYOwmsudBDddIrLhvjH7lLxNAyDmjTtBdcP9YtNITfsY022b7gfOmz_O Rmz0O1U1tgBDVM2hZHch3Oa_Ky90iPb4sxR5L_e9uk X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.ne1.yahoo.com with HTTP; Thu, 18 Nov 2021 10:27:53 +0000 Original-Received: by kubenode513.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID a760b320bffc08e92e40d4746dd726d7; Thu, 18 Nov 2021 10:27:49 +0000 (UTC) In-Reply-To: <87zgq1q0uy.fsf@yahoo.com> (Po Lu's message of "Thu, 18 Nov 2021 17:17:25 +0800") X-Mailer: WebService/1.1.19306 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:220293 Archived-At: --=-=-= Content-Type: text/plain Po Lu writes: > That makes sense, I'll modify the change in a bit to report scroll > deltas as a pair of (DELTA-X . DELTA-Y) instead. Here it is, and thanks in advance. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-Expose-pixel-wise-wheel-events-to-Lisp.patch >From aeb2a2bec3936ee2e9fb0b4a135e80474d360d99 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 16 Nov 2021 19:39:50 +0800 Subject: [PATCH 2/2] Expose pixel-wise wheel events to Lisp * doc/lispref/commands.texi (Misc Events): Document changes to wheel events. * src/keyboard.c (make_lispy_event): Handle wheel events with pixel delta data. * src/termhooks.h (WHEEL_EVENT): Document changes to WHEEL_EVENT args. * src/xfns.c (syms_of_xfns): Declare new symbols. * src/xterm.c (handle_one_xevent): Give wheel events pixel delta data. (x_coalesce_scroll_events): New user option. --- doc/lispref/commands.texi | 5 ++++- src/keyboard.c | 6 +++++- src/termhooks.h | 5 ++++- src/xfns.c | 1 + src/xterm.c | 41 ++++++++++++++++++++++++++++----------- 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 1509c200e0..a32548e9d5 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -1985,7 +1985,10 @@ Misc Events These kinds of event are generated by moving a mouse wheel. The @var{position} element is a mouse position list (@pxref{Click Events}), specifying the position of the mouse cursor when the event -occurred. +occurred. The event may have additional arguments after +@var{position}. The third argument after @var{position}, if present, +is a pair of the form @w{@code{(@var{x} . @var{y})}}, where @var{x} +and @var{y} are the number of pixels to scroll by in each axis. @vindex mouse-wheel-up-event @vindex mouse-wheel-down-event diff --git a/src/keyboard.c b/src/keyboard.c index c3bc8307d7..0c48790ce8 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -5980,7 +5980,11 @@ make_lispy_event (struct input_event *event) ASIZE (wheel_syms)); } - if (NUMBERP (event->arg)) + if (CONSP (event->arg)) + return list5 (head, position, make_fixnum (double_click_count), + XCAR (event->arg), Fcons (XCAR (XCDR (event->arg)), + XCAR (XCDR (XCDR (event->arg))))); + else if (NUMBERP (event->arg)) return list4 (head, position, make_fixnum (double_click_count), event->arg); else if (event->modifiers & (double_modifier | triple_modifier)) diff --git a/src/termhooks.h b/src/termhooks.h index e7539bbce2..b274be9e3c 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -119,7 +119,10 @@ #define EMACS_TERMHOOKS_H .timestamp gives a timestamp (in milliseconds) for the event. .arg may contain the number of - lines to scroll. */ + lines to scroll, or a list of + the form (NUMBER-OF-LINES . (X Y)) where + X and Y are the number of pixels + on each axis to scroll by. */ HORIZ_WHEEL_EVENT, /* A wheel event generated by a second horizontal wheel that is present on some mice. See WHEEL_EVENT. */ diff --git a/src/xfns.c b/src/xfns.c index b33b40b330..0ea43d1330 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -8085,6 +8085,7 @@ syms_of_xfns (void) #ifdef HAVE_XINPUT2 DEFSYM (Qxinput2, "xinput2"); + Fprovide (Qxinput2, Qnil); #endif diff --git a/src/xterm.c b/src/xterm.c index 63754a2cb6..b98b7d1889 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -556,6 +556,7 @@ xi_reset_scroll_valuators_for_device_id (struct x_display_info *dpyinfo, int id) { valuator = &device->valuators[i]; valuator->invalid_p = true; + valuator->emacs_value = 0.0; } return; @@ -9921,8 +9922,6 @@ handle_one_xevent (struct x_display_info *dpyinfo, #endif goto XI_OTHER; case XI_Motion: - /* First test if there is some kind of scroll event - here! */ states = &xev->valuators; values = states->values; @@ -9932,10 +9931,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, { if (XIMaskIsSet (states->mask, i)) { - block_input (); - struct xi_scroll_valuator_t *val; - double delta; + double delta, scroll_unit; delta = x_get_scroll_valuator_delta (dpyinfo, xev->deviceid, i, *values, &val); @@ -9943,6 +9940,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, if (delta != DBL_MAX) { f = mouse_or_wdesc_frame (dpyinfo, xev->event); + scroll_unit = pow (FRAME_PIXEL_HEIGHT (f), 2.0 / 3.0); found_valuator = true; if (signbit (delta) != signbit (val->emacs_value)) @@ -9950,15 +9948,16 @@ handle_one_xevent (struct x_display_info *dpyinfo, val->emacs_value += delta; + if (x_coalesce_scroll_events + && (fabs (val->emacs_value) < 1)) + continue; + if (!f) { f = x_any_window_to_frame (dpyinfo, xev->event); if (!f) - { - unblock_input (); - goto XI_OTHER; - } + goto XI_OTHER; } bool s = signbit (val->emacs_value); @@ -9975,13 +9974,26 @@ handle_one_xevent (struct x_display_info *dpyinfo, inev.ie.modifiers |= x_x_to_emacs_modifiers (dpyinfo, xev->mods.effective); - inev.ie.arg = Qnil; + + if (val->horizontal) + { + inev.ie.arg + = list3 (Qnil, + make_float (val->emacs_value + * scroll_unit), + make_float (0)); + } + else + { + inev.ie.arg = list3 (Qnil, make_float (0), + make_float (val->emacs_value + * scroll_unit)); + } kbd_buffer_store_event_hold (&inev.ie, hold_quit); val->emacs_value = 0; } - unblock_input (); values++; } @@ -15048,4 +15060,11 @@ syms_of_xterm (void) consuming frame position adjustments. In newer versions of GTK, Emacs always uses gtk_window_move and ignores the value of this variable. */); x_gtk_use_window_move = true; + + DEFVAR_BOOL ("x-coalesce-scroll-events", x_coalesce_scroll_events, + doc: /* Non-nil means to only send one wheel event for each scroll unit. +Otherwise, a wheel event will be sent every time the mouse wheel is +moved. This option is only effective when Emacs is built with XInput +2. */); + x_coalesce_scroll_events = true; } -- 2.31.1 --=-=-=--