X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=fa38ffd55a00a4be80779fd11ff60729a319e2aa;hb=f5316890bfd66584aa3d285d28b73cef836c39db;hp=0d565f14c3b14c4e417f04e44bbce7b8c56ffc0e;hpb=afc6c7f7b111f1c31bc3707ff7aaf4ce11e50e2c;p=elisp.git

diff --git a/emacs.el b/emacs.el
index 0d565f1..fa38ffd 100644
--- a/emacs.el
+++ b/emacs.el
@@ -408,68 +408,6 @@ load-warning buffer in case of failure."
 ;; Not the same in xterm (which is gray in my case) and in
 ;; X-window
 
-(unless window-system
-  ;;     (xterm-mouse-mode 1)
-  (ff/configure-faces
-   '((italic :underline nil)
-     (info-title-2 :foreground "green")
-     (font-lock-comment-delimiter-face :foreground "green")
-     (font-lock-comment-face :foreground "green")
-     (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
-     (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
-     (diff-added :background "gray90" :foreground "green4" :weight 'bold)
-     (diff-removed :background "gray90" :foreground "red2" :weight 'bold)
-     (diff-changed :background "gray90" :foreground "blue" :weight 'bold)
-     (diff-file-header-face :background "white" :foreground "black"
-                            :weight 'bold)
-     (diff-header-face :background "white" :foreground "black")
-     (diff-hunk-header-face :background "white" :foreground "black")
-     (diff-indicator-removed :foreground "red" :weight 'bold)
-     (diff-removed :foreground "red" :weight 'bold)
-     (diff-indicator-added :foreground "blue" :weight 'bold)
-     (diff-added :foreground "blue" :weight 'bold)
-     (font-lock-string-face :foreground "green")
-     (font-lock-variable-name-face :foreground "blue")
-     (font-lock-constant-face :foreground "blue")
-     (font-lock-preprocessor-face :foreground "green")
-     (font-lock-function-name-face :foreground "cyan")
-     (flyspell-incorrect :foreground "red2")
-     (flyspell-duplicate :foreground "OrangeRed2")
-     (hl-line :background "white")
-     (sh-heredoc :foreground "black" :background "#fff0f0")
-     (sh-heredoc-face :foreground "black" :background "#fff0f0")
-     (font-lock-keyword-face :foreground "blue")
-     (highlight :background "darkseagreen3")
-     (isearch :background "orange" :foreground "black")
-     (isearch-lazy-highlight-face' :background "yellow" :foreground "black")
-     ;; (display-time-mail-face :background "white")
-     (show-paren-match-face :background "gold" :foreground "black")
-     (show-paren-mismatch-face :background "red" :foreground "black")
-     (trailing-whitespace :background "white")
-     (mode-line :background "cornflowerblue" :foreground "black" :box nil
-                :inverse-video nil)
-     (header-line :background "cornflowerblue" :foreground "black" :box nil
-                  :inverse-video nil)
-     (mode-line-inactive :background "gray60" :foreground "black" :box nil
-                         :inverse-video nil)
-     (region :background "white" :foreground "black")
-     (ff/date-info-face :foreground "white" :weight 'bold)
-     (ff/mail-alarm-face :foreground "red" :weight 'bold)
-     (selector/selection :background "yellow")
-     (gui-button-face :background "green" :foreground "white")
-     (enotes/information-face :foreground "cyan")
-
-     (file-name-shadow :foreground "black")
-     (shadow :foreground "black")
-     (warning :foreground "black" :background "red")
-     ))
-  )
-
-;; (list-colors-display (mapcar 'car color-name-rgb-alist))
-
-;; (ff/configure-faces '((default :background "black" :foreground "gray80")))
-;; (ff/configure-faces '((default :background "gray80" :foreground "black")))
-
 (when window-system
   ;; (setq
   ;; display-time-use-mail-icon t)
@@ -477,7 +415,6 @@ load-warning buffer in case of failure."
   (ff/configure-faces
    '(
      ;; (escape-glyph :foreground "#c0c0c0" :weight 'bold)
-
      (escape-glyph :foreground "green3" :weight 'bold)
      (default :background "gray90" :foreground "black")
      (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
@@ -523,13 +460,72 @@ load-warning buffer in case of failure."
                          :inverse-video nil)
      ;; (fringe :background "black" :foreground "gray90")
      (fringe :background "gray80")
-     (ff/date-info-face :foreground "white" :weight 'bold)
+     (ff/date-info-face :foreground "white")
+     (ff/battery-info-face :foreground "white")
      (ff/mail-alarm-face :foreground "white" :background "red2")
      ;; (alarm-vc-face :foreground "black" :background "yellow" :weight 'normal)
      (gui-button-face :background "green" :foreground "black")
      ))
   )
 
+(unless window-system
+  ;; (xterm-mouse-mode 1)
+  (ff/configure-faces
+   '((italic :underline nil)
+     (info-title-2 :foreground "green")
+     (font-lock-comment-delimiter-face :foreground "green")
+     (font-lock-comment-face :foreground "green")
+     (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
+     (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
+     (diff-added :background "gray90" :foreground "green4" :weight 'bold)
+     (diff-removed :background "gray90" :foreground "red2" :weight 'bold)
+     (diff-changed :background "gray90" :foreground "blue" :weight 'bold)
+     (diff-file-header-face :background "white" :foreground "black"
+                            :weight 'bold)
+     (diff-header-face :background "white" :foreground "black")
+     (diff-hunk-header-face :background "white" :foreground "black")
+     (diff-indicator-removed :foreground "red" :weight 'bold)
+     (diff-removed :foreground "red" :weight 'bold)
+     (diff-indicator-added :foreground "blue" :weight 'bold)
+     (diff-added :foreground "blue" :weight 'bold)
+     (font-lock-string-face :foreground "green")
+     (font-lock-variable-name-face :foreground "blue")
+     (font-lock-constant-face :foreground "blue")
+     (font-lock-preprocessor-face :foreground "green")
+     (font-lock-function-name-face :foreground "cyan")
+     (flyspell-incorrect :foreground "red2")
+     (flyspell-duplicate :foreground "OrangeRed2")
+     (hl-line :background "white")
+     (sh-heredoc :foreground "black" :background "#fff0f0")
+     (sh-heredoc-face :foreground "black" :background "#fff0f0")
+     (font-lock-keyword-face :foreground "blue")
+     (highlight :background "darkseagreen3")
+     (isearch :background "orange" :foreground "black")
+     (isearch-lazy-highlight-face' :background "yellow" :foreground "black")
+     ;; (display-time-mail-face :background "white")
+     (show-paren-match-face :background "gold" :foreground "black")
+     (show-paren-mismatch-face :background "red" :foreground "black")
+     (trailing-whitespace :background "white")
+     (mode-line :background "cornflowerblue" :foreground "black" :box nil
+                :inverse-video nil)
+     (header-line :background "cornflowerblue" :foreground "black" :box nil
+                  :inverse-video nil)
+     (mode-line-inactive :background "gray60" :foreground "black" :box nil
+                         :inverse-video nil)
+     (region :background "white" :foreground "black")
+     (ff/date-info-face :foreground "white" :weight 'bold)
+     (ff/battery-info-face :foreground "white")
+     (ff/mail-alarm-face :foreground "red" :weight 'bold)
+     (selector/selection :background "yellow")
+     (gui-button-face :background "green" :foreground "white")
+     (enotes/information-face :foreground "cyan")
+
+     (file-name-shadow :foreground "black")
+     (shadow :foreground "black")
+     (warning :foreground "black" :background "red")
+     ))
+  )
+
 ;; When we are root, put the modeline in red
 
 (when (string= (user-real-login-name) "root")
@@ -871,43 +867,38 @@ printer."
     (error -1))
   )
 
-(defun ff/temp-and-battery-info-string () (interactive)
+(defun ff/temp-info-string () (interactive)
        (condition-case nil
-           (concat
-
-            ;; The temperature
-
-            (let ((temp (/
-                         (apply 'max (mapcar
-                                      (lambda (f) (string-to-number (ff/file-first-line f)))
-                                      ff/temperature-files))
-                         1000)))
-
-              (if (> temp 50)
-                  (let ((s (format "%dC " temp)))
-                    (if (> temp 70)
-                        (propertize s 'face 'font-lock-warning-face)
-                      s)
-                    )
-                )
-              )
-
-            ;; The battery
-
-            (propertize
-             (pcase (ff/battery-state ff/battery-dirs)
-               ;; (`charging (format "c%d%%" (ff/battery-percent)))
-               ;; (`discharging (format "d%d%%" (ff/battery-percent)))
-               ;; (`unknown "f")
-               (`charging (format "↑%d%%" (ff/battery-percent)))
-               (`discharging (format "↓%d%%" (ff/battery-percent)))
-               (`unknown "◉")
-               ;; (`unknown "⚡")
-               (_ "?"))
-             'face '(:foreground "#ffffe0"))
+           ;; The temperature
+
+           (let ((temp (/
+                        (apply 'max (mapcar
+                                     (lambda (f) (string-to-number (ff/file-first-line f)))
+                                     ff/temperature-files))
+                        1000)))
+
+             (if (> temp 50)
+                 (let ((s (format "%dC " temp)))
+                   (if (> temp 70)
+                       (propertize s 'face 'font-lock-warning-face)
+                     s)
+                   )
+               )
+             )
 
-            )
+         (error nil))
+       )
 
+(defun ff/battery-info-string () (interactive)
+       (condition-case nil
+           (pcase (ff/battery-state ff/battery-dirs)
+             ;; (`charging (format "c%d%%" (ff/battery-percent)))
+             ;; (`discharging (format "d%d%%" (ff/battery-percent)))
+             ;; (`unknown "f")
+             (`charging (format "↑%d%%" (ff/battery-percent)))
+             (`discharging (format "↓%d%%" (ff/battery-percent)))
+             (`unknown "✱")
+             (_ "?"))
          (error nil))
        )
 
@@ -979,30 +970,32 @@ printer."
 
 (setq
 
- display-time-interval 15 ;; Check every 15s
+ display-time-interval 10 ;; Check every 10s
 
  display-time-string-forms `(
 
-                             ;; (if mail
-                             ;;     (concat " "
-                             ;;             (propertize " mail "
-                             ;;                         'face 'ff/mail-alarm-face)
-                             ;;             " ")
-                             ;;   )
+                             load " "
 
-                             ,(if (ff/temp-and-battery-info-string)
-                                  '(concat (ff/temp-and-battery-info-string) " "))
+                                  (ff/temp-info-string)
 
-                             (propertize (concat 24-hours ":" minutes
-                                                 " "
-                                                 dayname " "
-                                                 monthname " "
-                                                 day)
-                                         'face 'ff/date-info-face)
+                                  ,@(when (ff/battery-info-string)
+                                      '((propertize
+                                        (ff/battery-info-string)
+                                        'face 'ff/battery-info-face)))
 
-                             load
+                                  " "
 
-                             )
+                                  (propertize
+                                   (concat ;;" ˌ"
+                                    24-hours ":" minutes
+                                    " "
+                                    ;; dayname " "
+                                    monthname " " day
+                                    ;;"ˌ"
+                                    )
+                                   'face 'ff/date-info-face)
+
+                                  )
 
  ;; display-time-format "%b %a %e %H:%M"
  ;; display-time-mail-face nil