Allow xpm-bw with major-modes.

Also add option mode-icons-change-mode-name to suppress changing the
actual mode-name and just displaying the icons.

CHANGELOG.md

@@ -32,7 +32,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - C, C++, C#, PHP and Java modes match a wider variety of modes.  See
   (Issue #18).
 - Allow black and white xpm icons to match the mode-line face colors
-  (both active and inactive)
+  (both active and inactive, for major and minor modes)
+- Allow displaying the major mode name in the mode-line only, or both
+  the mode-line and in other buffers, like ibuffer.
+  - If the =mode-name= variable is changed, then anything that looks
+    at this variable will pick up the icon.
+  - This can be customized by the variable =mode-icons-change-mode-name=.
+  - This should be modified for packages like =powerline= and
+    =smart-mode-line=.
 
 ### Removed
 

README.org

@@ -28,6 +28,20 @@ Some of the modes that have icons instead of names now:
 | Slim       | [[https://raw.githubusercontent.com/rhoit/mode-icons/dump/icons/slim.png]]   |
 | YAML       | [[https://raw.githubusercontent.com/rhoit/mode-icons/dump/icons/yaml.png]]   |
 
+When looking at buffers with commands like ~ibuffer~, they display the
+icons for the mode names as well. If you don't like this behavior you
+can change ~mode-icons-change-mode-name~ to be nil:
+
+#+BEGIN_SRC emacs-lisp
+(setq mode-icons-change-mode-name nil)
+#+END_SRC
+
+This only displays the icon in the plain emacs mode-line.
+
+This may not work with enhanced mode-lines like ~poweline~ or
+~smart-mode-line~, sicne they typically look at the ~mode-name~
+variable.
+
 * Requirements
 
   As of version 0.3.0 you can also use icons from some icon fonts,
@@ -42,7 +56,6 @@ Some of the modes that have icons instead of names now:
   these fonts, mode-icons will not do this for you.
 
 * Installation
-
 ** manually
 
    Place ~mode-icons.el~ somewhere in your =load-path= and copy the

mode-icons.el

@@ -496,11 +496,12 @@ everywhere else."
    (and (eq (nth 2 icon-spec) 'xpm-bw) (image-type-available-p 'xpm))
    (and (image-type-available-p (nth 2 icon-spec)))))
 
-(defun mode-icons-propertize-mode (mode icon-spec)
+(defun mode-icons-propertize-mode (mode icon-spec &optional face)
   "Propertize MODE with ICON-SPEC.
 
 MODE should be a string, the name of the mode to propertize.
-ICON-SPEC should be a specification from `mode-icons'."
+ICON-SPEC should be a specification from `mode-icons'.
+FACE is the face to match when a xpm-bw image is used."
   (mode-icons-save-buffer-state ;; Otherwise may cause issues with trasient mark mode
    (cond
     ((and (stringp mode) (get-text-property 0 'mode-icons-p mode))
@@ -524,7 +525,8 @@ ICON-SPEC should be a specification from `mode-icons'."
                                                    (nth 1 icon-spec)))
        (put-text-property (point-min) (point-max) 'mode-icons-p icon-spec)
        (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) face)
+                   'mode-icons-p icon-spec)))))
 
 (defvar mode-icons-get-icon-spec (make-hash-table :test 'equal)
   "Hash table of icon-specifications.")
@@ -553,8 +555,17 @@ ICON-SPEC should be a specification from `mode-icons'."
   :type 'boolean
   :group 'mode-icons)
 
-(defun mode-icons-get-mode-icon (mode)
+(defcustom mode-icons-change-mode-name t
-  "Get the icon for MODE, if there is one."
+  "Change the `mode-name' variable.
+
+This allows functions like `ibuffer' or `helm-mode' to show the
+icon as well."
+  :type 'boolean
+  :group 'mode-icons)
+
+(defun mode-icons-get-mode-icon (mode &optional face)
+  "Get the icon for MODE, if there is one.
+FACE represents the face used when the icon is a xpm-bw image."
   (let* ((mode-name (format-mode-line mode))
          (icon-spec (mode-icons-get-icon-spec mode-name))
          ret)
@@ -562,7 +573,7 @@ ICON-SPEC should be a specification from `mode-icons'."
         (setq ret
               (if mode-icons-show-mode-name
                       (concat (mode-icons-propertize-mode mode-name icon-spec) " " mode-name)
-                    (mode-icons-propertize-mode mode-name icon-spec)))
+                    (mode-icons-propertize-mode mode-name icon-spec face)))
       (setq ret mode-name))
     ;; Don't hide major mode names...
     (when (string= ret "")
@@ -572,11 +583,21 @@ ICON-SPEC should be a specification from `mode-icons'."
 (defvar mode-icons-cached-mode-name nil
   "Cached mode name to restore when disabling mode-icons.")
 
+(defvar mode-icons-mode-name-active nil
+  "Active icon for `mode-name'.")
+
+(defvar mode-icons-mode-name-inactive nil
+  "Inactive icon for `mode-name'.")
+
 (defun mode-icons-set-mode-icon (mode)
   "Set the icon for MODE."
   (unless mode-icons-cached-mode-name
     (set (make-local-variable 'mode-icons-cached-mode-name)
          mode-name)
+    (set (make-local-variable 'mode-icons-mode-name-active)
+         (mode-icons-get-mode-icon mode 'mode-line))
+    (set (make-local-variable 'mode-icons-mode-name-inactive)
+         (mode-icons-get-mode-icon mode 'mode-line-inactive))
     (setq mode-name (mode-icons-get-mode-icon mode))))
 
 (defun mode-icons-major-mode-icons-undo ()
@@ -640,7 +661,10 @@ When DONT-UPDATE is non-nil, don't call `force-mode-line-update'"
 
 (defun mode-icons--generate-major-mode-item ()
   "Give rich strings needed for `major-mode' viewing."
-  (eval `(propertize ,mode-name ,@mode-icons-major-mode-base-text-properties)))
+  (let ((active (mode-icons--selected-window-active)))
+    (eval `(propertize ,(or (and active mode-icons-mode-name-active)
+                            mode-icons-mode-name-inactive)
+                       ,@mode-icons-major-mode-base-text-properties))))
 
 ;;; selected take from powerline
 (defvar mode-icons--selected-window (frame-selected-window)