sawfish r4284 - in branches/sawfish-experimental: . lisp/sawfish/wm lisp/sawfish/wm/commands

[jkozicki svn gnome org]

Author: jkozicki
Date: Wed Sep 17 16:10:46 2008
New Revision: 4284
URL: http://svn.gnome.org/viewvc/sawfish?rev=4284&view=rev

Log:
Re-expose viewport bindings by Christopher Bratusek. Return of the Viewport bindings.




Modified:
   branches/sawfish-experimental/ChangeLog
   branches/sawfish-experimental/lisp/sawfish/wm/autoload.jl
   branches/sawfish-experimental/lisp/sawfish/wm/commands/viewport-linear.jl
   branches/sawfish-experimental/lisp/sawfish/wm/viewport.jl

Modified: branches/sawfish-experimental/lisp/sawfish/wm/autoload.jl
==============================================================================
--- branches/sawfish-experimental/lisp/sawfish/wm/autoload.jl	(original)
+++ branches/sawfish-experimental/lisp/sawfish/wm/autoload.jl	Wed Sep 17 16:10:46 2008
@@ -59,11 +59,11 @@
 (autoload-command (quote send-group-to-current-workspace) (quote sawfish.wm.commands.groups))
 (autoload-command (quote send-group-to-next-workspace) (quote sawfish.wm.commands.groups))
 (autoload-command (quote send-group-to-previous-workspace) (quote sawfish.wm.commands.groups))
