[clfswm-cvs] r122 - in clfswm: . src

[pbrochard at common-lisp.net]

Author: pbrochard
Date: Sat May 10 17:19:26 2008
New Revision: 122

Modified:
   clfswm/ChangeLog
   clfswm/src/bindings-second-mode.lisp
   clfswm/src/bindings.lisp
   clfswm/src/clfswm-info.lisp
   clfswm/src/clfswm-util.lisp
Log:
Use 'Tab' instead of 'Iso_Left_Tab'. bind-or-jump: Bind 'Tab', 'Return' and 'Space' to jump to a child. 'B' to bind a slot on the current child.

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Sat May 10 17:19:26 2008
@@ -1,3 +1,12 @@
+2008-05-10  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-util.lisp (bind-or-jump): Bind "Tab", "Return" and
+	"Space" to jump to a child. "B" to bind a slot on the current
+	child.
+
+	* src/bindings-second-mode.lisp: Use "Tab" instead of
+	"Iso_Left_Tab".
+
 2008-05-07  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-util.lisp (find-child-under-mouse): Take care of

Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp	(original)
+++ clfswm/src/bindings-second-mode.lisp	Sat May 10 17:19:26 2008
@@ -109,7 +109,7 @@
 (define-second-key ("Up" :mod-1) 'select-next-level)
 
 (define-second-key ("Tab" :mod-1) 'select-next-child)
-(define-second-key ("ISO_Left_Tab" :mod-1 :shift) 'select-previous-child)
+(define-second-key ("Tab" :mod-1 :shift) 'select-previous-child)
 
 (define-second-key ("Return" :mod-1) 'enter-frame)
 (define-second-key ("Return" :mod-1 :shift) 'leave-frame)

Modified: clfswm/src/bindings.lisp
==============================================================================
--- clfswm/src/bindings.lisp	(original)
+++ clfswm/src/bindings.lisp	Sat May 10 17:19:26 2008
@@ -46,7 +46,7 @@
 (define-main-key ("Up" :mod-1) 'select-next-level)
 
 (define-main-key ("Tab" :mod-1) 'select-next-child)
-(define-main-key ("ISO_Left_Tab" :mod-1 :shift) 'select-previous-child)
+(define-main-key ("Tab" :mod-1 :shift) 'select-previous-child)
 
 (define-main-key ("Return" :mod-1) 'enter-frame)
 (define-main-key ("Return" :mod-1 :shift) 'leave-frame)

Modified: clfswm/src/clfswm-info.lisp
==============================================================================
--- clfswm/src/clfswm-info.lisp	(original)
+++ clfswm/src/clfswm-info.lisp	Sat May 10 17:19:26 2008
@@ -60,7 +60,6 @@
 (define-info-key (#\q) 'leave-info-mode)
 (define-info-key ("Return") 'leave-info-mode)
 (define-info-key ("Escape") 'leave-info-mode)
-(define-info-key (#\Space) 'leave-info-mode)
 
 (define-info-key ("twosuperior")
     (defun info-banish-pointer (info)

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Sat May 10 17:19:26 2008
@@ -652,9 +652,9 @@
   
   (defun bind-or-jump (n)
     "Bind or jump to a slot"
-    (let ((default-bind `("Return" bind-on-slot
-				   ,(format nil "Bind slot ~A on child: ~A" n (child-fullname *current-child*)))))
-      (setf current-slot (- n 1))
+    (setf current-slot (- n 1))
+    (let ((default-bind `("b" bind-on-slot
+			      ,(format nil "Bind slot ~A on child: ~A" n (child-fullname *current-child*)))))
       (info-mode-menu (aif (aref key-slots current-slot)
 			   `(,default-bind
 				("BackSpace" remove-binding-on-slot
@@ -663,7 +663,9 @@
 			      ("Tab" jump-to-slot
 				     ,(format nil "Jump to child: ~A" (aif (aref key-slots current-slot)
 									   (child-fullname it)
-									   "Not set - Please, bind it with Return"))))
+									   "Not set - Please, bind it with 'b'")))
+			      ("Return" jump-to-slot "Same thing")
+			      ("space" jump-to-slot "Same thing"))
 			   (list default-bind))))))