[sawfish/tabs-ng] updated themes (Elberg-tabbed, get-S-tabbed, DarkTab

[Christopher Bratusek <chrisb src gnome org>]

commit 97d19de7aeaefd10e48c121f0f1ee59dbb4e9d0c
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Thu Nov 11 19:38:01 2010 +0100

    updated themes
    (Elberg-tabbed, get-S-tabbed, DarkTab

 themes/DarkTab/theme.jl       |   53 ++++++++++-------------------------------
 themes/Elberg-tabbed/theme.jl |   24 ++----------------
 themes/get-S-tabbed/theme.jl  |   25 +++----------------
 3 files changed, 20 insertions(+), 82 deletions(-)
---
diff --git a/themes/DarkTab/theme.jl b/themes/DarkTab/theme.jl
index 9f8462e..ad5016d 100644
--- a/themes/DarkTab/theme.jl
+++ b/themes/DarkTab/theme.jl
@@ -81,11 +81,6 @@
   :group (appearance DarkTab:group DarkTab:settings-group)
   :type color)
 
-(defcustom darktab:clicked-color "#F2F2F2"
-  "Clicked title text color."
-  :group (appearance DarkTab:group DarkTab:settings-group)
-  :type color)
-
 (defcustom darktab:inactive-color "#CCCCCC"
   "Inactive title text color."
   :group (appearance DarkTab:group DarkTab:settings-group)
@@ -96,11 +91,6 @@
   :group (appearance DarkTab:group DarkTab:settings-group)
   :type color)
 
-(defcustom darktab:inactive-clicked "#E6E6E6"
-  "Inactive Clicked title text color."
-  :group (appearance DarkTab:group DarkTab:settings-group)
-  :type color)
-
 (defcustom darktab:top-left-buttons `((menu ,t) (shade ,t) (sticky ,nil))
   "Top Titlebar Left Buttons (from left to right)"
   :group (appearance DarkTab:group DarkTab:buttons-group DarkTab:top-buttons-group DarkTab:top-left-buttons-group)
@@ -411,6 +401,7 @@
         (lambda (x)
           (window-put x 'title-position 'left)) (current-event-window))
        (call-window-hook 'window-state-change-hook (current-event-window) (list '(title-position)))
+       (map-window-group (lambda (x) (reframe-window x)) (current-event-window))
        (move-window-to (current-event-window) pos-x pos-y)
        (resize-window-to (current-event-window) dim-x dim-y))))
   (bind-keys
@@ -445,6 +436,7 @@
           (lambda (x)
             (window-put x 'title-position 'top)) (current-event-window)))
        (call-window-hook 'window-state-change-hook (current-event-window) (list '(title-position)))
+       (map-window-group (lambda (x) (reframe-window x)) (current-event-window))
        (move-window-to (current-event-window) pos-x pos-y)
        (resize-window-to (current-event-window) dim-x dim-y))))
   (bind-keys
@@ -482,6 +474,7 @@
         (lambda (x)
           (window-put x 'title-position 'right)) (current-event-window))
        (call-window-hook 'window-state-change-hook (current-event-window) (list '(title-position)))
+       (map-window-group (lambda (x) (reframe-window x)) (current-event-window))
        (move-window-to (current-event-window) pos-x pos-y)
        (resize-window-to (current-event-window) dim-x dim-y)))))
 
@@ -534,6 +527,7 @@
           (lambda (x)
             (window-put x 'title-position 'bottom)) (current-event-window)))
        (call-window-hook 'window-state-change-hook (current-event-window) (list '(title-position)))
+       (map-window-group (lambda (x) (reframe-window x)) (current-event-window))
        (move-window-to (current-event-window) pos-x pos-y)
        (resize-window-to (current-event-window) dim-x dim-y))))
   (bind-keys
@@ -569,6 +563,7 @@
         (lambda (x)
           (window-put x 'title-position 'top)) (current-event-window))
        (call-window-hook 'window-state-change-hook (current-event-window) (list '(title-position)))
+       (map-window-group (lambda (x) (reframe-window x)) (current-event-window))
        (move-window-to (current-event-window) pos-x pos-y)
        (resize-window-to (current-event-window) dim-x dim-y))))
   (bind-keys
@@ -620,6 +615,7 @@
           (lambda (x)
             (window-put x 'title-position 'bottom)) (current-event-window)))
        (call-window-hook 'window-state-change-hook (current-event-window) (list '(title-position)))
+       (map-window-group (lambda (x) (reframe-window x)) (current-event-window))
        (move-window-to (current-event-window) pos-x pos-y)
        (resize-window-to (current-event-window) dim-x dim-y)))))
 
@@ -1677,10 +1673,10 @@
   (lambda ()
     `((focused . ,darktab:focused-color)
       (highlighted . ,darktab:highlighted-color)
-      (clicked . ,darktab:clicked-color)
+      (clicked . ,darktab:highlighted-color)
       (inactive . ,darktab:inactive-color)
       (inactive-highlighted . ,darktab:inactive-highlighted-color)
-      (inactive-clicked . ,darktab:inactive-clicked))))
+      (inactive-clicked . ,darktab:inactive-highlighted-color))))
 
 (define top-frame-sticky-image-set
   (lambda (w)
@@ -3092,40 +3088,17 @@
   (lambda ()
     (reframe-windows theme-name)))
 
+;; also reset icon cache
+;;
 (define reframe-all-clean
   (lambda ()
     (setq icon-table (make-weak-table eq-hash eq))
     (reframe-all)))
 
-(define (reframe-one w)
-  (when (eq (window-get w 'current-frame-style) theme-name)
-    (current-title-w w)
-    (reframe-window w)))
-
-(define (reframe-group w)
-  (when (eq (window-get w 'current-frame-style) theme-name)
-    (map-window-group
-     (lambda (x)
-       (reframe-one x)) w)))
-
-;; create only frames when focus a window don't draw
-;;
-(add-hook 'focus-in-hook create-frames-only)
-(add-hook 'add-window-hook create-frames-only)
-
-(call-after-property-changed '(WM_HINTS WM_NAME _NET_WM_NAME _NET_WM_STATE _NET_WM_DESKTOP) reframe-one)
-
-;; theme-title icon switch
-;;
-;;(call-after-state-changed '(title-position) reframe-one)
-(call-after-state-changed '(title-position) reframe-group)
-
-;; when the window is sent to another workspace
-;; redraw it to update the buttons and titlebar if necessary
+;; Create only frames, don't rebuild-frame/reframe-window.
+;; Tabthemes will reframe/rebuild windows call from tabgroup.jl. 
 ;;
-(add-hook 'remove-from-workspace-hook
-          (lambda (w)
-            (reframe-window w)))
+(call-after-state-changed '(title-position) create-frames-only)
 
 (custom-set-property 'darktab:focused-color ':after-set reframe-all)
 (custom-set-property 'darktab:highlighted-color ':after-set reframe-all)
diff --git a/themes/Elberg-tabbed/theme.jl b/themes/Elberg-tabbed/theme.jl
index ee211ab..6d348f9 100644
--- a/themes/Elberg-tabbed/theme.jl
+++ b/themes/Elberg-tabbed/theme.jl
@@ -492,24 +492,6 @@
     (when (eq (window-get w 'current-frame-style) 'Elberg-tabbed)
       (create-frames))))
 
-(define (reframe-one w)
-    (when (eq (window-get w 'current-frame-style) 'Elberg-tabbed)
-      (create-frames)
-      (reframe-window w)))
-
-(define (reframe-group w)
-  (when (eq (window-get w 'current-frame-style) 'Elberg-tabbed)
-    (map-window-group
-     (lambda (x)
-       (reframe-one x)) w)))
-
-;; create only frames when focus a window don't draw
-;;
-(add-hook 'focus-in-hook create-frames-only)
-(add-hook 'add-window-hook create-frames-only)
-
-(call-after-property-changed '(WM_HINTS WM_NAME _NET_WM_NAME _NET_WM_STATE _NET_WM_DESKTOP) reframe-one)
-
-;; tabgroup.jl call
-;;
-(call-after-state-changed '(title-position) reframe-group)
+;; Create only frames, don't rebuild-frame/reframe-window.
+;; Tabthemes will reframe/rebuild windows call from tabgroup.jl.
+(call-after-state-changed '(title-position) create-frames-only)
diff --git a/themes/get-S-tabbed/theme.jl b/themes/get-S-tabbed/theme.jl
index 9291bfb..86c19f1 100644
--- a/themes/get-S-tabbed/theme.jl
+++ b/themes/get-S-tabbed/theme.jl
@@ -330,24 +330,7 @@
     (when (eq (window-get w 'current-frame-style) 'get-S-tabbed)
       (create-frames))))
 
-(define (reframe-one w)
-    (when (eq (window-get w 'current-frame-style) 'get-S-tabbed)
-      (create-frames)
-      (reframe-window w)))
-
-(define (reframe-group w)
-  (when (eq (window-get w 'current-frame-style) 'get-S-tabbed)
-    (map-window-group
-     (lambda (x)
-       (reframe-one x)) w)))
-
-;; create only frames when focus a window don't draw
-;;
-(add-hook 'focus-in-hook create-frames-only)
-(add-hook 'add-window-hook create-frames-only)
-
-(call-after-property-changed '(WM_HINTS WM_NAME _NET_WM_NAME _NET_WM_STATE _NET_WM_DESKTOP) reframe-one)
-
-;; tabgroup.jl call
-;;
-(call-after-state-changed '(title-position) reframe-group)
+;; Create only frames, don't rebuild-frame/reframe-window.
+;; Tabthemes will reframe/rebuild windows call from tabgroup.jl.
+;; 
+(call-after-state-changed '(title-position) create-frames-only)