sawfish r4457 - in trunk: . lisp/sawfish/ui lisp/sawfish/ui/layouts lisp/sawfish/wm lisp/sawfish/wm/ext lisp/sawfish/wm/state lisp/sawfish/wm/util man

[chrisb svn gnome org]

Author: chrisb
Date: Wed Apr  1 14:41:05 2009
New Revision: 4457
URL: http://svn.gnome.org/viewvc/sawfish?rev=4457&view=rev

Log:
2009-04-01  Christopher Bratusek <zanghar freenet de>
        * lisp/sawfish/wm/ext/match-window.jl: move 'avoid' from placement to state [Teika]

        * lisp/sawfish/wm/state/maximize.jl: fixed position of a comment [Teika]

        * lisp/sawfish/wm/viewport.jl
        * lisp/sawfish/wm/focus.jl
        * lisp/sawfish/wm/windows.jl: replace several Wether by Whether [Teika]

        * lisp/sawfish/wm/util/compat.jl: maximize-always-expands, maximize-ignore-when-filling and
                                          maximize-avoid-avoided are not obosolete [Teika]

        * lisp/sawfish/ui/layouts/keymaps.jl
        * lisp/sawfish/ui/layout.jl: replace several defvar with define [Teika]
                                     some indention improvements [Teika]

        * man/news.texi: improvements [Teika]
                         updated [Chris]

Modified:
   trunk/ChangeLog
   trunk/lisp/sawfish/ui/layout.jl
   trunk/lisp/sawfish/ui/layouts/keymaps.jl
   trunk/lisp/sawfish/wm/ext/match-window.jl
   trunk/lisp/sawfish/wm/focus.jl
   trunk/lisp/sawfish/wm/state/maximize.jl
   trunk/lisp/sawfish/wm/util/compat.jl
   trunk/lisp/sawfish/wm/viewport.jl
   trunk/lisp/sawfish/wm/windows.jl
   trunk/man/news.texi

Modified: trunk/lisp/sawfish/ui/layout.jl
==============================================================================
--- trunk/lisp/sawfish/ui/layout.jl	(original)
+++ trunk/lisp/sawfish/ui/layout.jl	Wed Apr  1 14:41:05 2009
@@ -36,9 +36,9 @@
 	   sawfish.gtk.widget)
      (access rep.structures))
 
-  (defvar widget-ptr nil)
-  (defvar label-ptr nil)
-  (defvar tempstring nil)
+  (define widget-ptr nil)
+  (define label-ptr nil)
+  (define tempstring nil)
 
   (define (define-layout-type name fun) (put name 'nokogiri-layout fun))
 
@@ -139,10 +139,10 @@
 	      (when (< break (length doc))
 		(setq tempstring (substring doc (+ break 2)))	
 		(if (> (length tempstring) 0)
-		(progn
-		(setq label-ptr (make-label tempstring))
-		(gtk-box-pack-start hbox label-ptr)
-		(gtk-widget-relate-label widget-ptr label-ptr))))
+		    (progn
+		      (setq label-ptr (make-label tempstring))
+		      (gtk-box-pack-start hbox label-ptr)
+		      (gtk-widget-relate-label widget-ptr label-ptr))))
 	      (setq hbox (add-tooltip hbox))
 	      (gtk-widget-show-all hbox)
 	      hbox))))))
