[Themes] Lay the groundwork for theme support.

Alexander-Miller · Jun 18, 2019 · 4bd9421 · 4bd9421
1 parent 0273e0a
commit 4bd9421
Show file tree

Hide file tree

Showing 82 changed files with 287 additions and 306 deletions.
diff --git a/icons/asciidoc.png → icons/default/asciidoc.png b/icons/asciidoc.png → icons/default/asciidoc.png
diff --git a/icons/default/buffer-group-closed.png b/icons/default/buffer-group-closed.png
diff --git a/icons/default/buffer-group-open.png b/icons/default/buffer-group-open.png
diff --git a/icons/c.png → icons/default/c.png b/icons/c.png → icons/default/c.png
diff --git a/icons/clojure.png → icons/default/clojure.png b/icons/clojure.png → icons/default/clojure.png
diff --git a/icons/conf.png → icons/default/conf.png b/icons/conf.png → icons/default/conf.png
diff --git a/icons/cpp.png → icons/default/cpp.png b/icons/cpp.png → icons/default/cpp.png
diff --git a/icons/css.png → icons/default/css.png b/icons/css.png → icons/default/css.png
diff --git a/icons/dart.png → icons/default/dart.png b/icons/dart.png → icons/default/dart.png
diff --git a/icons/dir_closed.png → icons/default/dir-closed.png b/icons/dir_closed.png → icons/default/dir-closed.png
diff --git a/icons/dir_open.png → icons/default/dir-open.png b/icons/dir_open.png → icons/default/dir-open.png
diff --git a/icons/docker.png → icons/default/docker.png b/icons/docker.png → icons/default/docker.png
diff --git a/icons/elixir_light.png → icons/default/elx-light.png b/icons/elixir_light.png → icons/default/elx-light.png
diff --git a/icons/elixir.png → icons/default/elx.png b/icons/elixir.png → icons/default/elx.png
diff --git a/icons/emacs.png → icons/default/emacs.png b/icons/emacs.png → icons/default/emacs.png
diff --git a/icons/error.png → icons/default/error.png b/icons/error.png → icons/default/error.png
diff --git a/icons/git.png → icons/default/git.png b/icons/git.png → icons/default/git.png
diff --git a/icons/go.png → icons/default/go.png b/icons/go.png → icons/default/go.png
diff --git a/icons/haskell.png → icons/default/haskell.png b/icons/haskell.png → icons/default/haskell.png
diff --git a/icons/html.png → icons/default/html.png b/icons/html.png → icons/default/html.png
diff --git a/icons/hy.png → icons/default/hy.png b/icons/hy.png → icons/default/hy.png
diff --git a/icons/image.png → icons/default/image.png b/icons/image.png → icons/default/image.png
diff --git a/icons/info.png → icons/default/info.png b/icons/info.png → icons/default/info.png
diff --git a/icons/java.png → icons/default/java.png b/icons/java.png → icons/default/java.png
diff --git a/icons/jinja2.png → icons/default/jinja2.png b/icons/jinja2.png → icons/default/jinja2.png
diff --git a/icons/js.png → icons/default/js.png b/icons/js.png → icons/default/js.png
diff --git a/icons/json.png → icons/default/json.png b/icons/json.png → icons/default/json.png
diff --git a/icons/julia.png → icons/default/julia.png b/icons/julia.png → icons/default/julia.png
diff --git a/icons/kotlin.png → icons/default/kotlin.png b/icons/kotlin.png → icons/default/kotlin.png
diff --git a/icons/ledger.png → icons/default/ledger.png b/icons/ledger.png → icons/default/ledger.png
diff --git a/icons/markdown.png → icons/default/markdown.png b/icons/markdown.png → icons/default/markdown.png
diff --git a/icons/ocaml.png → icons/default/ocaml.png b/icons/ocaml.png → icons/default/ocaml.png
diff --git a/icons/pdf.png → icons/default/pdf.png b/icons/pdf.png → icons/default/pdf.png
diff --git a/icons/puppet.png → icons/default/puppet.png b/icons/puppet.png → icons/default/puppet.png
diff --git a/icons/python.png → icons/default/python.png b/icons/python.png → icons/default/python.png
diff --git a/icons/racket.png → icons/default/racket.png b/icons/racket.png → icons/default/racket.png
diff --git a/icons/root.png → icons/default/root.png b/icons/root.png → icons/default/root.png
diff --git a/icons/rust.png → icons/default/rust.png b/icons/rust.png → icons/default/rust.png
diff --git a/icons/sbt.png → icons/default/sbt.png b/icons/sbt.png → icons/default/sbt.png
diff --git a/icons/scala.png → icons/default/scala.png b/icons/scala.png → icons/default/scala.png
diff --git a/icons/shell.png → icons/default/shell.png b/icons/shell.png → icons/default/shell.png
diff --git a/icons/tags-closed.png → icons/default/tags-closed.png b/icons/tags-closed.png → icons/default/tags-closed.png
diff --git a/icons/tags-leaf.png → icons/default/tags-leaf.png b/icons/tags-leaf.png → icons/default/tags-leaf.png
diff --git a/icons/tags-open.png → icons/default/tags-open.png b/icons/tags-open.png → icons/default/tags-open.png
diff --git a/icons/tex.png → icons/default/tex.png b/icons/tex.png → icons/default/tex.png
diff --git a/icons/typescript.png → icons/default/ts.png b/icons/typescript.png → icons/default/ts.png
diff --git a/icons/txt.png → icons/default/txt.png b/icons/txt.png → icons/default/txt.png
diff --git a/icons/vagrant.png → icons/default/vagrant.png b/icons/vagrant.png → icons/default/vagrant.png
diff --git a/icons/video.png → icons/default/video.png b/icons/video.png → icons/default/video.png
diff --git a/icons/vsc/README.txt → icons/default/vsc/README.txt b/icons/vsc/README.txt → icons/default/vsc/README.txt
diff --git a/icons/vsc/binary.png → icons/default/vsc/binary.png b/icons/vsc/binary.png → icons/default/vsc/binary.png
diff --git a/icons/vsc/dependencies.png → icons/default/vsc/deps.png b/icons/vsc/dependencies.png → icons/default/vsc/deps.png
diff --git a/icons/vsc/elm.png → icons/default/vsc/elm.png b/icons/vsc/elm.png → icons/default/vsc/elm.png
diff --git a/icons/vsc/elx.png → icons/default/vsc/elx.png b/icons/vsc/elx.png → icons/default/vsc/elx.png
diff --git a/icons/vsc/license.png → icons/default/vsc/license.png b/icons/vsc/license.png → icons/default/vsc/license.png
diff --git a/icons/vsc/lisp.png → icons/default/vsc/lisp.png b/icons/vsc/lisp.png → icons/default/vsc/lisp.png
diff --git a/icons/vsc/log.png → icons/default/vsc/log.png b/icons/vsc/log.png → icons/default/vsc/log.png
diff --git a/icons/vsc/lua.png → icons/default/vsc/lua.png b/icons/vsc/lua.png → icons/default/vsc/lua.png
diff --git a/icons/vsc/makefile.png → icons/default/vsc/make.png b/icons/vsc/makefile.png → icons/default/vsc/make.png
diff --git a/icons/vsc/nim.png → icons/default/vsc/nim.png b/icons/vsc/nim.png → icons/default/vsc/nim.png
diff --git a/icons/vsc/org.png → icons/default/vsc/org.png b/icons/vsc/org.png → icons/default/vsc/org.png
diff --git a/icons/vsc/perl.png → icons/default/vsc/perl.png b/icons/vsc/perl.png → icons/default/vsc/perl.png
diff --git a/icons/vsc/r.png → icons/default/vsc/r.png b/icons/vsc/r.png → icons/default/vsc/r.png
diff --git a/icons/vsc/reason.png → icons/default/vsc/reason.png b/icons/vsc/reason.png → icons/default/vsc/reason.png
diff --git a/icons/vsc/ruby.png → icons/default/vsc/ruby.png b/icons/vsc/ruby.png → icons/default/vsc/ruby.png
diff --git a/icons/vsc/scss.png → icons/default/vsc/scss.png b/icons/vsc/scss.png → icons/default/vsc/scss.png
diff --git a/icons/vsc/sql.png → icons/default/vsc/sql.png b/icons/vsc/sql.png → icons/default/vsc/sql.png
diff --git a/icons/vsc/toml.png → icons/default/vsc/toml.png b/icons/vsc/toml.png → icons/default/vsc/toml.png
diff --git a/icons/vsc/vim.png → icons/default/vsc/vim.png b/icons/vsc/vim.png → icons/default/vsc/vim.png
diff --git a/icons/vsc/xml.png → icons/default/vsc/xml.png b/icons/vsc/xml.png → icons/default/vsc/xml.png
diff --git a/icons/vsc/zip.png → icons/default/vsc/zip.png b/icons/vsc/zip.png → icons/default/vsc/zip.png
diff --git a/icons/vue.png → icons/default/vue.png b/icons/vue.png → icons/default/vue.png
diff --git a/icons/warning.png → icons/default/warning.png b/icons/warning.png → icons/default/warning.png
diff --git a/icons/yaml.png → icons/default/yaml.png b/icons/yaml.png → icons/default/yaml.png
diff --git a/src/elisp/treemacs-icons.el b/src/elisp/treemacs-icons.el
diff --git a/src/elisp/treemacs-mode.el b/src/elisp/treemacs-mode.el
@@ -402,8 +402,9 @@ Will simply return `treemacs--eldoc-msg'."
   (add-to-list 'delete-frame-functions #'treemacs--on-frame-kill)
   (add-hook 'post-command-hook #'treemacs--post-command nil t)
 
+
   (treemacs--build-indentation-cache 6)
-  (treemacs--adjust-icons-to-window-system)
+  (treemacs--select-icon-set)
   (treemacs--setup-icon-highlight)
   (treemacs--setup-icon-background-colors)
   (treemacs--setup-mode-line)

diff --git a/src/elisp/treemacs-rendering.el b/src/elisp/treemacs-rendering.el
@@ -360,7 +360,7 @@ set to PARENT."
          (setq dir-strings
                (treemacs--create-buttons
                 :nodes dirs
-                :extra-vars ((dir-prefix (concat prefix treemacs-icon-closed)))
+                :extra-vars ((dir-prefix (concat prefix treemacs-icon-dir-closed)))
                 :depth ,depth
                 :node-name node
                 :node-action (treemacs--create-dir-button-strings node dir-prefix ,parent ,depth)))
@@ -529,7 +529,7 @@ RECURSIVE: Bool"
        :immediate-insert nil
        :button btn
        :new-state 'dir-node-open
-       :new-icon treemacs-icon-open
+       :new-icon treemacs-icon-dir-open
        :open-action
        (progn
          ;; do on-expand first so buttons that need collapsing can quickly find their parent
@@ -552,7 +552,7 @@ Remove all open dir and tag entries under BTN when RECURSIVE."
   (treemacs--button-close
    :button btn
    :new-state 'dir-node-closed
-   :new-icon treemacs-icon-closed
+   :new-icon treemacs-icon-dir-closed
    :post-close-action
    (-let [path (treemacs-button-get btn :path)]
      (treemacs--stop-watching path)

diff --git a/src/elisp/treemacs-tags.el b/src/elisp/treemacs-tags.el
@@ -185,7 +185,7 @@ Recursively open all tags below BTN when RECURSIVE is non-nil."
          :open-action (treemacs--create-buttons
                        :nodes index
                        :extra-vars
-                       ((node-prefix (concat prefix treemacs-icon-tag-node-closed))
+                       ((node-prefix (concat prefix treemacs-icon-tag-closed))
                         (leaf-prefix (concat prefix treemacs-icon-tag-leaf)))
                        :depth (1+ (treemacs-button-get btn :depth))
                        :node-name item
@@ -283,13 +283,13 @@ Open all tag section under BTN when call is RECURSIVE."
      :button btn
      :immediate-insert t
      :new-state 'tag-node-open
-     :new-icon treemacs-icon-tag-node-open
+     :new-icon treemacs-icon-tag-open
      :open-action (treemacs--create-buttons
                    :nodes index
                    :depth (1+ (treemacs-button-get btn :depth))
                    :node-name item
                    :extra-vars ((leaf-prefix (concat prefix treemacs-icon-tag-leaf))
-                                (node-prefix (concat prefix treemacs-icon-tag-node-closed)))
+                                (node-prefix (concat prefix treemacs-icon-tag-closed)))
                    :node-action (if (imenu--subalist-p item)
                                     (treemacs--insert-tag-node item node-prefix btn depth)
                                   (treemacs--insert-tag-leaf item leaf-prefix btn depth)))
@@ -328,7 +328,7 @@ Remove all open tag entries under BTN when RECURSIVE."
     (treemacs--button-close
      :button btn
      :new-state 'tag-node-closed
-     :new-icon treemacs-icon-tag-node-closed
+     :new-icon treemacs-icon-tag-closed
      :post-close-action
      (treemacs-on-collapse (treemacs--tags-path-of btn)))))
 

diff --git a/src/elisp/treemacs-themes.el b/src/elisp/treemacs-themes.el
@@ -0,0 +1,80 @@
+;;; treemacs.el --- A tree style file viewer package -*- lexical-binding: t -*-
+
+;; Copyright (C) 2018 Alexander Miller
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;; Definitions for the theme type, their creation, and, eventually, the means
+;;; to change themes.
+
+;;; Code:
+
+(require 'f)
+(require 'dash)
+(require 'ht)
+(require 'cl-lib)
+(require 'inline)
+(require 'treemacs-macros)
+(require 'treemacs-core-utils)
+
+(treemacs--defstruct treemacs-theme
+  name path gui-icons tui-icons)
+
+(defvar treemacs--current-theme nil "The currently used theme.")
+
+(defvar treemacs--themes nil "List of all known themes.")
+
+(define-inline treemacs--find-theme (name)
+  "Find theme with the given NAME."
+  (declare (side-effect-free t))
+  (inline-letevals (name)
+    (inline-quote
+     (--first (string= (treemacs-theme->name it) ,name) treemacs--themes))))
+
+(cl-defmacro treemacs-create-theme (name &key icon-directory extends config)
+  "Create a new (bare) theme with the given NAME.
+- ICON-DIRECTORY is the (mandatory) theme's location.
+- BASED-ON is the name of a theme whose icons this one should start with.
+- CONFIG is a code block to fill the created theme with icons via
+  `treemacs-create-icon'."
+  (declare (indent 1))
+  `(let* ((gui-icons (make-hash-table :size 300 :test 'equal))
+          (tui-icons (make-hash-table :size 300 :test 'equal))
+          (theme (make-treemacs-theme
+                  :name ,name
+                  :path ,icon-directory
+                  :gui-icons gui-icons
+                  :tui-icons tui-icons)))
+     (add-to-list 'treemacs--themes theme)
+     (when ,extends
+       (treemacs-unless-let (base-theme (treemacs--find-theme ,extends))
+           (treemacs-log "Could not find base theme %s when creating theme %s." ,extends ,name)
+         (treemacs--maphash (treemacs-theme->gui-icons base-theme) (ext icon)
+           (ht-set! gui-icons ext icon))
+         (treemacs--maphash (treemacs-theme->tui-icons base-theme) (ext icon)
+           (ht-set! tui-icons ext icon))))
+     (-let [treemacs--current-theme theme]
+       ,config)
+     theme))
+
+(defun treemacs-load-theme (name)
+  "Enable the theme with the given NAME."
+  (treemacs-unless-let (theme (treemacs--find-theme name))
+      (treemacs-log "Cannot find theme '%s'." name)
+    (setq treemacs--current-theme theme)))
+
+(provide 'treemacs-themes)
+
+;;; treemacs-themes.el ends here
diff --git a/src/elisp/treemacs-visuals.el b/src/elisp/treemacs-visuals.el
@@ -24,6 +24,7 @@
 (require 'pulse)
 (require 'hl-line)
 (require 'treemacs-core-utils)
+(require 'treemacs-themes)
 (require 'treemacs-customization)
 (require 'treemacs-fringe-indicator)
 (eval-and-compile
@@ -45,9 +46,6 @@
 ;; Since it is a marker in the treemacs buffer it is important for it to be reset whenever it might
 ;; become invalid.
 
-(treemacs-import-functions-from "treemacs-icons"
-  treemacs--created-icons)
-
 (defvar-local treemacs--last-highlight nil
   "The last button treemacs has highlighted.")
 
@@ -119,29 +117,29 @@
     (advice-remove #'disable-theme     #'treemacs--setup-icon-background-colors)))
 
 (defun treemacs--setup-icon-background-colors (&rest _)
-  "Align icon backgrounds with current theme.
-Fetch the current theme's background & hl-line colors and inject them into
-`treemacs--created-icons'. Also called as advice after `load-theme', hence the
-ignored argument."
+  "Align icon backgrounds with current Emacs theme.
+Fetch the current Emacs theme's background & hl-line colors and inject them into
+the gui icons of every theme in `treemacs--themes'.
+Also called as advice after `load-theme', hence the ignored argument."
   (let* ((default-background (face-attribute 'default :background nil t))
          (hl-line-background (face-attribute 'hl-line :background nil t))
-         (icon               (car (treemacs--created-icons)))
-         (icon-background    (treemacs--get-img-property (get-text-property 0 'img-unselected icon) :background))
-         (icon-hl-background (treemacs--get-img-property (get-text-property 0 'img-selected icon) :background)))
+         (test-icon               (with-no-warnings treemacs-icon-root))
+         (icon-background    (treemacs--get-img-property (get-text-property 0 'img-unselected test-icon) :background))
+         (icon-hl-background (treemacs--get-img-property (get-text-property 0 'img-selected test-icon) :background)))
     (when (eq default-background 'unspecified-bg)
       (setq default-background "#2d2d31"))
     ;; make sure we only change all the icons' colors when we have to
     (unless (and (string= default-background icon-background)
                  (string= hl-line-background icon-hl-background))
       (setf treemacs--selected-icon-background hl-line-background
             treemacs--not-selected-icon-background default-background)
-      (--each (treemacs--created-icons)
-        (progn
+      (dolist (theme treemacs--themes)
+        (treemacs--maphash (treemacs-theme->gui-icons theme) (_ icon)
           (treemacs--set-img-property
-           (get-text-property 0 'img-selected it)
+           (get-text-property 0 'img-selected icon)
            :background treemacs--selected-icon-background)
           (treemacs--set-img-property
-           (get-text-property 0 'img-unselected it)
+           (get-text-property 0 'img-unselected icon)
            :background treemacs--not-selected-icon-background))))))
 
 (defun treemacs--update-icon-selection ()

diff --git a/src/elisp/treemacs.el b/src/elisp/treemacs.el
@@ -31,6 +31,7 @@
 (require 'f)
 (require 'bookmark)
 (require 'treemacs-customization)
+(require 'treemacs-themes)
 (require 'treemacs-icons)
 (require 'treemacs-faces)
 (require 'treemacs-visuals)

diff --git a/src/extra/treemacs-icons-dired.el b/src/extra/treemacs-icons-dired.el
@@ -43,6 +43,7 @@
              (not treemacs-icons-dired-displayed)
              dired-subdir-alist)
     (setq-local treemacs-icons-dired-displayed t)
+    (setq-local treemacs-icons (treemacs-theme->gui-icons treemacs--current-theme))
     (pcase-dolist (`(,path . ,pos) dired-subdir-alist)
       (treemacs-icons-dired--display-icons-for-subdir path pos))))
 
@@ -59,7 +60,7 @@
           (if (dired-move-to-filename nil)
               (let* ((file (dired-get-filename nil t))
                      (icon (if (file-directory-p file)
-                               treemacs-icon-closed
+                               treemacs-icon-dir-closed
                              (treemacs-icon-for-file file))))
                 (insert icon))
             (treemacs-return nil))
@@ -127,13 +128,15 @@ This will make sure the icons' background colors will align with hl-line mode."
   (if treemacs-icons-dired-mode
       (progn
         (add-hook 'dired-after-readin-hook #'treemacs-icons-dired--display)
+        (add-hook 'dired-mode-hook #'treemacs--select-icon-set)
         (add-hook 'dired-mode-hook #'treemacs-icons-dired--enable-highlight-correction)
         (dolist (buffer (buffer-list))
           (with-current-buffer buffer
             (when (derived-mode-p 'dired-mode)
               (treemacs-icons-dired--enable-highlight-correction)
               (treemacs-icons-dired--display)))))
     (remove-hook 'dired-after-readin-hook #'treemacs-icons-dired--display)
+    (remove-hook 'dired-mode-hook #'treemacs--select-icon-set)
     (remove-hook 'dired-mode-hook #'treemacs-icons-dired--enable-highlight-correction)
     (dolist (buffer (buffer-list))
       (with-current-buffer buffer