From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#57639: [PATCH] Add new command 'toggle-theme' Date: Sun, 11 Sep 2022 18:47:40 +0000 Message-ID: <8735cxpx2r.fsf@posteo.net> References: <875yhzmz25.fsf@posteo.net> <875yhzmj50.fsf@gnus.org> <875yhzl3a1.fsf@posteo.net> <87fsh25bso.fsf@gnus.org> <871qsil3jm.fsf@posteo.net> <87fsgygo7c.fsf@gnus.org> <87a676jfx2.fsf@posteo.net> <87bkrmdt46.fsf@gnus.org> 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="14773"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 57639@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 11 20:49:12 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 1oXS11-0003co-3K for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 11 Sep 2022 20:49:11 +0200 Original-Received: from localhost ([::1]:53256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXS0z-0004jz-Mw for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 11 Sep 2022 14:49:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXS0s-0004hi-FN for bug-gnu-emacs@gnu.org; Sun, 11 Sep 2022 14:49:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXS0s-0007GR-6N for bug-gnu-emacs@gnu.org; Sun, 11 Sep 2022 14:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXS0r-0002Su-PW for bug-gnu-emacs@gnu.org; Sun, 11 Sep 2022 14:49:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 11 Sep 2022 18:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57639 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 57639-submit@debbugs.gnu.org id=B57639.16629220879409 (code B ref 57639); Sun, 11 Sep 2022 18:49:01 +0000 Original-Received: (at 57639) by debbugs.gnu.org; 11 Sep 2022 18:48:07 +0000 Original-Received: from localhost ([127.0.0.1]:43514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXRzy-0002Rg-Q7 for submit@debbugs.gnu.org; Sun, 11 Sep 2022 14:48:07 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:38131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXRzv-0002R1-9e for 57639@debbugs.gnu.org; Sun, 11 Sep 2022 14:48:05 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 29C26240105 for <57639@debbugs.gnu.org>; Sun, 11 Sep 2022 20:47:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1662922077; bh=UrVLAVKhSM84dg7BuA3dXlfEvNGua7IaTNwCuSZSRkg=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=DzAQKJtNEwUSBhchU+gDZ7XfTlrZnMtibnCDAFpLf//zv1oO5pmd6w8UXGmXd7z0L uEgPYyYyhxDeOC5QNHu+a5bqBY8ALOXWhPB08ofjZUHsHvcftb/zn0z8vnTIGOHZqt h+6zJIPVhwFvQwsPd0udYn8MUWnsIaTSA2mWjb1moi3cANQ6XEAbQjUnCnUEIrKelT kcoWEzzqzka8l/5h2D8sv29WWfmmOO7XCPMv0+osV7ZnLjsdtFW3EHLFiKStEGGgd2 N4l7H26eMaop+SL9mLK3CT2ABcP8uBl7TC9MkMWOt2OwDUTqHW0b53VppHanBIatMp CR4wvI1IReILw== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MQdyf0N5zz6tpF; Sun, 11 Sep 2022 20:47:51 +0200 (CEST) In-Reply-To: <87bkrmdt46.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 11 Sep 2022 13:54:01 +0200") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB 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:242197 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Lars Ingebrigtsen writes: > Philip Kaludercic writes: > >>> Code exists for both Windows and Macos in the bug tracker somewhere, but >>> haven't been integrated yet because nobody has sat down to make a >>> consistent interface across all the platforms. >> >> What about GNU/Linux desktops? > > I thought we already had support for this under Gtk? But I may be > misremembering. Am I reading it correctly that `style_changed_cb' in gtkutils.c would be a place to start looking for this functionality? >> Stefans Gruvbox example had multiple dark and light variants. E.g. >> Would the new command toggle from `gruvbox-dark-soft' to >> `gruvbox-dark-light' or prompt the user to select from all the gruvbox >> themes? > > Yes, but if you have the soft gruvbox active, you don't want to switch > to the hard one when changing between dark/light, so there's no ambiguity. So would gruvbox-soft-dark have all the other themes as variants or only gruvbox-soft-dark?=20=20 >>> But now I see that you've pushed `toggle-theme'... *sigh* >> >> I'm very sorry about that, I've reverted those commits, since they were >> accidentally pushed! > > *phew* Thanks. =F0=9F=98=80 Here is an updated version: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-new-command-theme-choose-variant.patch >From 1c9f1d92d0ecc4c7b94772e3a15ebf5e577a7f3d Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Tue, 6 Sep 2022 20:53:35 +0200 Subject: [PATCH] Add new command 'theme-choose-variant' * doc/emacs/custom.texi (Custom Themes): Mention it. * etc/themes/leuven-dark-theme.el (leuven-dark): Add dual theme. * etc/themes/leuven-theme.el (leuven): Add dual theme. * etc/themes/tango-dark-theme.el (tango-dark): Add dual theme. * etc/themes/tango-theme.el (tango): Add dual theme. * etc/themes/tsdh-dark-theme.el (tsdh-dark): Add dual theme. * etc/themes/tsdh-light-theme.el (tsdh-light): Add dual theme. * lisp/cus-theme.el (describe-theme-1): Say if a theme has a dual. * lisp/custom.el (theme-choose-variant): Add new command. (toggle-theme): Add an alias. (Bug#57639) --- doc/emacs/custom.texi | 8 ++++++++ etc/themes/leuven-dark-theme.el | 4 +++- etc/themes/leuven-theme.el | 4 +++- etc/themes/tango-dark-theme.el | 2 ++ etc/themes/tango-theme.el | 2 ++ etc/themes/tsdh-dark-theme.el | 2 ++ etc/themes/tsdh-light-theme.el | 2 ++ lisp/cus-theme.el | 5 +++++ lisp/custom.el | 27 +++++++++++++++++++++++++++ 9 files changed, 54 insertions(+), 2 deletions(-) diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index ff7ab83190..f86c7e2dd9 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -667,6 +667,14 @@ Custom Themes the @file{*Custom Themes*} buffer; or type @kbd{M-x describe-theme} anywhere in Emacs and enter the theme name. +@findex theme-choose-variant + Some themes have variants (most often these are light and dark +pairs). You can switch between these by typing @kbd{M-x +theme-choose-variant}. Note that this only works if only one theme is +active. If a theme has only one alternative, it will toggle +automatically. If there are more of them, it will query which one to +use. + @node Creating Custom Themes @subsection Creating Custom Themes @cindex custom themes, creating diff --git a/etc/themes/leuven-dark-theme.el b/etc/themes/leuven-dark-theme.el index 0e162c8bab..dfcd64a11c 100644 --- a/etc/themes/leuven-dark-theme.el +++ b/etc/themes/leuven-dark-theme.el @@ -5,7 +5,7 @@ ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> ;; Contributor: Thibault Polge <(concat "thibault" at-sign "thb.lt")> ;; URL: https://github.com/fniessen/emacs-leuven-dark-theme -;; Version: 20220202.1126 +;; Version: 20220911.1858 ;; Keywords: color theme ;; This file is part of GNU Emacs. @@ -1083,6 +1083,8 @@ leuven-dark (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) +(put 'leuven-dark 'theme-variants 'leuven) ;see `toggle-theme' + (provide-theme 'leuven-dark) ;; This is for the sake of Emacs. diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el index d9a8d5391a..66a65bc0b3 100644 --- a/etc/themes/leuven-theme.el +++ b/etc/themes/leuven-theme.el @@ -4,7 +4,7 @@ ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> ;; URL: https://github.com/fniessen/emacs-leuven-theme -;; Version: 20200513.1928 +;; Version: 20220911.1858 ;; Keywords: color theme ;; This file is part of GNU Emacs. @@ -1065,6 +1065,8 @@ leuven (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) +(put 'leuven 'theme-variants 'leuven-dark) ;see `toggle-theme' + (provide-theme 'leuven) ;; This is for the sake of Emacs. diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el index ef00d2ac49..81b7cbde13 100644 --- a/etc/themes/tango-dark-theme.el +++ b/etc/themes/tango-dark-theme.el @@ -190,6 +190,8 @@ tango-dark `(ansi-color-bright-white ((,class (:background ,alum-1 :foreground ,alum-1)))))) +(put 'tango-dark 'theme-variants 'tango) ;see `toggle-theme' + (provide-theme 'tango-dark) ;;; tango-dark-theme.el ends here diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el index ecbbf03753..7f53a5cce2 100644 --- a/etc/themes/tango-theme.el +++ b/etc/themes/tango-theme.el @@ -173,6 +173,8 @@ tango `(ansi-color-bright-white ((,class (:background ,alum-1 :foreground ,alum-1)))))) +(put 'tango 'theme-variants 'tango-dark) ;see `toggle-theme' + (provide-theme 'tango) ;;; tango-theme.el ends here diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el index a88ad75520..aef8cae3e0 100644 --- a/etc/themes/tsdh-dark-theme.el +++ b/etc/themes/tsdh-dark-theme.el @@ -142,6 +142,8 @@ tsdh-dark '(widget-field ((t (:box (:line-width 2 :color "grey75" :style pressed-button))))) '(window-number-face ((t (:foreground "red" :weight bold))))) +(put 'tsdh-dark 'theme-variants 'tsdh-light) ;see `toggle-theme' + (provide-theme 'tsdh-dark) ;;; tsdh-dark-theme.el ends here diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el index d9d09b702b..d0f11f272b 100644 --- a/etc/themes/tsdh-light-theme.el +++ b/etc/themes/tsdh-light-theme.el @@ -104,6 +104,8 @@ tsdh-light '(show-paren-mismatch ((t (:background "deep pink" :weight bold)))) '(window-number-face ((t (:foreground "red" :weight bold))))) +(put 'tsdh-light 'theme-variants 'tsdh-dark) ;see `toggle-theme' + (provide-theme 'tsdh-light) ;;; tsdh-light-theme.el ends here diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index 90680ff68f..dcd562c6af 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -515,6 +515,11 @@ describe-theme-1 (end-of-file nil))))) (and (eq (car-safe sexp) 'deftheme) (setq doc (nth 2 sexp))))))) + (when-let ((variants (get theme 'theme-variants))) + (princ (concat " Variants of this theme are " + (mapconcat + (lambda (th) (concat "`" th "'")) + variants ", ")))) (princ "\n\nDocumentation:\n") (princ (if (stringp doc) (substitute-command-keys doc) diff --git a/lisp/custom.el b/lisp/custom.el index 352b5b0e16..58f8d05ec6 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -1372,6 +1372,33 @@ load-theme (enable-theme theme)) t) +(defun theme-choose-variant (&optional no-confirm no-enable) + "Toggle the current active theme by enabling its dual pair. +The current theme will be immediately disabled before the dual +theme has been enabled. If THEME is not active an error will be +raised. If theme is nil For NO-CONFIRM and NO-ENABLE, see +`load-theme'." + (interactive) + (cond + ((length= custom-enabled-themes 0) + (user-error "No theme is active, cannot toggle")) + ((length> custom-enabled-themes 1) + (user-error "More than one theme active, cannot unambiguously toggle"))) + (let ((theme (car custom-enabled-themes)) variants) + (dolist (variant (ensure-list (get theme 'theme-variants))) + (when (and (custom-theme-p theme) (not (eq variant theme))) + (push variant variants))) + (let ((choice (cond + ((null variants) + (error "`%s' has no variants" theme)) + ((length= variants 1) + (car variants)) + ((intern (completing-read "Load custom theme: " variants)))))) + (disable-theme theme) + (load-theme choice no-confirm no-enable)))) + +(defalias 'toggle-theme #'theme-choose-variant) + (defun custom-theme-load-confirm (hash) "Query the user about loading a Custom theme that may not be safe. The theme should be in the current buffer. If the user agrees, -- 2.37.3 --=-=-=--