-(autoload-command (quote move-group-to-current-viewport) (quote sawfish.wm.commands.groups) #:class 'viewport)
-(autoload-command (quote move-group-left) (quote sawfish.wm.commands.groups) #:class 'viewport)
-(autoload-command (quote move-group-right) (quote sawfish.wm.commands.groups) #:class 'viewport)
-(autoload-command (quote move-group-up) (quote sawfish.wm.commands.groups) #:class 'viewport)
-(autoload-command (quote move-group-down) (quote sawfish.wm.commands.groups) #:class 'viewport)
+(autoload-command (quote move-group-to-current-viewport) (quote sawfish.wm.commands.groups))
+(autoload-command (quote move-group-left) (quote sawfish.wm.commands.groups))
+(autoload-command (quote move-group-right) (quote sawfish.wm.commands.groups))
+(autoload-command (quote move-group-up) (quote sawfish.wm.commands.groups))
+(autoload-command (quote move-group-down) (quote sawfish.wm.commands.groups))
 (autoload-command (quote raise-group) (quote sawfish.wm.commands.groups) #:class 'advanced)
 (autoload-command (quote lower-group) (quote sawfish.wm.commands.groups) #:class 'advanced)
 (autoload-command (quote raise-lower-group) (quote sawfish.wm.commands.groups) #:class 'advanced)
@@ -152,30 +152,30 @@
 (autoload-command (quote quote-event) (quote sawfish.wm.util.keymap))
 (autoload-placement-mode 'top-left 'sawfish.wm.placement.top-left #:for-normal t)
 (autoload-placement-mode 'off-center 'sawfish.wm.placement.off-center)
-(autoload-command (quote set-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))) #:class 'viewport)
-(autoload-command (quote set-window-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))) #:class 'viewport)
-(autoload-command 'set-viewport-linear:1 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:1 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:2 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:2 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:3 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:3 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:4 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:4 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:5 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:5 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:6 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:6 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:7 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:7 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:8 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:8 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-viewport-linear:9 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command 'set-window-viewport-linear:9 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-(autoload-command (quote move-viewport-next) (quote sawfish.wm.commands.viewport-extras) #:class 'viewport)
-(autoload-command (quote move-viewport-previous) (quote sawfish.wm.commands.viewport-extras) #:class 'viewport)
-(autoload-command (quote move-window-previous) (quote sawfish.wm.commands.viewport-extras) #:class 'viewport)
-(autoload-command (quote move-window-next) (quote sawfish.wm.commands.viewport-extras) #:class 'viewport)
+(autoload-command (quote set-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))))
+(autoload-command (quote set-window-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))))
+(autoload-command 'set-viewport-linear:1 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:1 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:2 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:2 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:3 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:3 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:4 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:4 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:5 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:5 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:6 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:6 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:7 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:7 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:8 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:8 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:9 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:9 'sawfish.wm.commands.viewport-linear)
+(autoload-command (quote move-viewport-next) (quote sawfish.wm.commands.viewport-extras))
+(autoload-command (quote move-viewport-previous) (quote sawfish.wm.commands.viewport-extras))
+(autoload-command (quote move-window-previous) (quote sawfish.wm.commands.viewport-extras))
+(autoload-command (quote move-window-next) (quote sawfish.wm.commands.viewport-extras))
 (autoload-command (quote workspace-down) (quote sawfish.wm.ext.workspace-grid))
 (autoload-command (quote workspace-up) (quote sawfish.wm.ext.workspace-grid))
 (autoload-command (quote workspace-left) (quote sawfish.wm.ext.workspace-grid))

Modified: branches/sawfish-experimental/lisp/sawfish/wm/commands/viewport-linear.jl
==============================================================================
--- branches/sawfish-experimental/lisp/sawfish/wm/commands/viewport-linear.jl	(original)
+++ branches/sawfish-experimental/lisp/sawfish/wm/commands/viewport-linear.jl	Wed Sep 17 16:10:46 2008
@@ -49,7 +49,7 @@
   (define-command 'set-viewport-linear set-viewport-linear
     #:spec "NIndex:"
     #:type `(and (labelled ,(_ "Index:") (number 0)))
-    #:class 'viewport)
+    #:class 'default)
 
   ;; Move window to viewport INDEX using linear addressing
   (define (set-window-viewport-linear index)
@@ -61,7 +61,7 @@
   (define-command 'set-window-viewport-linear set-window-viewport-linear
     #:spec "NIndex:"
     #:type `(and (labelled ,(_ "Index:") (number 0)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (define-linear-viewport-commands index)
     (let ((fn (lambda (base)
@@ -81,21 +81,21 @@
       ((= i viewport-linear-last))
     (define-linear-viewport-commands i)))
 
-;;###autoload (autoload-command 'set-viewport-linear:1 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:1 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:2 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:2 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:3 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:3 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:4 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:4 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:5 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:5 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:6 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:6 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:7 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:7 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:8 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:8 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-viewport-linear:9 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
-;;###autoload (autoload-command 'set-window-viewport-linear:9 'sawfish.wm.commands.viewport-linear #:class 'deprecated)
+;;###autoload (autoload-command 'set-viewport-linear:1 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:1 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:2 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:2 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:3 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:3 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:4 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:4 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:5 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:5 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:6 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:6 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:7 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:7 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:8 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:8 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-viewport-linear:9 'sawfish.wm.commands.viewport-linear)
+;;###autoload (autoload-command 'set-window-viewport-linear:9 'sawfish.wm.commands.viewport-linear)

Modified: branches/sawfish-experimental/lisp/sawfish/wm/viewport.jl
==============================================================================
--- branches/sawfish-experimental/lisp/sawfish/wm/viewport.jl	(original)
+++ branches/sawfish-experimental/lisp/sawfish/wm/viewport.jl	Wed Sep 17 16:10:46 2008
@@ -238,7 +238,7 @@
     #:spec "NX:\nNY:"
     #:type `(and (labelled ,(_ "Column:") (number 1))
 		 (labelled ,(_ "Row:") (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (activate-viewport-column x)
     "Select the specified viewport column."
@@ -247,7 +247,7 @@
   (define-command 'activate-viewport-column activate-viewport-column
     #:spec "NX:"
     #:type `(and (labelled ,(_ "Column:") (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (activate-viewport-row y)
     "Select the specified viewport row."
@@ -256,7 +256,7 @@
   (define-command 'activate-viewport-row activate-viewport-row
     #:spec "NY:"
     #:type `(and (labelled ,(_ "Row:") (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (move-window-to-viewport x y)
     "Move the current window to the specified viewport."
@@ -265,7 +265,7 @@
   (define-command 'move-window-to-viewport move-window-to-viewport
     #:spec "NX:\nNY:"
     #:type '(and (labelled "X:" (number 1)) (labelled "Y:" (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (move-viewport-right)
     "Move the viewport one screen to the right."
@@ -312,14 +312,14 @@
     "Move the window to the viewport above, and switch to that viewport."
     (move-window-to-viewport-and-move-viewport w 0 -1))
 
-  (define-command 'move-viewport-right move-viewport-right #:class 'viewport)
-  (define-command 'move-viewport-left move-viewport-left #:class 'viewport)
-  (define-command 'move-viewport-up move-viewport-up #:class 'viewport)
-  (define-command 'move-viewport-down move-viewport-down #:class 'viewport)
-  (define-command 'move-window-right move-window-right #:spec "%W" #:class 'viewport)
-  (define-command 'move-window-left move-window-left #:spec "%W" #:class 'viewport)
-  (define-command 'move-window-up move-window-up #:spec "%W" #:class 'viewport)
-  (define-command 'move-window-down move-window-down #:spec "%W" #:class 'viewport)
+  (define-command 'move-viewport-right move-viewport-right)
+  (define-command 'move-viewport-left move-viewport-left)
+  (define-command 'move-viewport-up move-viewport-up)
+  (define-command 'move-viewport-down move-viewport-down)
+  (define-command 'move-window-right move-window-right #:spec "%W")
+  (define-command 'move-window-left move-window-left #:spec "%W")
+  (define-command 'move-window-up move-window-up #:spec "%W")
+  (define-command 'move-window-down move-window-down #:spec "%W")
 
 
 ;;; session management, config