sawfish r4403 - in trunk: . lisp/sawfish/wm lisp/sawfish/wm/ext

[chrisb svn gnome org]

Author: chrisb
Date: Sun Feb  8 18:29:16 2009
New Revision: 4403
URL: http://svn.gnome.org/viewvc/sawfish?rev=4403&view=rev

Log:
* lisp/sawfish/wm/ext/infinite-desktop.jl: remove dtm. prefix from functions

* lisp/sawfish/wm/frames.jl: fix an issue, that broke sawfish-ui



Modified:
   trunk/ChangeLog
   trunk/lisp/sawfish/wm/ext/infinite-desktop.jl
   trunk/lisp/sawfish/wm/frames.jl

Modified: trunk/lisp/sawfish/wm/ext/infinite-desktop.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/infinite-desktop.jl	(original)
+++ trunk/lisp/sawfish/wm/ext/infinite-desktop.jl	Sun Feb  8 18:29:16 2009
@@ -28,92 +28,92 @@
 ;; allows us to be imported multiple times safely.
 ;;
 
-(define (dtm.infinite-desktop.remove a l) 
+(define (infinite-desktop.remove a l) 
   (cond ((not l) nil)		
-	((eq a (car l)) (dtm.infinite-desktop.remove a (cdr l)))
-	(t (cons (car l) (dtm.infinite-desktop.remove a (cdr l))))))
+	((eq a (car l)) (infinite-desktop.remove a (cdr l)))
+	(t (cons (car l) (infinite-desktop.remove a (cdr l))))))
 
 (defgroup infinite-desktop (_"Infinite Desktop")
   :group workspace)
 
