ryuslash/mode-icons
1
0
Fork 0
mirror of https://github.com/ryuslash/mode-icons.git synced 2024-11-22 01:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Speed up mode-line calculation

Browse source
This commit is contained in:
Matthew Fidler 2016-03-30 15:52:54 -05:00
parent a18ec9cfc7
commit 3388b75efe
1 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mode-icons.el
View file

@ -330,6 +330,9 @@ Grayscale colors are aslo changed by `mode-icons-interpolate-from-scale'."
(or (gethash sym mode-icons-get-icon-display-xpm-bw-face) (or (gethash sym mode-icons-get-icon-display-xpm-bw-face)
(puthash sym (mode-icons-get-icon-display-xpm-replace icon-path lst name) mode-icons-get-icon-display-xpm-bw-face)))) (puthash sym (mode-icons-get-icon-display-xpm-replace icon-path lst name) mode-icons-get-icon-display-xpm-bw-face))))
(defvar mode-icons-get-icon-display (make-hash-table :test 'equal)
"Hash table of `mode-icons-get-icon-display'.")
(defun mode-icons-get-icon-display (icon type &optional face) (defun mode-icons-get-icon-display (icon type &optional face)
"Get the value for the display property of ICON having TYPE. "Get the value for the display property of ICON having TYPE.
@ -339,6 +342,8 @@ the icon.
FACE should be the face for rendering black and white xpm icons FACE should be the face for rendering black and white xpm icons
specified by type 'xpm-bw." specified by type 'xpm-bw."
(or (gethash (list icon type (or face 'mode-line)) mode-icons-get-icon-display)
(puthash (list icon type (or face 'mode-line))
(let ((icon-path (mode-icons-get-icon-file (let ((icon-path (mode-icons-get-icon-file
(concat icon "." (or (and (eq type 'xpm-bw) "xpm") (concat icon "." (or (and (eq type 'xpm-bw) "xpm")
(symbol-name type)))))) (symbol-name type))))))
@ -346,7 +351,8 @@ specified by type 'xpm-bw."
(create-image (mode-icons-get-icon-display-xpm-bw-face icon-path face) (create-image (mode-icons-get-icon-display-xpm-bw-face icon-path face)
'xpm t :ascent 'center 'xpm t :ascent 'center
:face (or face 'mode-line)) :face (or face 'mode-line))
`(image :type ,(or (and (eq type 'jpg) 'jpeg) type) :file ,icon-path :ascent center)))) `(image :type ,(or (and (eq type 'jpg) 'jpeg) type) :file ,icon-path :ascent center)))
mode-icons-get-icon-display)))
(defcustom mode-icons-minor-mode-base-text-properties (defcustom mode-icons-minor-mode-base-text-properties
'('help-echo nil '('help-echo nil
@ -520,9 +526,12 @@ ICON-SPEC should be a specification from `mode-icons'."
(buffer-string))) (buffer-string)))
(t (propertize (format "%s" mode) 'display (mode-icons-get-icon-display (nth 1 icon-spec) (nth 2 icon-spec)) 'mode-icons-p icon-spec))))) (t (propertize (format "%s" mode) 'display (mode-icons-get-icon-display (nth 1 icon-spec) (nth 2 icon-spec)) 'mode-icons-p icon-spec)))))
(defvar mode-icons-get-icon-spec (make-hash-table :test 'equal)
"Hash table of icon-specifications.")
(defun mode-icons-get-icon-spec (mode) (defun mode-icons-get-icon-spec (mode)
"Get icon spec for MODE based on regular expression." "Get icon spec for MODE based on regular expression."
(let (case-fold-search) (or (gethash mode mode-icons-get-icon-spec)
(puthash mode (let (case-fold-search)
(catch 'found-mode (catch 'found-mode
(dolist (item mode-icons) (dolist (item mode-icons)
(when (and (mode-icons-supported-p item) (when (and (mode-icons-supported-p item)
@ -536,7 +545,8 @@ ICON-SPEC should be a specification from `mode-icons'."
(symbolp mode) (symbolp mode)
(eq mode (car item))))) (eq mode (car item)))))
(throw 'found-mode item))) (throw 'found-mode item)))
nil))) nil))
mode-icons-get-icon-spec)))
(defcustom mode-icons-show-mode-name nil (defcustom mode-icons-show-mode-name nil
"Show Icon and `mode-name'." "Show Icon and `mode-name'."
@ -949,7 +959,7 @@ When ENABLE is non-nil, enable the changes to the mode line."
(mode-icons-set-current-mode-icon) (mode-icons-set-current-mode-icon)
;; FIXME -- undo to allow `ergoemacs-mode' and color changing ;; FIXME -- undo to allow `ergoemacs-mode' and color changing
;; XPMs. Seems a bit heavy handed. ;; XPMs. Seems a bit heavy handed.
(mode-icons-set-minor-mode-icon-undo t) ;; (mode-icons-set-minor-mode-icon-undo t)
(mode-icons-set-minor-mode-icon))) (mode-icons-set-minor-mode-icon)))
(defun mode-icons-reset () (defun mode-icons-reset ()