From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tyler Grinn Newsgroups: gmane.emacs.bugs Subject: bug#57140: New user option mouse-wheel-text-scale-buffer Date: Thu, 11 Aug 2022 09:10:11 -0400 Message-ID: <871qtnudsc.fsf@gmail.com> 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="25157"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) To: 57140@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 11 15:36:59 2022 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 1oM8Mt-0006Lz-C8 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Aug 2022 15:36:59 +0200 Original-Received: from localhost ([::1]:34758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oM8Ms-0006XT-En for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Aug 2022 09:36:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM7xo-0004a1-18 for bug-gnu-emacs@gnu.org; Thu, 11 Aug 2022 09:11:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oM7xm-0002Om-CW for bug-gnu-emacs@gnu.org; Thu, 11 Aug 2022 09:11:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oM7xm-0005dB-5R for bug-gnu-emacs@gnu.org; Thu, 11 Aug 2022 09:11:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tyler Grinn Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Aug 2022 13:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57140 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.166022342321577 (code B ref -1); Thu, 11 Aug 2022 13:11:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Aug 2022 13:10:23 +0000 Original-Received: from localhost ([127.0.0.1]:52037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM7x9-0005bx-7D for submit@debbugs.gnu.org; Thu, 11 Aug 2022 09:10:23 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:39172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM7x6-0005bo-4S for submit@debbugs.gnu.org; Thu, 11 Aug 2022 09:10:21 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM7x4-0003PZ-9r for bug-gnu-emacs@gnu.org; Thu, 11 Aug 2022 09:10:19 -0400 Original-Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]:40914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oM7x1-0002FV-6L for bug-gnu-emacs@gnu.org; Thu, 11 Aug 2022 09:10:16 -0400 Original-Received: by mail-il1-x12c.google.com with SMTP id t15so9904740ilm.7 for ; Thu, 11 Aug 2022 06:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc; bh=UHLCJ/Hi8RvSWUoSaXHto6c9/oUTqwmzvkq7IxzwDX0=; b=gsdpgk5pF6ecVvl2lQ1e+uYANEqcMjjTU4BD4HppMtKlfKXqvyVPYUgaSYqNmFcLQo D8v+yRZuc5omJz5dK+L4N6pb68wlfaO4yR8rLCdqr2z7JRE0y/+cCyJQ1M/hoUn3K9Rh 5SXx63hOPMTc9Au5as265CCPv/FZKUtJW1DV2ePpMeElF5VJsrtnxHCqtMVT1KE7fX4i 6NZprh3lq+zB8tvUyzEBI7ZEvvxsw0mxaJZghA4oThEIdQBZSP1bfRg8pQg0Zn+vV9x/ PIRtPLp/+OT40fLR6ix9rIXffqPAVf+Mg2gzETbDJm10PuUO5VzPU8OiwaVmRS9487go gKuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc; bh=UHLCJ/Hi8RvSWUoSaXHto6c9/oUTqwmzvkq7IxzwDX0=; b=wrkH/UiNwVlkW+6BO5NWVxHobgBDPDPcmEJeHZA7uN1P3sbMbnJFNjYiVD3ywWZxuN hcvnTheTCIqKfHHcyaVi16h/1PDrfea2kabgoKBfSXjTPoFTosmudXaf+RfsWCxvU5x/ 7TUveqj6wKh3NODaOkaT9Vu+OkMPwuCp7sJTavAhPz4B4ygERXQFsfHkI99IdTujCkjd NdyO9oeoVwD2UuY3CYRKZFZs7GIX+O+Dl7lb6G9CyXCX2DoU59Ycu4kaTM1XRAwYfxw6 mYyzHfvcs1OB5P1/4+ai00rp6y3dpt2htshmrfREP3/320OQHWAk4tl2XBda/i9lFbcE d7BA== X-Gm-Message-State: ACgBeo0gOVQppc+XtGaToAZ7xLpKVkJJziRwoYbRohO8ZR4KAJf4raHi 8RF0BoHBQx6WpExC6jgoHheKE7g0GitCFg== X-Google-Smtp-Source: AA6agR4VDTgiB5OWjj54RfE7J56Cm8hbGY/bXYKUcT+xQ7FhikNrFSaLOqq+qLagjjBCsa0rOd1sAA== X-Received: by 2002:a05:6e02:1b8a:b0:2df:33d1:f85 with SMTP id h10-20020a056e021b8a00b002df33d10f85mr14742323ili.81.1660223413490; Thu, 11 Aug 2022 06:10:13 -0700 (PDT) Original-Received: from tyler-fedora ([107.181.195.249]) by smtp.gmail.com with ESMTPSA id c12-20020a02330c000000b00342a03e834esm7911034jae.3.2022.08.11.06.10.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 06:10:12 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::12c; envelope-from=tylergrinn@gmail.com; helo=mail-il1-x12c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:239353 Archived-At: --=-=-= Content-Type: text/plain By default, mouse-wheel-(global-)text-scale increases or decreases the text scale for every scroll event. I think it's a good idea to have an option to buffer that (is that the right word?) so you can more easily choose the text scale you want. I kept the default behavior intact. Best, Tyler --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-new-user-option-mouse-wheel-text-scale-buffer.patch Content-Description: mouse-wheel-text-scale-buffer >From 062db51e9f7faa341f92feff392a2c0109aa23dc Mon Sep 17 00:00:00 2001 From: Tyler Grinn Date: Wed, 10 Aug 2022 22:32:12 -0400 Subject: [PATCH] Add new user option mouse-wheel-text-scale-buffer * lisp/mwheel.el (mouse-wheel-text-scale-buffer): New user option. (mouse-wheel-text-scale): Use it. (mouse-wheel-global-text-scale): Use it. --- lisp/mwheel.el | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/lisp/mwheel.el b/lisp/mwheel.el index ba5255fc07..816398e063 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -214,6 +214,14 @@ mouse-wheel-flip-direction :type 'boolean :version "26.1") +(defcustom mouse-wheel-text-scale-buffer 0 + "Buffer this many mouse scroll events before changing text scale. +By default, every scroll event will trigger one text scale adjustment. +Increase this number to hinder text scale adjustments while scrolling." + :group 'mouse + :type 'number + :version "29.1") + (defun mwheel-event-button (event) (let ((x (event-basic-type event))) ;; Map mouse-wheel events to appropriate buttons @@ -424,6 +432,9 @@ mwheel-scroll (put 'mwheel-scroll 'scroll-command t) +(defvar mouse-wheel-text-scale-counter 0 + "Keeps track of how many mouse events since last text-scale.") + (defun mouse-wheel-text-scale (event) "Adjust font size of the default face according to EVENT. See also `text-scale-adjust'." @@ -435,10 +446,16 @@ mouse-wheel-text-scale (unwind-protect (cond ((memq button (list mouse-wheel-down-event mouse-wheel-down-alternate-event)) - (text-scale-increase 1)) + (setq mouse-wheel-text-scale-counter (1- mouse-wheel-text-scale-counter)) + (when (< mouse-wheel-text-scale-counter (- mouse-wheel-text-scale-buffer)) + (setq mouse-wheel-text-scale-counter 0) + (text-scale-increase 1))) ((memq button (list mouse-wheel-up-event mouse-wheel-up-alternate-event)) - (text-scale-decrease 1))) + (setq mouse-wheel-text-scale-counter (1+ mouse-wheel-text-scale-counter)) + (when (> mouse-wheel-text-scale-counter mouse-wheel-text-scale-buffer) + (setq mouse-wheel-text-scale-counter 0) + (text-scale-decrease 1)))) (select-window selected-window)))) (declare-function global-text-scale-adjust "face-remap.el" (increment)) @@ -450,10 +467,16 @@ mouse-wheel-global-text-scale (unwind-protect (cond ((memq button (list mouse-wheel-down-event mouse-wheel-down-alternate-event)) - (global-text-scale-adjust 1)) + (setq mouse-wheel-text-scale-counter (1- mouse-wheel-text-scale-counter)) + (when (<= mouse-wheel-text-scale-counter (- mouse-wheel-text-scale-buffer)) + (setq mouse-wheel-text-scale-counter 0) + (global-text-scale-adjust 1))) ((memq button (list mouse-wheel-up-event mouse-wheel-up-alternate-event)) - (global-text-scale-adjust -1)))))) + (setq mouse-wheel-text-scale-counter (1+ mouse-wheel-text-scale-counter)) + (when (>= mouse-wheel-text-scale-counter mouse-wheel-text-scale-buffer) + (setq mouse-wheel-text-scale-counter 0) + (global-text-scale-adjust -1))))))) (defun mouse-wheel--add-binding (key fun) "Bind mouse wheel button KEY to function FUN. -- 2.37.1 --=-=-=--