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.devel Subject: New user option mouse-wheel-text-scale-buffer Date: Wed, 10 Aug 2022 23:24:52 -0400 Message-ID: <87a68bv4vv.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="39433"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Aug 11 05:25:54 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oLypW-000A2e-LX for ged-emacs-devel@m.gmane-mx.org; Thu, 11 Aug 2022 05:25:54 +0200 Original-Received: from localhost ([::1]:50802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLypV-0000gi-Nq for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Aug 2022 23:25:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLyob-0008Rg-Ki for emacs-devel@gnu.org; Wed, 10 Aug 2022 23:24:57 -0400 Original-Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]:42758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLyoZ-00087Y-Tr for emacs-devel@gnu.org; Wed, 10 Aug 2022 23:24:57 -0400 Original-Received: by mail-il1-x130.google.com with SMTP id b12so9344521ils.9 for ; Wed, 10 Aug 2022 20:24:55 -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=+YXRAZD2PV3kQUMepcoOTpLLcnFLBpHwcO73ei1NUc8=; b=BGqK1JFAC63NchNsxYiWK+1xweiw3XXJwBLMpdP6e0t5SoOVz7KFOQbSw8E4Mc9qk4 87XDeh1xZG3SfAC61wp/7Y3IsPdVjdlzzSSwlHkba8jRElU3DogpEyvKF5tXFd9MxtvP xN+wdVw7KMgBIrhxYpKBcu0j4cMY6OR2vsSgnwGP91OqZjOf1sYqKnQrOWuSvI+vDy+k 8EuovSE7ObJ5AMEPQCZ/it35pR9K0aLyhn6sUXsYQVS1gGHQGW2C84vm44294b+b3XbD XCbNJiEddSBIJzxBbyCWpTV4kfWD3etUWfk1h5AuXESjgbrHykEwKynRn3ubiPixIg3q JLZQ== 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=+YXRAZD2PV3kQUMepcoOTpLLcnFLBpHwcO73ei1NUc8=; b=2idVVeCq243n/5e90tEybMfd4wfLnJDZl7F33lsDh530ZUAbRoxbS06uROCpgJkrAg 3e+KHLxy+KPr3DvP4a8q6O1QYu9EYaUlG9kvekpcuSVnrh0rXL526PHcTfKEYkG7QZFs INcyZ2MC62l3P6/BqCg8j9W5YAlZ0bmX5B2KfgxGnkTv9L/daHzVnn4qlXPWHMkWS1/x /vKEnezH+St3uDBl0S3I1A72JbMasE9zzE4pPvzG6srXhgsZAg++gep6VzZJlXt/SIL9 L71VCZ9hKFz0k7jDygsJiCUES2xq6gzLqD9zgjcqszhE5h4ecLAJEBq6FH8jnt4m1hkR YmfA== X-Gm-Message-State: ACgBeo13yXvVIPNcbtACu3Z4pOQiyKCa0fXbORlHnAsqPw3/sEVNxn51 KZaURkpVT416L2F5el/PL2z1c9j/oExO+A== X-Google-Smtp-Source: AA6agR4keEeLQEJ0sl0y88ZDoD661h1O3BhjiY5UVEAf9EVqEPTMTfOwHwhWjXLeo2zHBrdTq0Yf5A== X-Received: by 2002:a92:d10b:0:b0:2e2:be22:8da8 with SMTP id a11-20020a92d10b000000b002e2be228da8mr33340ilb.85.1660188293954; Wed, 10 Aug 2022 20:24:53 -0700 (PDT) Original-Received: from tyler-fedora ([107.181.195.249]) by smtp.gmail.com with ESMTPSA id n23-20020a02a197000000b0034287949de5sm8149870jah.148.2022.08.10.20.24.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 20:24:53 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::130; envelope-from=tylergrinn@gmail.com; helo=mail-il1-x130.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: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:293369 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 6f8b8dda65038bb66ede2097b8b7bc34b7f1130d 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..506eccaaed 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 1 + "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 --=-=-=--