[clfswm-cvs] CVS clfswm
pbrochard
pbrochard at common-lisp.net
Sat Dec 22 22:55:27 UTC 2007
Update of /project/clfswm/cvsroot/clfswm
In directory clnet:/tmp/cvs-serv26867
Modified Files:
ChangeLog bindings-pager.lisp bindings-second-mode.lisp
bindings.lisp clfswm-keys.lisp clfswm-pager.lisp
clfswm-util.lisp clfswm.asd dot-clfswmrc keys.html keys.txt
Log Message:
typo and undefine-*-multi-key new macro
--- /project/clfswm/cvsroot/clfswm/ChangeLog 2007/08/26 21:08:16 1.3
+++ /project/clfswm/cvsroot/clfswm/ChangeLog 2007/12/22 22:55:26 1.4
@@ -1,3 +1,11 @@
+2007-12-22 Philippe Brochard <hocwp at free.fr>
+
+ * clfswm-keys.lisp (define-define-key): undefine-*-multi-name: new macro.
+ * clfswm: Color change for the pager. Typo or better description
+ in bindings definitions. Define bindings for a qwerty keyboard by
+ default. dot-clfswmrc show examples to switch to an azerty keyboard.
+ * config.lisp: new file - group all globals variables in this file.
+
2007-08-26 Philippe Brochard <hocwp at free.fr>
* xlib-util.lisp (hide-window): Remove structure-notivy events
--- /project/clfswm/cvsroot/clfswm/bindings-pager.lisp 2007/12/21 23:45:56 1.4
+++ /project/clfswm/cvsroot/clfswm/bindings-pager.lisp 2007/12/22 22:55:26 1.5
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Sat Dec 22 00:35:03 2007
+;;; #Date#: Sat Dec 22 23:31:47 2007
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Bindings keys and mouse for pager mode
@@ -38,7 +38,7 @@
(define-pager-key (#\g :control)
(defun b-pager-stop-all-pending-actions ()
- "Stop all pending actions (like open in new workspace/group)"
+ "Stop all pending actions (actions like open in new workspace/group)"
(stop-all-pending-actions)
(pager-draw-display)))
@@ -260,19 +260,19 @@
(pager-select-workspace-by-number ,number))))
-(define-pager-focus-workspace-by-number ("1" :mod-1) 1)
-(define-pager-focus-workspace-by-number ("2" :mod-1) 2)
-(define-pager-focus-workspace-by-number ("3" :mod-1) 3)
-(define-pager-focus-workspace-by-number ("4" :mod-1) 4)
-(define-pager-focus-workspace-by-number ("5" :mod-1) 5)
-(define-pager-focus-workspace-by-number ("6" :mod-1) 6)
-(define-pager-focus-workspace-by-number ("7" :mod-1) 7)
-(define-pager-focus-workspace-by-number ("8" :mod-1) 8)
-(define-pager-focus-workspace-by-number ("9" :mod-1) 9)
-(define-pager-focus-workspace-by-number ("0" :mod-1) 10)
+(define-pager-focus-workspace-by-number (#\1 :mod-1) 1)
+(define-pager-focus-workspace-by-number (#\2 :mod-1) 2)
+(define-pager-focus-workspace-by-number (#\3 :mod-1) 3)
+(define-pager-focus-workspace-by-number (#\4 :mod-1) 4)
+(define-pager-focus-workspace-by-number (#\5 :mod-1) 5)
+(define-pager-focus-workspace-by-number (#\6 :mod-1) 6)
+(define-pager-focus-workspace-by-number (#\7 :mod-1) 7)
+(define-pager-focus-workspace-by-number (#\8 :mod-1) 8)
+(define-pager-focus-workspace-by-number (#\9 :mod-1) 9)
+(define-pager-focus-workspace-by-number (#\0 :mod-1) 10)
-(define-pager-key ("1" :control :mod-1) 'pager-renumber-workspaces)
-(define-pager-key ("2" :control :mod-1) 'pager-sort-workspaces)
+(define-pager-key (#\1 :control :mod-1) 'pager-renumber-workspaces)
+(define-pager-key (#\2 :control :mod-1) 'pager-sort-workspaces)
--- /project/clfswm/cvsroot/clfswm/bindings-second-mode.lisp 2007/12/21 23:45:56 1.4
+++ /project/clfswm/cvsroot/clfswm/bindings-second-mode.lisp 2007/12/22 22:55:26 1.5
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Sat Dec 22 00:31:08 2007
+;;; #Date#: Sat Dec 22 23:31:58 2007
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Bindings keys and mouse for second mode
@@ -113,19 +113,19 @@
,(format nil "Focus workspace ~A" number)
(circulate-workspace-by-number ,number))))
-(define-second-focus-workspace-by-number ("1" :mod-1) 1)
-(define-second-focus-workspace-by-number ("2" :mod-1) 2)
-(define-second-focus-workspace-by-number ("3" :mod-1) 3)
-(define-second-focus-workspace-by-number ("4" :mod-1) 4)
-(define-second-focus-workspace-by-number ("5" :mod-1) 5)
-(define-second-focus-workspace-by-number ("6" :mod-1) 6)
-(define-second-focus-workspace-by-number ("7" :mod-1) 7)
-(define-second-focus-workspace-by-number ("8" :mod-1) 8)
-(define-second-focus-workspace-by-number ("9" :mod-1) 9)
-(define-second-focus-workspace-by-number ("0" :mod-1) 10)
+(define-second-focus-workspace-by-number (#\1 :mod-1) 1)
+(define-second-focus-workspace-by-number (#\2 :mod-1) 2)
+(define-second-focus-workspace-by-number (#\3 :mod-1) 3)
+(define-second-focus-workspace-by-number (#\4 :mod-1) 4)
+(define-second-focus-workspace-by-number (#\5 :mod-1) 5)
+(define-second-focus-workspace-by-number (#\6 :mod-1) 6)
+(define-second-focus-workspace-by-number (#\7 :mod-1) 7)
+(define-second-focus-workspace-by-number (#\8 :mod-1) 8)
+(define-second-focus-workspace-by-number (#\9 :mod-1) 9)
+(define-second-focus-workspace-by-number (#\0 :mod-1) 10)
-(define-second-key ("1" :control :mod-1) 'renumber-workspaces)
-(define-second-key ("2" :control :mod-1) 'sort-workspaces)
+(define-second-key (#\1 :control :mod-1) 'renumber-workspaces)
+(define-second-key (#\2 :control :mod-1) 'sort-workspaces)
@@ -442,7 +442,7 @@
(defun move-selected-group (root-x root-y)
- "Move selected group or create a new group"
+ "Move selected group or create a new group on the root window"
(select-group-under-mouse root-x root-y)
(setf *motion-object* (find-group-under-mouse root-x root-y))
(if *motion-object*
--- /project/clfswm/cvsroot/clfswm/bindings.lisp 2007/12/21 23:45:56 1.4
+++ /project/clfswm/cvsroot/clfswm/bindings.lisp 2007/12/22 22:55:26 1.5
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Fri Dec 21 23:52:03 2007
+;;; #Date#: Sat Dec 22 23:30:51 2007
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Bindings keys and mouse
@@ -90,14 +90,14 @@
,(format nil "Focus workspace ~A" number)
(circulate-workspace-by-number ,number))))
-(define-main-focus-workspace-by-number ("1" :mod-1) 1)
-(define-main-focus-workspace-by-number ("2" :mod-1) 2)
-(define-main-focus-workspace-by-number ("3" :mod-1) 3)
-(define-main-focus-workspace-by-number ("4" :mod-1) 4)
-(define-main-focus-workspace-by-number ("5" :mod-1) 5)
-(define-main-focus-workspace-by-number ("6" :mod-1) 6)
-(define-main-focus-workspace-by-number ("7" :mod-1) 7)
-(define-main-focus-workspace-by-number ("8" :mod-1) 8)
-(define-main-focus-workspace-by-number ("9" :mod-1) 9)
-(define-main-focus-workspace-by-number ("0" :mod-1) 10)
+(define-main-focus-workspace-by-number (#\1 :mod-1) 1)
+(define-main-focus-workspace-by-number (#\2 :mod-1) 2)
+(define-main-focus-workspace-by-number (#\3 :mod-1) 3)
+(define-main-focus-workspace-by-number (#\4 :mod-1) 4)
+(define-main-focus-workspace-by-number (#\5 :mod-1) 5)
+(define-main-focus-workspace-by-number (#\6 :mod-1) 6)
+(define-main-focus-workspace-by-number (#\7 :mod-1) 7)
+(define-main-focus-workspace-by-number (#\8 :mod-1) 8)
+(define-main-focus-workspace-by-number (#\9 :mod-1) 9)
+(define-main-focus-workspace-by-number (#\0 :mod-1) 10)
--- /project/clfswm/cvsroot/clfswm/clfswm-keys.lisp 2007/12/21 22:01:14 1.3
+++ /project/clfswm/cvsroot/clfswm/clfswm-keys.lisp 2007/12/22 22:55:26 1.4
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Fri Dec 21 23:00:11 2007
+;;; #Date#: Sat Dec 22 22:52:07 2007
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Keys functions definition
@@ -44,7 +44,8 @@
(defmacro define-define-key (name hashtable)
(let ((name-key-fun (create-symbol "define-" name "-key-fun"))
(name-key (create-symbol "define-" name "-key"))
- (undefine-name (create-symbol "undefine-" name "-key")))
+ (undefine-name (create-symbol "undefine-" name "-key"))
+ (undefine-multi-name (create-symbol "undefine-" name "-multi-keys")))
`(progn
(defun ,name-key-fun (key function &optional keystring)
"Define a new key, a key is '(char '(modifier list))"
@@ -54,8 +55,12 @@
`(,',name-key-fun (list ,key ,(modifiers->state modifiers)) ,function ,keystring))
(defmacro ,undefine-name ((key &rest modifiers))
- `(remhash (list ,key ,(modifiers->state modifiers)) ,',hashtable)))))
+ `(remhash (list ,key ,(modifiers->state modifiers)) ,',hashtable))
+ (defmacro ,undefine-multi-name (&rest keys)
+ `(progn
+ ,@(loop for k in keys
+ collect `(,',undefine-name ,k)))))))
(defmacro define-define-mouse (name hashtable)
@@ -80,6 +85,13 @@
(define-define-key "pager" *pager-keys*)
(define-define-key "info" *info-keys*)
+
+
+
+;;(defun undefine-main-keys (&rest keys)
+;; (dolist (k keys)
+;; (undefine-main-key k)))
+
(defun undefine-info-key-fun (key)
(remhash key *info-keys*))
--- /project/clfswm/cvsroot/clfswm/clfswm-pager.lisp 2007/12/21 22:01:14 1.3
+++ /project/clfswm/cvsroot/clfswm/clfswm-pager.lisp 2007/12/22 22:55:26 1.4
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Fri Dec 21 23:00:16 2007
+;;; #Date#: Sat Dec 22 23:49:48 2007
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Main functions
@@ -304,7 +304,7 @@
(defun pager-renumber-workspaces ()
- "Reset workspaces numbers"
+ "Reset workspaces numbers (1 for current workspace, 2 for the second...) "
(dotimes (i (pcursor-workspace *pcursor*))
(setf *workspace-list* (rotate-list *workspace-list*)))
(setf *current-workspace-number* 0)
--- /project/clfswm/cvsroot/clfswm/clfswm-util.lisp 2007/12/21 22:01:14 1.3
+++ /project/clfswm/cvsroot/clfswm/clfswm-util.lisp 2007/12/22 22:55:26 1.4
@@ -1,7 +1,7 @@
;;; --------------------------------------------------------------------------
;;; CLFSWM - FullScreen Window Manager
;;;
-;;; #Date#: Fri Dec 21 23:00:22 2007
+;;; #Date#: Sat Dec 22 23:15:43 2007
;;;
;;; --------------------------------------------------------------------------
;;; Documentation: Utility
@@ -32,7 +32,7 @@
;;;| Various definitions
;;;`-----
(defun stop-all-pending-actions ()
- "Stop all pending actions (like open in new workspace/group)"
+ "Stop all pending actions (actions like open in new workspace/group)"
(setf *open-next-window-in-new-workspace* nil
*open-next-window-in-new-group* nil
*arrow-action* nil
@@ -89,7 +89,7 @@
(defun renumber-workspaces ()
- "Reset workspaces numbers"
+ "Reset workspaces numbers (1 for current workspace, 2 for the second...) "
(hide-all-windows-in-workspace (current-workspace))
(setf *current-workspace-number* 0)
(loop for workspace in *workspace-list* do
@@ -596,7 +596,7 @@
(defun eval-from-query-string ()
- "Eval a lisp form from the query input"
+ "Eval a lisp form the query input"
(let ((form (query-string "Eval:"))
(result nil))
(when (and form (not (equal form "")))
--- /project/clfswm/cvsroot/clfswm/clfswm.asd 2007/12/21 22:38:14 1.3
+++ /project/clfswm/cvsroot/clfswm/clfswm.asd 2007/12/22 22:55:26 1.4
@@ -2,7 +2,7 @@
;;;; Author: Philippe Brochard <hocwp at free.fr>
;;;; ASDF System Definition
;;;
-;;; #date#: Fri Dec 21 23:30:21 2007
+;;; #date#: Sat Dec 22 22:26:18 2007
(in-package #:asdf)
@@ -25,13 +25,13 @@
(:file "keysyms"
:depends-on ("package"))
(:file "clfswm-keys"
- :depends-on ("package" "xlib-util" "keysyms"))
+ :depends-on ("package" "config" "xlib-util" "keysyms"))
(:file "clfswm-internal"
:depends-on ("xlib-util" "clfswm-keys" "netwm-util"))
(:file "clfswm-second-mode"
:depends-on ("package" "clfswm-internal"))
(:file "clfswm"
- :depends-on ("xlib-util" "netwm-util" "clfswm-keys"
+ :depends-on ("xlib-util" "netwm-util" "clfswm-keys" "config"
"clfswm-internal" "clfswm-second-mode" "tools"))
(:file "clfswm-util"
:depends-on ("clfswm" "keysyms"))
--- /project/clfswm/cvsroot/clfswm/dot-clfswmrc 2007/12/21 23:45:56 1.3
+++ /project/clfswm/cvsroot/clfswm/dot-clfswmrc 2007/12/22 22:55:26 1.4
@@ -83,8 +83,8 @@
-;;;;;; Azerty keyboard configuration (first remove keys, then rebind)
-;;;; Main mode
+;;;; Azerty keyboard configuration (first remove keys, then rebind)
+;; Main mode
;;(undefine-main-key (#\t :mod-1))
;;(undefine-main-key (#\b :mod-1))
;;(undefine-main-key (#\b :mod-1 :control))
@@ -98,98 +98,81 @@
;;(undefine-main-key ("8" :mod-1))
;;(undefine-main-key ("9" :mod-1))
;;(undefine-main-key ("0" :mod-1))
-;;
-;;
-;;(define-main-key (#\< :control) 'second-key-mode)
-;;
-;;(define-main-key ("twosuperior") 'banish-pointer)
-;;(define-main-key ("twosuperior" :mod-1) 'toggle-maximize-current-group)
-;;
-;;(define-main-key ("ampersand" :mod-1) 'b-main-focus-workspace-1)
-;;(define-main-key ("eacute" :mod-1) 'b-main-focus-workspace-2)
-;;(define-main-key ("quotedbl" :mod-1) 'b-main-focus-workspace-3)
-;;(define-main-key ("quoteright" :mod-1) 'b-main-focus-workspace-4)
-;;(define-main-key ("parenleft" :mod-1) 'b-main-focus-workspace-5)
-;;(define-main-key ("minus" :mod-1) 'b-main-focus-workspace-6)
-;;(define-main-key ("egrave" :mod-1) 'b-main-focus-workspace-7)
-;;(define-main-key ("underscore" :mod-1) 'b-main-focus-workspace-8)
-;;(define-main-key ("ccedilla" :mod-1) 'b-main-focus-workspace-9)
-;;(define-main-key ("agrave" :mod-1) 'b-main-focus-workspace-10)
-;;
-;;;; Second mode
-;;(undefine-second-key (#\t))
-;;(undefine-second-key (#\b))
-;;(undefine-second-key (#\b :mod-1))
-;;(undefine-second-key ("1" :mod-1))
-;;(undefine-second-key ("2" :mod-1))
-;;(undefine-second-key ("3" :mod-1))
-;;(undefine-second-key ("4" :mod-1))
-;;(undefine-second-key ("5" :mod-1))
-;;(undefine-second-key ("6" :mod-1))
-;;(undefine-second-key ("7" :mod-1))
-;;(undefine-second-key ("8" :mod-1))
-;;(undefine-second-key ("9" :mod-1))
-;;(undefine-second-key ("0" :mod-1))
-;;(undefine-second-key ("1" :control :mod-1))
-;;(undefine-second-key ("2" :control :mod-1))
-;;
-;;
-;;
-;;(define-second-key (#\<) 'leave-second-mode-maximize)
-;;
-;;
-;;(define-second-key ("ampersand" :mod-1) 'b-second-focus-workspace-1)
-;;(define-second-key ("eacute" :mod-1) 'b-second-focus-workspace-2)
-;;(define-second-key ("quotedbl" :mod-1) 'b-second-focus-workspace-3)
-;;(define-second-key ("quoteright" :mod-1) 'b-second-focus-workspace-4)
-;;(define-second-key ("parenleft" :mod-1) 'b-second-focus-workspace-5)
-;;(define-second-key ("minus" :mod-1) 'b-second-focus-workspace-6)
-;;(define-second-key ("egrave" :mod-1) 'b-second-focus-workspace-7)
-;;(define-second-key ("underscore" :mod-1) 'b-second-focus-workspace-8)
-;;(define-second-key ("ccedilla" :mod-1) 'b-second-focus-workspace-9)
-;;(define-second-key ("agrave" :mod-1) 'b-second-focus-workspace-10)
-;;
-;;(define-second-key ("ampersand" :control :mod-1) 'renumber-workspaces)
-;;(define-second-key ("eacute" :control :mod-1) 'sort-workspaces)
-;;
-;;
-;;(define-second-key ("twosuperior") 'banish-pointer)
-;;(define-second-key ("twosuperior" :mod-1) 'toggle-maximize-current-group)
-;;
-;;(define-second-key (#\t) 'tile-current-workspace-vertically)
-;;(define-second-key (#\t :shift) 'tile-current-workspace-horizontally)
-;;
-;;;; Pager mode
-;;(undefine-pager-key (#\b))
-;;(undefine-pager-key ("1" :mod-1))
-;;(undefine-pager-key ("2" :mod-1))
-;;(undefine-pager-key ("3" :mod-1))
-;;(undefine-pager-key ("4" :mod-1))
-;;(undefine-pager-key ("5" :mod-1))
-;;(undefine-pager-key ("6" :mod-1))
-;;(undefine-pager-key ("7" :mod-1))
-;;(undefine-pager-key ("8" :mod-1))
-;;(undefine-pager-key ("9" :mod-1))
-;;(undefine-pager-key ("0" :mod-1))
-;;(undefine-pager-key ("1" :control :mod-1))
-;;(undefine-pager-key ("2" :control :mod-1))
-;;
-;;
-;;(define-pager-key ("twosuperior") 'banish-pointer)
-;;
-;;(define-pager-key ("ampersand" :mod-1) 'b-pager-focus-workspace-1)
-;;(define-pager-key ("eacute" :mod-1) 'b-pager-focus-workspace-2)
-;;(define-pager-key ("quotedbl" :mod-1) 'b-pager-focus-workspace-3)
-;;(define-pager-key ("quoteright" :mod-1) 'b-pager-focus-workspace-4)
-;;(define-pager-key ("parenleft" :mod-1) 'b-pager-focus-workspace-5)
-;;(define-pager-key ("minus" :mod-1) 'b-pager-focus-workspace-6)
-;;(define-pager-key ("egrave" :mod-1) 'b-pager-focus-workspace-7)
-;;(define-pager-key ("underscore" :mod-1) 'b-pager-focus-workspace-8)
-;;(define-pager-key ("ccedilla" :mod-1) 'b-pager-focus-workspace-9)
-;;(define-pager-key ("agrave" :mod-1) 'b-pager-focus-workspace-10)
-;;
-;;(define-pager-key ("ampersand" :control :mod-1) 'pager-renumber-workspaces)
-;;(define-pager-key ("eacute" :control :mod-1) 'pager-sort-workspaces)
+;; Or better:
+(undefine-main-multi-keys (#\t :mod-1) (#\b :mod-1) (#\b :mod-1 :control)
+ ("1" :mod-1) ("2" :mod-1) ("3" :mod-1)
+ ("4" :mod-1) ("5" :mod-1) ("6" :mod-1)
+ ("7" :mod-1) ("8" :mod-1) ("9" :mod-1) ("0" :mod-1))
+
+(define-main-key (#\< :control) 'second-key-mode)
+
+(define-main-key ("twosuperior") 'banish-pointer)
+(define-main-key ("twosuperior" :mod-1) 'toggle-maximize-current-group)
+
+(define-main-key ("ampersand" :mod-1) 'b-main-focus-workspace-1)
+(define-main-key ("eacute" :mod-1) 'b-main-focus-workspace-2)
+(define-main-key ("quotedbl" :mod-1) 'b-main-focus-workspace-3)
+(define-main-key ("quoteright" :mod-1) 'b-main-focus-workspace-4)
+(define-main-key ("parenleft" :mod-1) 'b-main-focus-workspace-5)
+(define-main-key ("minus" :mod-1) 'b-main-focus-workspace-6)
+(define-main-key ("egrave" :mod-1) 'b-main-focus-workspace-7)
+(define-main-key ("underscore" :mod-1) 'b-main-focus-workspace-8)
+(define-main-key ("ccedilla" :mod-1) 'b-main-focus-workspace-9)
+(define-main-key ("agrave" :mod-1) 'b-main-focus-workspace-10)
+
+;; Second mode
+(undefine-second-multi-keys (#\t) (#\b) (#\b :mod-1)
+ ("1" :mod-1) ("2" :mod-1) ("3" :mod-1)
+ ("4" :mod-1) ("5" :mod-1) ("6" :mod-1)
+ ("7" :mod-1) ("8" :mod-1) ("9" :mod-1) ("0" :mod-1)
+ ("1" :control :mod-1) ("2" :control :mod-1))
+
+(define-second-key (#\<) 'leave-second-mode-maximize)
+
+
+(define-second-key ("ampersand" :mod-1) 'b-second-focus-workspace-1)
+(define-second-key ("eacute" :mod-1) 'b-second-focus-workspace-2)
+(define-second-key ("quotedbl" :mod-1) 'b-second-focus-workspace-3)
+(define-second-key ("quoteright" :mod-1) 'b-second-focus-workspace-4)
+(define-second-key ("parenleft" :mod-1) 'b-second-focus-workspace-5)
+(define-second-key ("minus" :mod-1) 'b-second-focus-workspace-6)
+(define-second-key ("egrave" :mod-1) 'b-second-focus-workspace-7)
+(define-second-key ("underscore" :mod-1) 'b-second-focus-workspace-8)
+(define-second-key ("ccedilla" :mod-1) 'b-second-focus-workspace-9)
+(define-second-key ("agrave" :mod-1) 'b-second-focus-workspace-10)
+
+(define-second-key ("ampersand" :control :mod-1) 'renumber-workspaces)
+(define-second-key ("eacute" :control :mod-1) 'sort-workspaces)
+
+
+(define-second-key ("twosuperior") 'banish-pointer)
+(define-second-key ("twosuperior" :mod-1) 'toggle-maximize-current-group)
+
+(define-second-key (#\t) 'tile-current-workspace-vertically)
+(define-second-key (#\t :shift) 'tile-current-workspace-horizontally)
+
+;; Pager mode
+(undefine-pager-multi-keys (#\b)
+ ("1" :mod-1) ("2" :mod-1) ("3" :mod-1)
+ ("4" :mod-1) ("5" :mod-1) ("6" :mod-1)
+ ("7" :mod-1) ("8" :mod-1) ("9" :mod-1) ("0" :mod-1)
+ ("1" :control :mod-1) ("2" :control :mod-1))
+
+(define-pager-key ("twosuperior") 'banish-pointer)
+
+(define-pager-key ("ampersand" :mod-1) 'b-pager-focus-workspace-1)
+(define-pager-key ("eacute" :mod-1) 'b-pager-focus-workspace-2)
+(define-pager-key ("quotedbl" :mod-1) 'b-pager-focus-workspace-3)
+(define-pager-key ("quoteright" :mod-1) 'b-pager-focus-workspace-4)
+(define-pager-key ("parenleft" :mod-1) 'b-pager-focus-workspace-5)
+(define-pager-key ("minus" :mod-1) 'b-pager-focus-workspace-6)
+(define-pager-key ("egrave" :mod-1) 'b-pager-focus-workspace-7)
+(define-pager-key ("underscore" :mod-1) 'b-pager-focus-workspace-8)
+(define-pager-key ("ccedilla" :mod-1) 'b-pager-focus-workspace-9)
+(define-pager-key ("agrave" :mod-1) 'b-pager-focus-workspace-10)
+
+(define-pager-key ("ampersand" :control :mod-1) 'pager-renumber-workspaces)
+(define-pager-key ("eacute" :control :mod-1) 'pager-sort-workspaces)
--- /project/clfswm/cvsroot/clfswm/keys.html 2007/05/15 19:49:51 1.1
+++ /project/clfswm/cvsroot/clfswm/keys.html 2007/12/22 22:55:26 1.2
@@ -54,10 +54,10 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control
+ Mod-1
</td>
<td align="center" nowrap>
- <
+ T
</td>
<td style="color:#0000ff" nowrap>
Switch to editing mode
@@ -87,10 +87,10 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
-
+ Mod-1
</td>
<td align="center" nowrap>
- Twosuperior
+ B
</td>
<td style="color:#0000ff" nowrap>
Move the pointer to the lower right corner of the screen
@@ -98,10 +98,10 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Mod-1
+ Mod-1 Control
</td>
<td align="center" nowrap>
- Twosuperior
+ B
</td>
<td style="color:#0000ff" nowrap>
Maximize/minimize the current group
@@ -288,7 +288,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ampersand
+ 1
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 1
@@ -299,7 +299,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Eacute
+ 2
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 2
@@ -310,7 +310,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quotedbl
+ 3
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 3
@@ -321,7 +321,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quoteright
+ 4
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 4
@@ -332,7 +332,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Parenleft
+ 5
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 5
@@ -343,7 +343,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Minus
+ 6
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 6
@@ -354,7 +354,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Egrave
+ 7
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 7
@@ -365,7 +365,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Underscore
+ 8
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 8
@@ -376,7 +376,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ccedilla
+ 9
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 9
@@ -387,7 +387,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Agrave
+ 0
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 10
@@ -430,7 +430,7 @@
G
</td>
<td style="color:#0000ff" nowrap>
- Stop all pending actions (like open in new workspace/group)
+ Stop all pending actions (actions like open in new workspace/group)
</td>
</tr>
<tr>
@@ -452,7 +452,7 @@
:
</td>
<td style="color:#0000ff" nowrap>
- Eval a lisp form from the query input
+ Eval a lisp form the query input
</td>
</tr>
<tr>
@@ -471,7 +471,7 @@
</td>
<td align="center" nowrap>
- <
+ T
</td>
<td style="color:#0000ff" nowrap>
Leave second mode and maximize current group
@@ -702,7 +702,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ampersand
+ 1
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 1
@@ -713,7 +713,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Eacute
+ 2
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 2
@@ -724,7 +724,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quotedbl
+ 3
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 3
@@ -735,7 +735,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quoteright
+ 4
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 4
@@ -746,7 +746,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Parenleft
+ 5
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 5
@@ -757,7 +757,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Minus
+ 6
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 6
@@ -768,7 +768,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Egrave
+ 7
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 7
@@ -779,7 +779,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Underscore
+ 8
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 8
@@ -790,7 +790,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ccedilla
+ 9
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 9
@@ -801,7 +801,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Agrave
+ 0
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 10
@@ -812,10 +812,10 @@
Mod-1 Control
</td>
<td align="center" nowrap>
- Ampersand
+ 1
</td>
<td style="color:#0000ff" nowrap>
- Reset workspaces numbers
+ Reset workspaces numbers (1 for current workspace, 2 for the second...)
</td>
</tr>
<tr>
@@ -823,7 +823,7 @@
Mod-1 Control
</td>
<td align="center" nowrap>
- Eacute
+ 2
</td>
<td style="color:#0000ff" nowrap>
Sort workspaces by numbers
@@ -856,7 +856,7 @@
</td>
<td align="center" nowrap>
- Twosuperior
+ B
</td>
<td style="color:#0000ff" nowrap>
Move the pointer to the lower right corner of the screen
@@ -867,7 +867,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Twosuperior
+ B
</td>
<td style="color:#0000ff" nowrap>
Maximize/minimize the current group
@@ -1073,7 +1073,7 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
-
+ Control
</td>
<td align="center" nowrap>
T
@@ -1084,7 +1084,7 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Shift
+ Control Shift
</td>
<td align="center" nowrap>
T
@@ -1350,7 +1350,7 @@
1
</td>
<td style="color:#0000ff" nowrap>
- Move selected group or create a new group
+ Move selected group or create a new group on the root window
</td>
</tr>
<tr>
@@ -1512,7 +1512,7 @@
G
</td>
<td style="color:#0000ff" nowrap>
- Stop all pending actions (like open in new workspace/group)
+ Stop all pending actions (actions like open in new workspace/group)
</td>
</tr>
<tr>
@@ -1542,7 +1542,7 @@
</td>
<td align="center" nowrap>
- Twosuperior
+ B
</td>
<td style="color:#0000ff" nowrap>
Move the pointer to the lower right corner of the screen
@@ -2114,7 +2114,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ampersand
+ 1
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 1
@@ -2125,7 +2125,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Eacute
+ 2
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 2
@@ -2136,7 +2136,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quotedbl
+ 3
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 3
@@ -2147,7 +2147,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quoteright
+ 4
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 4
@@ -2158,7 +2158,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Parenleft
+ 5
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 5
@@ -2169,7 +2169,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Minus
+ 6
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 6
@@ -2180,7 +2180,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Egrave
+ 7
</td>
<td style="color:#0000ff" nowrap>
Focus workspace 7
@@ -2191,7 +2191,7 @@
Mod-1
</td>
<td align="center" nowrap>
[45 lines skipped]
--- /project/clfswm/cvsroot/clfswm/keys.txt 2007/05/15 19:49:51 1.1
+++ /project/clfswm/cvsroot/clfswm/keys.txt 2007/12/22 22:55:26 1.2
@@ -8,11 +8,11 @@
Mod-1 F1 Open the help and info window
Mod-1 Control Shift Home Quit clfswm
-Control < Switch to editing mode
+Mod-1 T Switch to editing mode
Mod-1 Tab Rotate up windows in the current group
Mod-1 Shift Tab Rotate down windows in the current group
- Twosuperior Move the pointer to the lower right corner of the screen
-Mod-1 Twosuperior Maximize/minimize the current group
+Mod-1 B Move the pointer to the lower right corner of the screen
+Mod-1 Control B Maximize/minimize the current group
Control Shift Escape Delete the current window in all groups and workspaces
Mod-1 Control Shift Escape Destroy the current window in all groups and workspaces
Control Escape Remove the current window in the current group
@@ -29,27 +29,27 @@
Mod-1 Left Circulate down in workspace
Mod-1 Shift Left Circulate down in workspace moving current group in the next workspace
Mod-1 Control Shift Left Circulate down in workspace copying current group in the next workspace
-Mod-1 Ampersand Focus workspace 1
-Mod-1 Eacute Focus workspace 2
-Mod-1 Quotedbl Focus workspace 3
-Mod-1 Quoteright Focus workspace 4
-Mod-1 Parenleft Focus workspace 5
-Mod-1 Minus Focus workspace 6
-Mod-1 Egrave Focus workspace 7
-Mod-1 Underscore Focus workspace 8
-Mod-1 Ccedilla Focus workspace 9
-Mod-1 Agrave Focus workspace 10
+Mod-1 1 Focus workspace 1
+Mod-1 2 Focus workspace 2
+Mod-1 3 Focus workspace 3
+Mod-1 4 Focus workspace 4
+Mod-1 5 Focus workspace 5
+Mod-1 6 Focus workspace 6
+Mod-1 7 Focus workspace 7
+Mod-1 8 Focus workspace 8
+Mod-1 9 Focus workspace 9
+Mod-1 0 Focus workspace 10
Second mode keys:
----------------
Mod-1 F1 Open the help and info window
-Control G Stop all pending actions (like open in new workspace/group)
+Control G Stop all pending actions (actions like open in new workspace/group)
I Identify a key
- : Eval a lisp form from the query input
+ : Eval a lisp form the query input
! Run a program from the query input
- < Leave second mode and maximize current group
+ T Leave second mode and maximize current group
Return Leave second mode and maximize current group
Escape Leave second mode
Control < Leave second mode
@@ -70,22 +70,22 @@
Mod-1 Left Circulate down in workspace
Mod-1 Shift Left Circulate down in workspace moving current group in the next workspace
Mod-1 Control Shift Left Circulate down in workspace copying current group in the next workspace
-Mod-1 Ampersand Focus workspace 1
-Mod-1 Eacute Focus workspace 2
-Mod-1 Quotedbl Focus workspace 3
-Mod-1 Quoteright Focus workspace 4
-Mod-1 Parenleft Focus workspace 5
-Mod-1 Minus Focus workspace 6
-Mod-1 Egrave Focus workspace 7
-Mod-1 Underscore Focus workspace 8
-Mod-1 Ccedilla Focus workspace 9
-Mod-1 Agrave Focus workspace 10
-Mod-1 Control Ampersand Reset workspaces numbers
-Mod-1 Control Eacute Sort workspaces by numbers
+Mod-1 1 Focus workspace 1
+Mod-1 2 Focus workspace 2
+Mod-1 3 Focus workspace 3
+Mod-1 4 Focus workspace 4
+Mod-1 5 Focus workspace 5
+Mod-1 6 Focus workspace 6
+Mod-1 7 Focus workspace 7
+Mod-1 8 Focus workspace 8
+Mod-1 9 Focus workspace 9
+Mod-1 0 Focus workspace 10
+Mod-1 Control 1 Reset workspaces numbers (1 for current workspace, 2 for the second...)
+Mod-1 Control 2 Sort workspaces by numbers
Mod-1 Tab Rotate up windows in the current group
Mod-1 Shift Tab Rotate down windows in the current group
- Twosuperior Move the pointer to the lower right corner of the screen
-Mod-1 Twosuperior Maximize/minimize the current group
+ B Move the pointer to the lower right corner of the screen
+Mod-1 B Maximize/minimize the current group
X Open the fullscreen pager
Mod-1 K Destroy the current window in all groups and workspaces
K Remove the current window in the current group
@@ -104,8 +104,8 @@
A Force the current window to move in the center of the group (Useful only for transient windows)
Mod-1 A Force the current window to move in the group (Useful only for transient windows)
Mod-1 D Show debuging info
- T Tile the current workspace vertically
-Shift T Tile the current workspace horizontally
+Control T Tile the current workspace vertically
+Control Shift T Tile the current workspace horizontally
Y Tile the current workspace with the current window on one side and others on the other
Mod-1 Y Reconfigure the workspace tiling for the current session
Control Y Create a new group for each window in the current group
@@ -132,7 +132,7 @@
Mouse buttons actions in second mode:
------------------------------------
- 1 Move selected group or create a new group
+ 1 Move selected group or create a new group on the root window
Mod-1 1 Resize selected group
Control 1 Copy selected group
2 Leave second mode and maximize current group
@@ -151,10 +151,10 @@
---------------
Mod-1 F1 Open the help and info window
-Control G Stop all pending actions (like open in new workspace/group)
+Control G Stop all pending actions (actions like open in new workspace/group)
Return Leave the pager mode
Escape Leave the pager mode
- Twosuperior Move the pointer to the lower right corner of the screen
+ B Move the pointer to the lower right corner of the screen
Home Select the first workspace
End Select the last workspace
Mod-1 Tab Rotate up windows in the current group
@@ -206,18 +206,18 @@
Control Shift Right Copy the current group to the next workspace
Control Shift Down Copy the current window to the next line
Control Shift Up Copy the current window to the previous line
-Mod-1 Ampersand Focus workspace 1
-Mod-1 Eacute Focus workspace 2
-Mod-1 Quotedbl Focus workspace 3
-Mod-1 Quoteright Focus workspace 4
-Mod-1 Parenleft Focus workspace 5
-Mod-1 Minus Focus workspace 6
-Mod-1 Egrave Focus workspace 7
-Mod-1 Underscore Focus workspace 8
-Mod-1 Ccedilla Focus workspace 9
-Mod-1 Agrave Focus workspace 10
-Mod-1 Control Ampersand Reset workspaces numbers
-Mod-1 Control Eacute Sort workspaces by numbers
+Mod-1 1 Focus workspace 1
+Mod-1 2 Focus workspace 2
+Mod-1 3 Focus workspace 3
+Mod-1 4 Focus workspace 4
+Mod-1 5 Focus workspace 5
+Mod-1 6 Focus workspace 6
+Mod-1 7 Focus workspace 7
+Mod-1 8 Focus workspace 8
+Mod-1 9 Focus workspace 9
+Mod-1 0 Focus workspace 10
+Mod-1 Control 1 Reset workspaces numbers (1 for current workspace, 2 for the second...)
+Mod-1 Control 2 Sort workspaces by numbers
Mouse buttons actions in pager mode:
More information about the clfswm-cvs
mailing list