-(defcustom dtm.infinite-desktop-p 1
+(defcustom infinite-desktop-p 1
   (_"Simulate an infinite desktop (Conflicts edge-flipping).")
   :group (workspace infinite-desktop)
-  :after-set (lambda () (dtm.infinite-desktop.infinite-desktop))
+  :after-set (lambda () (infinite-desktop.infinite-desktop))
   :type boolean)
 
-(defcustom dtm.infinite-desktop.move-distance 64
+(defcustom infinite-desktop.move-distance 64
   (_"Amount to move the workspace.")
   :group (workspace infinite-desktop)
   :type number
   :range (1 . nil))
 
-(defcustom dtm.infinite-desktop.move-cursor-distance 32
+(defcustom infinite-desktop.move-cursor-distance 32
   (_"Amount to move the cursor after moving the workspace.")
   :group (workspace infinite-desktop)
   :type number
   :range (1 . nil))
 
-(defcustom dtm.infinite-desktop.stop-at-workspace-borders nil
+(defcustom infinite-desktop.stop-at-workspace-borders nil
   (_"Stop scrolling at workspace borders (Fixes warp-to-window bugs).")
   :group (workspace infinite-desktop)
   :type boolean )
 
-(define (dtm.infinite-desktop.move-right)
-  (let ((dist dtm.infinite-desktop.move-distance)
-	(cdist dtm.infinite-desktop.move-cursor-distance)
+(define (infinite-desktop.move-right)
+  (let ((dist infinite-desktop.move-distance)
+	(cdist infinite-desktop.move-cursor-distance)
 	(maxx (* (screen-width) (1- (car viewport-dimensions)))))
     (if 
-	(and dtm.infinite-desktop.stop-at-workspace-borders
+	(and infinite-desktop.stop-at-workspace-borders
 	     (> (+ dist viewport-x-offset) maxx))
 	(setq dist (- maxx viewport-x-offset)))
     (set-viewport (+ viewport-x-offset dist) viewport-y-offset)
     (move-cursor (- (min dist cdist)) 0)))
   
-(define (dtm.infinite-desktop.move-left)
-  (let ((dist (- dtm.infinite-desktop.move-distance))
-	(cdist (- dtm.infinite-desktop.move-cursor-distance))
+(define (infinite-desktop.move-left)
+  (let ((dist (- infinite-desktop.move-distance))
+	(cdist (- infinite-desktop.move-cursor-distance))
 	(minx 0))
     (if 
-	(and dtm.infinite-desktop.stop-at-workspace-borders
+	(and infinite-desktop.stop-at-workspace-borders
 	     (< (+ viewport-x-offset dist) minx))
 	(setq dist (- minx viewport-x-offset)))
     (set-viewport (+ viewport-x-offset dist) viewport-y-offset)
     (move-cursor (max dist cdist) 0)))
 
-(define (dtm.infinite-desktop.move-top)
-  (let ((dist (- dtm.infinite-desktop.move-distance))
-	(cdist (- dtm.infinite-desktop.move-cursor-distance))
+(define (infinite-desktop.move-top)
+  (let ((dist (- infinite-desktop.move-distance))
+	(cdist (- infinite-desktop.move-cursor-distance))
 	(miny 0))
     (if 
-	(and dtm.infinite-desktop.stop-at-workspace-borders
+	(and infinite-desktop.stop-at-workspace-borders
 	     (< (+ viewport-y-offset dist) miny))
 	(setq dist (- miny viewport-y-offset)))
     (set-viewport viewport-x-offset (+ viewport-y-offset dist))
     (move-cursor 0 (max dist cdist))))
 
-(define (dtm.infinite-desktop.move-bottom)
-  (let ((dist dtm.infinite-desktop.move-distance)
-	(cdist dtm.infinite-desktop.move-cursor-distance)
+(define (infinite-desktop.move-bottom)
+  (let ((dist infinite-desktop.move-distance)
+	(cdist infinite-desktop.move-cursor-distance)
 	(maxy (* (screen-height) (1- (cdr viewport-dimensions)))))
     (if 
-	(and dtm.infinite-desktop.stop-at-workspace-borders
+	(and infinite-desktop.stop-at-workspace-borders
 	     (> (+ dist viewport-y-offset) maxy))
 	(setq dist (- maxy viewport-y-offset)))
     (set-viewport viewport-x-offset (+ viewport-y-offset dist))
     (move-cursor 0 (- (min dist cdist)))))
 
-(define (dtm.infinite-desktop.enter-flipper-hook w)
-  (if dtm.infinite-desktop-p 
-      (cond ((eq w 'right) (dtm.infinite-desktop.move-right))
-	    ((eq w 'left) (dtm.infinite-desktop.move-left))
-	    ((eq w 'bottom) (dtm.infinite-desktop.move-bottom))
-	    ((eq w 'top) (dtm.infinite-desktop.move-top))
+(define (infinite-desktop.enter-flipper-hook w)
+  (if infinite-desktop-p 
+      (cond ((eq w 'right) (infinite-desktop.move-right))
+	    ((eq w 'left) (infinite-desktop.move-left))
+	    ((eq w 'bottom) (infinite-desktop.move-bottom))
+	    ((eq w 'top) (infinite-desktop.move-top))
 	    (t (display-message "move-unknown")))))
 
-(define (dtm.infinite-desktop.infinite-desktop) 
-  (if dtm.infinite-desktop-p 
+(define (infinite-desktop.infinite-desktop) 
+  (if infinite-desktop-p 
       (enable-flippers)))
 
 (unless batch-mode
-  (add-hook 'enter-flipper-hook dtm.infinite-desktop.enter-flipper-hook)))
+  (add-hook 'enter-flipper-hook infinite-desktop.enter-flipper-hook)))

Modified: trunk/lisp/sawfish/wm/frames.jl
==============================================================================
--- trunk/lisp/sawfish/wm/frames.jl	(original)
+++ trunk/lisp/sawfish/wm/frames.jl	Sun Feb  8 18:29:16 2009
@@ -133,7 +133,7 @@
     "Frame definition used for unframed windows.")
 
   (defcustom default-frame-style nil
-    (_"Default frame style:")
+    "Default frame style:"
     :type frame-style
     :widget-flags (expand-vertically)
     :group appearance