sawfish r4229 - trunk/lisp/sawfish/wm

[chrisb svn gnome org]

Author: chrisb
Date: Mon Jul 28 21:24:59 2008
New Revision: 4229
URL: http://svn.gnome.org/viewvc/sawfish?rev=4229&view=rev

Log:
Revert last commit


Modified:
   trunk/lisp/sawfish/wm/frames.jl

Modified: trunk/lisp/sawfish/wm/frames.jl
==============================================================================
--- trunk/lisp/sawfish/wm/frames.jl	(original)
+++ trunk/lisp/sawfish/wm/frames.jl	Mon Jul 28 21:24:59 2008
@@ -156,10 +156,10 @@
       (dock . icon)
       (utility . default)
       (shaded-utility . shaded-transient)
-      (toolbar . utility)
-      (shaded-toolbar . shaded-utility)
-      (menu . utility)
-      (shaded-menu . shaded-utility)
+      (toolbar . unframed)
+;;    (shaded-toolbar . shaded-utility)
+      (menu . unframed)
+;;    (shaded-menu . shaded-utility)
       (splash . unframed))
     "Frame type fallbacks.")
 
@@ -189,6 +189,9 @@
   ;; files they were loaded from; used to check if the theme needs reloading
   (define frame-style-files nil)
 
+  ;; List of styles that can be edited using sawfish-themer
+  (define editable-frame-styles nil)
+
   (define frame-type-mappers '()
     "List of functions that map (WINDOW FRAME-TYPE) -> FRAME-TYPE. Used when
 deciding which frame type to ask a theme to generate.")
@@ -202,6 +205,8 @@
   (defvar themes-are-gaolled t
     "When non-nil themes are assumed to be malicious.")
 
+  (defvar sawfish-themer-program "sawfish-themer")
+
 
 ;;; defcustom's for some built-in variables
 
@@ -358,6 +363,15 @@
 
   (define (frame-style-editable-p style) (memq style editable-frame-styles))
 
+  (define-command 'edit-frame-style
+    (lambda (style)
+      (if (not (memq style editable-frame-styles))
+	  (error "Frame style isn't editable")
+	(let ((dir (find-frame-style style)))
+	  (when dir
+	    (system (format nil "%s %s &" sawfish-themer-program dir))))))
+    #:spec (lambda () (list default-frame-style)))
+
 
 ;;; kludge different window decors by modifying the assumed window type