Subject: [PATCH] Fix flymake mode line scrolling with pixel-scroll-precision-mode
From: [email-masked]
To: [email-masked]
Date: Sun, 02 Jul 2023 21:51:01 +0000 (UTC)
List-Id: <debbugs-submit.debbugs.gnu.org>

Tags: patch

This patch is based on the patch in bug#64425 (since I noticed this
unrelated issue while working on that, and they touch the same code).

When pixel-scroll-precision-mode is enabled, scrolling the mouse wheel
will yield wheel-{up,down} events.  flymake now binds the new events
in addition to the old mouse-wheel-{up,down}-event.

* lisp/progmodes/flymake.el:(flymake--mode-line-counter-scroll-prev,
flymake--mode-line-counter-scroll-next,
flymake--mode-line-counter-map): Add.
(flymake--mode-line-counter): Use new keymap and include 'type as a
property in the mode-line.

In GNU Emacs 29.0.92 (build 8, x86_64-pc-linux-gnu, X toolkit, cairo
 version 1.16.0, Xaw3d scroll bars) of 2023-07-02 built on earth
Repository revision: c361966508e2da159b5e65c37dff7f78e87b3445
Repository branch: emacs-29
Windowing system distributor 'The X.Org Foundation', version 11.0.12101008
System Description: NixOS 23.05 (Stoat)

Configured using:
 'configure --with-x-toolkit=lucid --with-tree-sitter --with-xinput2'

From ead790ca0525472ed52314b8bab67e7d246cda4e Mon Sep 17 00:00:00 2001
From: Spencer Baugh <[email-masked]>
Date: Sun, 2 Jul 2023 17:49:23 -0400
Subject: [PATCH] Fix flymake mode line scrolling with
 pixel-scroll-precision-mode

When pixel-scroll-precision-mode is enabled, scrolling the mouse wheel
will yield wheel-{up,down} events.  flymake now binds the new events
in addition to the old mouse-wheel-{up,down}-event.

* lisp/progmodes/flymake.el:(flymake--mode-line-counter-scroll-prev,
flymake--mode-line-counter-scroll-next,
flymake--mode-line-counter-map): Add.
(flymake--mode-line-counter): Use new keymap and include 'type as a
property in the mode-line.
---
 lisp/progmodes/flymake.el | 43 +++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 47dc32f9245..a424b0b6c8d 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1449,6 +1449,32 @@ flymake--mode-line-exception
 (defun flymake--mode-line-counters ()
   (when (flymake-running-backends) flymake-mode-line-counter-format))
 
+(defun flymake--mode-line-counter-scroll-prev (event)
+  (interactive "e")
+  (let* ((posn-string (posn-string (event-start event)))
+         (type (get-text-property (cdr posn-string) 'type (car posn-string))))
+    (with-selected-window (posn-window (event-start event))
+      (flymake-goto-prev-error 1 (list type) t))))
+
+(defun flymake--mode-line-counter-scroll-next (event)
+  (interactive "e")
+  (let* ((posn-string (posn-string (event-start event)))
+         (type (get-text-property (cdr posn-string) 'type (car posn-string))))
+    (with-selected-window (posn-window (event-start event))
+      (flymake-goto-next-error 1 (list type) t))))
+
+(setq flymake--mode-line-counter-map
+      (let ((map (make-sparse-keymap)))
+        (define-key map (vector 'mode-line mouse-wheel-down-event)
+                    #'flymake--mode-line-counter-scroll-prev)
+        (define-key map [mode-line wheel-down]
+                    #'flymake--mode-line-counter-scroll-prev)
+        (define-key map (vector 'mode-line mouse-wheel-up-event)
+                    #'flymake--mode-line-counter-scroll-next)
+        (define-key map [mode-line wheel-up]
+                    #'flymake--mode-line-counter-scroll-next)
+        map))
+
 (defun flymake--mode-line-counter (type &optional no-space)
   "Compute number of diagnostics in buffer with TYPE's severity.
 TYPE is usually keyword `:error', `:warning' or `:note'."
@@ -1479,21 +1505,8 @@ flymake--mode-line-counter
                              ((eq type :warning) "warnings")
                              ((eq type :note) "notes")
                              (t (format "%s diagnostics" type))))
-         keymap
-         ,(let ((map (make-sparse-keymap)))
-            (define-key map (vector 'mode-line
-                                    mouse-wheel-down-event)
-              (lambda (event)
-                (interactive "e")
-                (with-selected-window (posn-window (event-start event))
-                  (flymake-goto-prev-error 1 (list type) t))))
-            (define-key map (vector 'mode-line
-                                    mouse-wheel-up-event)
-              (lambda (event)
-                (interactive "e")
-                (with-selected-window (posn-window (event-start event))
-                  (flymake-goto-next-error 1 (list type) t))))
-            map))))))
+         type ,type
+         keymap ,flymake--mode-line-counter-map)))))
 
 ;;; Per-buffer diagnostic listing
 
-- 
2.41.0