@@ -150,10 +150,10 @@
   (define (remove-newlines string)
     (let loop ((point 0)
 	       (out '()))
-      (if (string-match "\n" string point)
-	  (loop (match-end)
-		(list* #\space (substring string point (match-start)) out))
-	(apply concat (nreverse (cons (substring string point) out))))))
+	 (if (string-match "\n" string point)
+	     (loop (match-end)
+		   (list* #\space (substring string point (match-start)) out))
+	   (apply concat (nreverse (cons (substring string point) out))))))
   
   (define (make-label text)
     (let ((label (gtk-label-new text)))

Modified: trunk/lisp/sawfish/ui/layouts/keymaps.jl
==============================================================================
--- trunk/lisp/sawfish/ui/layouts/keymaps.jl	(original)
+++ trunk/lisp/sawfish/ui/layouts/keymaps.jl	Wed Apr  1 14:41:05 2009
@@ -31,7 +31,7 @@
 	  sawfish.ui.layout
 	  sawfish.gtk.widget)
 
-  (defvar label-ptr nil)
+  (define label-ptr nil)
 
   (define (keymap-slot-p slot)
     ;; XXX so fucking evil!

Modified: trunk/lisp/sawfish/wm/ext/match-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/match-window.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/match-window.jl	Wed Apr  1 14:41:05 2009
@@ -68,7 +68,6 @@
 
   (i18n-defvar match-window-properties
     `((placement ,(_ "Placement")
-       (avoid boolean)
        (ignore-program-position boolean)
        (place-mode ,(lambda () `(choice ,@placement-modes)))
        (position (pair number number))
@@ -88,6 +87,7 @@
        (frame-type ,(lambda () `(choice ,@(mapcar car match-window-types))))
        (frame-style ,(lambda () `(symbol ,@(find-all-frame-styles t)))))
       (state ,(_ "State")
+       (avoid boolean)
        (ignored boolean)
        (iconified boolean)
        (shaded boolean)

Modified: trunk/lisp/sawfish/wm/focus.jl
==============================================================================
--- trunk/lisp/sawfish/wm/focus.jl	(original)
+++ trunk/lisp/sawfish/wm/focus.jl	Wed Apr  1 14:41:05 2009
@@ -57,7 +57,7 @@
     :group focus)
 
   (defcustom focus-dont-push nil
-    "Wether focusing a window doesn't change it's position in the stack."
+    "Whether focusing a window doesn't change it's position in the stack."
     :type boolean
     :group focus)
 

Modified: trunk/lisp/sawfish/wm/state/maximize.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/maximize.jl	(original)
+++ trunk/lisp/sawfish/wm/state/maximize.jl	Wed Apr  1 14:41:05 2009
@@ -70,9 +70,6 @@
 
   (define-structure-alias maximize sawfish.wm.state.maximize)
 
-  ;; This sets the window property `unmaximized-geometry' of each
-  ;; currently maximize window to `(X Y W H)', the saved geometry.
-
   (defvar maximize-always-expands nil
     "Maximizing a window in one dimension must increase the size of that dimension.")
 
@@ -128,6 +125,8 @@
 	(rplacd dims (nth 3 old-geom)))
       dims))
 
+  ;; This sets the window property `unmaximized-geometry' of each
+  ;; currently maximize window to `(X Y W H)', the saved geometry.
   (define (save-unmaximized-geometry w)
     (unless (window-get w 'unmaximized-geometry)
       (let ((coords (window-position w))

Modified: trunk/lisp/sawfish/wm/util/compat.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/compat.jl	(original)
+++ trunk/lisp/sawfish/wm/util/compat.jl	Wed Apr  1 14:41:05 2009
@@ -104,8 +104,7 @@
 	  uniquify-name-format transients-get-focus decorate-transients
 	  raise-windows-on-uniconify uniconify-to-current-workspace
 	  uniconify-to-current-viewport iconify-ignored
-	  maximize-always-expands maximize-ignore-when-filling
-	  maximize-avoid-avoided focus-windows-on-uniconify
+	  focus-windows-on-uniconify
 	  transients-are-group-members raise-selected-windows
 	  warp-to-selected-windows menus-include-shortcuts
 	  configure-auto-gravity configure-ignore-stacking-requests

Modified: trunk/lisp/sawfish/wm/viewport.jl
==============================================================================
--- trunk/lisp/sawfish/wm/viewport.jl	(original)
+++ trunk/lisp/sawfish/wm/viewport.jl	Wed Apr  1 14:41:05 2009
@@ -70,7 +70,7 @@
     :range (1 . 50))
 
   (defcustom viewport-boundary-mode 'stop
-    "Wether to stop or wrap-around on first/last viewport"
+    "Whether to stop or wrap-around on first/last viewport"
     :group (workspace viewport)
     :type (choice wrap-around stop))
 

Modified: trunk/lisp/sawfish/wm/windows.jl
==============================================================================
--- trunk/lisp/sawfish/wm/windows.jl	(original)
+++ trunk/lisp/sawfish/wm/windows.jl	Wed Apr  1 14:41:05 2009
@@ -82,17 +82,17 @@
     :group (misc warp))
 
   (defcustom warp-to-window-enabled nil
-    "Wether to enable warping the cursor to windows."
+    "Whether to enable warping the cursor to windows."
     :type boolean
     :group (misc warp))
 
   (defcustom dont-avoid-ignored t
-    "Wether to not ignore avoided windows by default."
+    "Whether to not ignore avoided windows by default."
     :type boolean
     :group misc)
 
   (defcustom avoid-by-default nil
-    "Wether to avoid any unspecified window by default."
+    "Whether to avoid any unspecified window by default."
     :type boolean
     :group misc)
 

Modified: trunk/man/news.texi
==============================================================================
--- trunk/man/news.texi	(original)
+++ trunk/man/news.texi	Wed Apr  1 14:41:05 2009
@@ -20,6 +20,24 @@
 @item rep-gtk 0.18.3 -> 0.18.4
 @end itemize
 
+ item User visible changes:
+ itemize @minus
+ item Renamed ``sawmill'' to ``sawfish''
+
+If your @file{.sawfishrc} has a line @code{(require 'sawmill-defaults)},
+then change it to @code{(require 'sawfish-defaults)}.
+
+If your configuration file is named @code{~/.sawmillrc}, then rename it
+to @code{~/.sawfish/rc} or @code{~/.sawfishrc}.
+
+ item Configurator GUI's default style is tree view of categories.
+
+Configurator GUI (sawfish-ui) used to display categories in flat row,
+but now arranges them in tree diagram.
+
+To use the old style, put @code{(define-special-variable customize-program "sawfish-ui --flatten")} in your configuration file.
+ end itemize
+
 @item Bugs fixed:
 @itemize @minus
 
@@ -64,7 +82,7 @@
 @itemize @minus
 @item To build with XFree86/X.Org < 7.0 add --without-xorg-x11r7 flag [Christopher Bratusek]
 
- item Major Documentation update [Derek Upham]
+ item Major Documentation update [Derek Upham, Teika Kazura]
 
 @item New Sound Theme [glh Pimenta]
 
@@ -84,14 +102,14 @@
 
 @item Finally fully renamed from sawmill to sawfish [Christopher Bratusek]
 
- item Major configure script rework [Christopher Bratusek]
-
- item Don't ship config.sub config.guess and install-sh in $srcdir/etc [Christopher Bratusek]
-
 @item sawmill-defaults is now sawfish-defaults [Christopher Bratusek]
 
 @item ~/.sawmillrc has been dropped from the list of configuration files [Christopher Bratusek]
 
+ item Major configure script rework [Christopher Bratusek]
+
+ item Don't ship config.sub config.guess and install-sh in $srcdir/etc [Christopher Bratusek]
+
 @item Reworked Sawfish-UI [Christopher Bratusek]
 
 @item Dropped libgnome|gnomeui|gnomecanvas widgets, use pure gtk instead [Christopher Bratusek]
@@ -109,6 +127,10 @@
 @item Updated OPTIONS for all new options [Christopher Bratusek]
 
 @item Cleaned Up Makedefs.in [Christopher Bratusek]
+
+ item Move 'avoid' window-matcher from placement to state [Teika Kazura]
+
+ item Updated compat.jl [Teika Kazura]
 @end itemize
 @end itemize