themes tweaks

4 files changed, 42 insertions, 39 deletions

diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index 22c67ef..bcd3a04 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -1,13 +1,13 @@
 (jao-define-custom-theme jao-light
   (:palette (fg unspecified "black")
-            (bg unspecified "#efebe7")
+            (bg unspecified "white")
             (box "magenta" "antiquewhite3")
             (button ((c 13 nil) nbf nul) (bx))
-            (hilite ((c nil 5)))
+            (hilite ((c nil 15))) ;; 5
             (strike-through ((c 1)) (st))
             (italic (it))
-            (link ((c 23) nul nbf nit))
-            (visited-link ((c 24) nul))
+            (link ((c 14) ul nbf nit))
+            (visited-link ((c 24) ul nbf))
             (tab-sel ((~ mode-line)))
             (tab-unsel ((~ mode-line-inactive)))
             (comment ((c 239) it)) ;; italic
@@ -38,34 +38,32 @@
           (diary (c 14) bf)
           (gnus-summary-selected (c 13 nil) nul)
           (gnus-summary-normal-unread (c 0 nil))
-          (header-line (c nil 5) nul)
+          (header-line (c nil 15) nul)
 ;;          (italic it)
-          (mode-line (c 11 5) nbf nul)
-          (mode-line-inactive (c 11 6) nbf nul)
+          (mode-line (c 0 15) nbf nul)
+          (mode-line-inactive (c 11 15) nbf nul)
           (org-hide (c 7 7))
           (vertical-border (c 11 nil) :inherit nil)
-          (w3m-tab-selected (c 9 15) bf)
+          (w3m-tab-selected (c 9 5) bf)
           (w3m-link-numbering (c 12))
           (w3m-bold (c nil nil) bf)
           (w3m-image (c 94))
-          (w3m-tab-background (c 12 5)))
-  (:x-faces (button (c 10 nil) nbf)
+          (w3m-tab-background (c 12 15)))
+  (:x-faces (bold (c 14) bf)
+            (button (c 10 nil) nbf)
             (gnus-button (c nil nil) nbf)
-            (company-tooltip-common (c 1 6) nbf)
-            (company-tooltip-common-selection (~ company-tooltip-selection)
-                                              (c nil 6) bf)
-            (company-tooltip-selection (~ company-tooltip) bf nul)
-            (compilation-info (c nil nil) bf)
+            (compilation-info (c 14 nil) nbf)
             (cursor (c 1 1))
             (fringe (c 11 nil))
-            (gnus-summary-selected (c nil "white"))
+            (gnus-summary-selected (c 2) nbf)
             (gnus-summary-cancelled (c 1) st)
-            (header-line (c nil "#E0DACC"))
-            (mode-line (c 0 7) :box (:line-width -1 :color "grey60"))
-            (mode-line-inactive (~ mode-line) (c "grey30" "#E0DACC"))
+            (header-line (c nil "#efebe7"))
+            (mode-line (c 0 7) :box (:line-width -1 :color "grey90"))
+            (mode-line-inactive (~ mode-line) (c "grey30"))
             (org-hide (c 7 nil))
-            (vertical-border (c 12 nil))
+            (vertical-border (c "grey72" nil))
             (w3m-image (c 3))
+            (w3m-bold (c 9) nbf)
             (w3m-tab-selected (c 9 15) bf)
             (w3m-tab-selected-retrieving (~ w3m-tab-selected) (c 1))
             (w3m-tab-background (c 15 15) nul))
diff --git a/themes/jao-mono-dark-theme.el b/themes/jao-mono-dark-theme.el
index a7f2803..bbfcdda 100644
--- a/themes/jao-mono-dark-theme.el
+++ b/themes/jao-mono-dark-theme.el
@@ -47,7 +47,7 @@
           (vertical-border (c 59 nil) :inherit nil)
           (w3m-image (c 144))
           (w3m-tab-background (c 0 0) ul)
-          (w3m-tab-line (c 0 0))
+          (w3m-tab-line (c 0 0) ul)
           (widget-button (c 196))
           (widget-field (c 143 236)))
   (:x-faces (gnus-button (c "lightyellow3") nul)
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 043b99e..6182a2a 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -206,6 +206,9 @@
             (compilation-error nbf (p error) nul)
             (compilation-info nbf (p f02) nul)
             (compilation-line-number (p f01) nul)
+            (compilation-mode-line-fail (~ error))
+            (compilation-mode-line-exit (p f01) nbf)
+            (compilation-mode-line-run (~ warning))
             (compilation-warning nbf (p warning) nul)
             (completions-common-part nbf :width normal)
             (completions-first-difference bf dfg dbg)
@@ -308,9 +311,11 @@
             (erc-action-face (p f02))
             (erc-button (p link))
             (erc-current-nick-face (p error))
+            (erc-direct-msg-face (p warning))
             (erc-error-face (p error))
             (erc-header-line (~ header))
-            (erc-input-face (p warning))
+            (erc-input-face (p f01))
+            (erc-my-nick-face (p warning))
             (erc-nick-default-face (p f11))
             (erc-nick-msg-face (p warning))
             (erc-notice-face (p dimm))
@@ -744,14 +749,18 @@
            (assq-delete-all kind window-system-default-frame-alist)))))
 
 (defmacro jao-define-custom-theme (name &rest args)
-  (let ((t-faces (make-symbol "t-faces"))
-        (xfaces (make-symbol "xfaces"))
-        (tx-faces (make-symbol "tx-faces"))
-        (palette (cdr (assoc :palette args)))
-        (faces (cdr (assoc :faces args)))
-        (x-faces (cdr (assoc :x-faces args)))
-        (x-colors (cdr (assoc :x-colors args))))
+  (let* ((t-faces (make-symbol "t-faces"))
+         (xfaces (make-symbol "xfaces"))
+         (tx-faces (make-symbol "tx-faces"))
+         (palette (cdr (assoc :palette args)))
+         (faces (cdr (assoc :faces args)))
+         (x-faces (cdr (assoc :x-faces args)))
+         (x-colors (cdr (assoc :x-colors args)))
+         (ansi-colors (apply 'vector (butlast x-colors
+                                              (- (length x-colors) 8)))))
     `(progn
+       (setq ansi-color-names-vector ,ansi-colors)
+       (ansi-color-map-update 'ansi-color-names-vector ,ansi-colors)
        (custom-make-theme-feature ',name)
        (deftheme ,name)
        (let* ,(jao-themes--let-palette palette nil)
diff --git a/themes/light-ec b/themes/light-ec
index 361a058..e04b5f4 100755
--- a/themes/light-ec
+++ b/themes/light-ec
@@ -1,18 +1,18 @@
 #!/bin/bash
 
-font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=iso8859-7]xft:Andale Mono:size=12,[codeset=japanese-jisx0208]xft:Sazanami Gothic}
-font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=japanese-jisx0208]xft:Sazanami Gothic}
-# font="xft:Liberation Mono-9"
-
 frg="black"
 bkg="#EFEBE7"
+bkg="white"
 
 bw=${EC_TERM_BORDER:-1}
-tr=${EC_TRANS_SPEC:-+tr}
+tr=${EC_TRANS_SPEC}
 usr=${EC_USR_OPTS}
 
+font=$EC_TERM_FACE
+ifont=$EC_TERM_ITALIC_FACE
+
 exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \
-             -sl 0 +rv +ssr -b $bw +sbg -fn "${font}" \
+             -sl 0 +rv +ssr -b $bw +sbg -fn "${font}" -fi "${ifont}" \
              -xrm "*colorBD: grey20" \
              -xrm "*colorUL: grey20" \
              -xrm "*color0: ${frg}" \
@@ -34,7 +34,3 @@ exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \
              -name "emacsclient" ${usr} \
              -e emacsclient -t $*
 
-# fname=${EC_XTERM_FN:-Inconsolata}
-# fsize=${EC_XTERM_FS:-11}
-# exec xterm -cr tomato -sl 0 +rv -b "$bw" -bg "$bkg" -bd "$bkg" -fg "$frg" \
-#            -bdc -ulc -u8 -fa "$fname" -fs $fsize \