[clfswm-cvs] CVS clfswm

pbrochard pbrochard at common-lisp.net
Fri Dec 21 23:45:56 UTC 2007


Update of /project/clfswm/cvsroot/clfswm
In directory clnet:/tmp/cvs-serv12455

Modified Files:
	bindings-pager.lisp bindings-second-mode.lisp bindings.lisp 
	config.lisp dot-clfswmrc 
Log Message:
Switch to qwerty keyboard and define azerty keyboard in dot-clswmrc

--- /project/clfswm/cvsroot/clfswm/bindings-pager.lisp	2007/12/21 22:01:14	1.3
+++ /project/clfswm/cvsroot/clfswm/bindings-pager.lisp	2007/12/21 23:45:56	1.4
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Fri Dec 21 22:59:56 2007
+;;; #Date#: Sat Dec 22 00:35:03 2007
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Bindings keys and mouse for pager mode
@@ -46,7 +46,7 @@
 (define-pager-key (#\Return) 'leave-pager-mode)
 (define-pager-key ("Escape") 'leave-pager-mode)
 
-(define-pager-key ("twosuperior") 'banish-pointer)
+(define-pager-key (#\b) 'banish-pointer)
 
 (define-pager-key ("Home") 'pager-select-first-workspace)
 (define-pager-key ("End") 'pager-select-last-workspace)
@@ -260,19 +260,19 @@
       (pager-select-workspace-by-number ,number))))
 
 
-(define-pager-focus-workspace-by-number ("ampersand" :mod-1) 1)
-(define-pager-focus-workspace-by-number ("eacute" :mod-1) 2)
-(define-pager-focus-workspace-by-number ("quotedbl" :mod-1) 3)
-(define-pager-focus-workspace-by-number ("quoteright" :mod-1) 4)
-(define-pager-focus-workspace-by-number ("parenleft" :mod-1) 5)
-(define-pager-focus-workspace-by-number ("minus" :mod-1) 6)
-(define-pager-focus-workspace-by-number ("egrave" :mod-1) 7)
-(define-pager-focus-workspace-by-number ("underscore" :mod-1) 8)
-(define-pager-focus-workspace-by-number ("ccedilla" :mod-1) 9)
-(define-pager-focus-workspace-by-number ("agrave" :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 ("ampersand" :control :mod-1) 'pager-renumber-workspaces)
-(define-pager-key ("eacute" :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 22:01:14	1.3
+++ /project/clfswm/cvsroot/clfswm/bindings-second-mode.lisp	2007/12/21 23:45:56	1.4
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Fri Dec 21 22:59:59 2007
+;;; #Date#: Sat Dec 22 00:31:08 2007
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Bindings keys and mouse for second mode
@@ -67,7 +67,7 @@
 (define-second-key (#\!) 'run-program-from-query-string)
 
 
-(define-second-key (#\<) 'leave-second-mode-maximize)
+(define-second-key (#\t) 'leave-second-mode-maximize)
 (define-second-key (#\Return) 'leave-second-mode-maximize)
 (define-second-key ("Escape") 'leave-second-mode)
 
@@ -113,19 +113,19 @@
       ,(format nil "Focus workspace ~A" number)
       (circulate-workspace-by-number ,number))))
 
-(define-second-focus-workspace-by-number ("ampersand" :mod-1) 1)
-(define-second-focus-workspace-by-number ("eacute" :mod-1) 2)
-(define-second-focus-workspace-by-number ("quotedbl" :mod-1) 3)
-(define-second-focus-workspace-by-number ("quoteright" :mod-1) 4)
-(define-second-focus-workspace-by-number ("parenleft" :mod-1) 5)
-(define-second-focus-workspace-by-number ("minus" :mod-1) 6)
-(define-second-focus-workspace-by-number ("egrave" :mod-1) 7)
-(define-second-focus-workspace-by-number ("underscore" :mod-1) 8)
-(define-second-focus-workspace-by-number ("ccedilla" :mod-1) 9)
-(define-second-focus-workspace-by-number ("agrave" :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 ("ampersand" :control :mod-1) 'renumber-workspaces)
-(define-second-key ("eacute" :control :mod-1) 'sort-workspaces)
+(define-second-key ("1" :control :mod-1) 'renumber-workspaces)
+(define-second-key ("2" :control :mod-1) 'sort-workspaces)
 
 
 
@@ -134,9 +134,9 @@
 (define-second-key (#\Tab :mod-1) 'rotate-window-up)
 (define-second-key (#\Tab :mod-1 :shift) 'rotate-window-down)
 
-(define-second-key ("twosuperior") 'banish-pointer)
+(define-second-key (#\b) 'banish-pointer)
 
-(define-second-key ("twosuperior" :mod-1) 'toggle-maximize-current-group)
+(define-second-key (#\b :mod-1) 'toggle-maximize-current-group)
 
 (define-second-key (#\x) 'pager-mode)
 
@@ -208,8 +208,8 @@
       (dbg *screen*)
       (dbg (query-tree *root*))))
 
-(define-second-key (#\t) 'tile-current-workspace-vertically)
-(define-second-key (#\t :shift) 'tile-current-workspace-horizontally)
+(define-second-key (#\t :control) 'tile-current-workspace-vertically)
+(define-second-key (#\t :shift :control) 'tile-current-workspace-horizontally)
 
 (define-second-key (#\y) 'tile-current-workspace-to)
 (define-second-key (#\y :mod-1) 'reconfigure-tile-workspace)
--- /project/clfswm/cvsroot/clfswm/bindings.lisp	2007/12/21 22:01:14	1.3
+++ /project/clfswm/cvsroot/clfswm/bindings.lisp	2007/12/21 23:45:56	1.4
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Fri Dec 21 23:00:01 2007
+;;; #Date#: Fri Dec 21 23:52:03 2007
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Bindings keys and mouse
@@ -43,30 +43,13 @@
 
 (define-main-key ("Home" :mod-1 :control :shift) 'quit-clfswm)
 
-;;(defun reload-clfswm ()
-;;  "Reload clfswm"
-;;  (format t "RELOADING... ")
-;;  (ungrab-main-keys)
-;;  (setf *main-keys* (make-hash-table :test 'equal))
-;;  (asdf:oos 'asdf:load-op :clfswm)
-;;  (grab-main-keys)
-;;  (format t "Done!~%"))
-;;
-;;
-;;(define-main-key ("F2" :mod-1) 'reload-clfswm)
-
-;;(define-main-key ("F3" :mod-1) (lambda ()
-;;				 (do-shell "rxvt")))
-
-
-(define-main-key (#\< :control) 'second-key-mode)
+(define-main-key (#\t :mod-1) 'second-key-mode)
 
 (define-main-key (#\Tab :mod-1) 'rotate-window-up)
 (define-main-key (#\Tab :mod-1 :shift) 'rotate-window-down)
 
-(define-main-key ("twosuperior") 'banish-pointer)
-
-(define-main-key ("twosuperior" :mod-1) 'toggle-maximize-current-group)
+(define-main-key (#\b :mod-1) 'banish-pointer)
+(define-main-key (#\b :mod-1 :control) 'toggle-maximize-current-group)
 
 ;; Escape
 (define-main-key ("Escape" :control :shift) 'delete-current-window)
@@ -107,14 +90,14 @@
       ,(format nil "Focus workspace ~A" number)
       (circulate-workspace-by-number ,number))))
 
-(define-main-focus-workspace-by-number ("ampersand" :mod-1) 1)
-(define-main-focus-workspace-by-number ("eacute" :mod-1) 2)
-(define-main-focus-workspace-by-number ("quotedbl" :mod-1) 3)
-(define-main-focus-workspace-by-number ("quoteright" :mod-1) 4)
-(define-main-focus-workspace-by-number ("parenleft" :mod-1) 5)
-(define-main-focus-workspace-by-number ("minus" :mod-1) 6)
-(define-main-focus-workspace-by-number ("egrave" :mod-1) 7)
-(define-main-focus-workspace-by-number ("underscore" :mod-1) 8)
-(define-main-focus-workspace-by-number ("ccedilla" :mod-1) 9)
-(define-main-focus-workspace-by-number ("agrave" :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/config.lisp	2007/12/21 22:01:14	1.4
+++ /project/clfswm/cvsroot/clfswm/config.lisp	2007/12/21 23:45:56	1.5
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Fri Dec 21 23:00:27 2007
+;;; #Date#: Sat Dec 22 00:40:23 2007
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Configuration file
@@ -72,7 +72,7 @@
 (defparameter *pager-workspace-cursor* "black")
 (defparameter *pager-line-cursor* "blue")
 (defparameter *pager-group-cursor* "white")
-(defparameter *pager-group-background-cursor* "darkgreen")
+(defparameter *pager-group-background-cursor* "grey35")
 
 
 (defparameter *pager-font-string* "9x15bold")
--- /project/clfswm/cvsroot/clfswm/dot-clfswmrc	2007/05/15 20:51:41	1.2
+++ /project/clfswm/cvsroot/clfswm/dot-clfswmrc	2007/12/21 23:45:56	1.3
@@ -10,7 +10,7 @@
 ;;; Color configuration example
 ;;;
 ;;; See in package.lisp for all variables
-(setf *color-unselected* "Blue")
+;;(setf *color-unselected* "Blue")
 
 
 ;;; Binding example: Undefine Control-F1 and define  Control-F5 as a
@@ -18,8 +18,26 @@
 ;;;
 ;;; See bindings.lisp, bindings-second-mode.lisp and bindings-pager.lisp
 ;;; for all default bindings definitions.
-(undefine-main-key ("F1" :mod-1))
-(define-main-key ("F5" :mod-1) 'help-on-clfswm)
+;;(undefine-main-key ("F1" :mod-1))
+;;(define-main-key ("F5" :mod-1) 'help-on-clfswm)
+
+
+
+;;;; Reloading example
+;;(defun reload-clfswm ()
+;;  "Reload clfswm"
+;;  (format t "RELOADING... ")
+;;  (ungrab-main-keys)
+;;  (setf *main-keys* (make-hash-table :test 'equal))
+;;  (asdf:oos 'asdf:load-op :clfswm)
+;;  (grab-main-keys)
+;;  (format t "Done!~%"))
+;;
+;;
+;;(define-main-key ("F2" :mod-1) 'reload-clfswm)
+
+;;(define-main-key ("F3" :mod-1) (lambda ()
+;;				 (do-shell "rxvt")))
 
 
 
@@ -27,14 +45,14 @@
 ;;;
 ;;; See in package.lisp and clfswm.lisp, clfswm-second-mode.lisp
 ;;; or clfswm-pager.lisp for hook examples
-(setf *key-press-hook* (list (lambda (&rest args)     ; function 1
-			       (format t "Keyp press (before): ~A~%" args)
-			       (force-output))
-			     #'handle-key-press       ; function 2 (default)
-			     (lambda (&rest args)     ; function 3
-			       (declare (ignore args))
-			       (format t "Keyp press (after)~%")
-			       (force-output))))
+;;(setf *key-press-hook* (list (lambda (&rest args)     ; function 1
+;;			       (format t "Keyp press (before): ~A~%" args)
+;;			       (force-output))
+;;			     #'handle-key-press       ; function 2 (default)
+;;			     (lambda (&rest args)     ; function 3
+;;			       (declare (ignore args))
+;;			       (format t "Keyp press (after)~%")
+;;			       (force-output))))
 
 ;;;; Uncomment the lines below if you want to enable the larswm,
 ;;;; dwm, wmii... cycling style.
@@ -65,3 +83,113 @@
 
 
 
+;;;;;; 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))
+;;(undefine-main-key ("1" :mod-1))
+;;(undefine-main-key ("2" :mod-1))
+;;(undefine-main-key ("3" :mod-1))
+;;(undefine-main-key ("4" :mod-1))
+;;(undefine-main-key ("5" :mod-1))
+;;(undefine-main-key ("6" :mod-1))
+;;(undefine-main-key ("7" :mod-1))
+;;(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)
+
+
+




More information about the clfswm-cvs mailing list