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

[pbrochard at common-lisp.net]

Author: pbrochard
Date: Fri Sep 19 16:59:32 2008
New Revision: 163

Modified:
   clfswm/ChangeLog
   clfswm/src/bindings-second-mode.lisp
   clfswm/src/menu-def.lisp
   clfswm/src/xlib-util.lisp
Log:
Handle the case where cursor	is nil. (workaround on some CLX implementation). Change key binding for the CLFSWM menu	entry. Bind 't' to tile-current-frame.

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Fri Sep 19 16:59:32 2008
@@ -1,3 +1,13 @@
+2008-09-19  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/bindings-second-mode.lisp: Bind "t" to tile-current-frame.
+
+	* src/menu-def.lisp: Change key binding for the CLFSWM menu
+	entry.
+
+	* src/xlib-util.lisp (xgrab-pointer): Handle the case where cursor
+	is nil. (workaround on some CLX implementation).
+
 2008-09-12  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/menu-def.lisp: Add a menu to set a focus policy for all

Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp	(original)
+++ clfswm/src/bindings-second-mode.lisp	Fri Sep 19 16:59:32 2008
@@ -92,13 +92,12 @@
 (define-second-key ("Escape") 'leave-second-mode)
 
 
-(defun tile-space-current-frame ()
+(defun tile-current-frame ()
   "Tile with spaces the current frame"
-  (explode-frame *current-child*)
-  (set-layout-once #'tile-space-layout)
+  (set-layout-once #'tile-layout)
   (leave-second-mode))
 
-(define-second-key ("t") 'tile-space-current-frame)
+(define-second-key ("t") 'tile-current-frame)
 
 (define-second-key ("Home" :mod-1 :control :shift) 'exit-clfswm)
 

Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp	(original)
+++ clfswm/src/menu-def.lisp	Fri Sep 19 16:59:32 2008
@@ -54,7 +54,7 @@
 (add-sub-menu 'main "n" 'action-by-name-menu "Action by name menu")
 (add-sub-menu 'main "u" 'action-by-number-menu "Action by number menu")
 (add-sub-menu 'main "y" 'utility-menu "Utility menu")
-(add-sub-menu 'main #\* 'clfswm-menu "CLFSWM menu")
+(add-sub-menu 'main "m" 'clfswm-menu "CLFSWM menu")
 
 
 

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Fri Sep 19 16:59:32 2008
@@ -352,17 +352,19 @@
       (setf pointer-grabbed t)
       (let* ((white (xlib:make-color :red 1.0 :green 1.0 :blue 1.0))
 	     (black (xlib:make-color :red 0.0 :green 0.0 :blue 0.0)))
-	(if cursor-char
-	    (setf cursor-font (xlib:open-font *display* "cursor")
-		  cursor (xlib:create-glyph-cursor :source-font cursor-font
-						   :source-char cursor-char
-						   :mask-font cursor-font
-						   :mask-char cursor-mask-char
-						   :foreground black
-						   :background white))
-	    (setf cursor nil))
-	(xlib:grab-pointer root pointer-mask
-			   :owner-p owner-p  :sync-keyboard-p nil :sync-pointer-p nil :cursor cursor)))
+	(cond (cursor-char
+	       (setf cursor-font (xlib:open-font *display* "cursor")
+		     cursor (xlib:create-glyph-cursor :source-font cursor-font
+						      :source-char (or cursor-char 68)
+						      :mask-font cursor-font
+						      :mask-char (or cursor-mask-char 69)
+						      :foreground black
+						      :background white))
+	       (xlib:grab-pointer root pointer-mask
+				  :owner-p owner-p  :sync-keyboard-p nil :sync-pointer-p nil :cursor cursor))
+	      (t
+	       (xlib:grab-pointer root pointer-mask
+				  :owner-p owner-p  :sync-keyboard-p nil :sync-pointer-p nil)))))
 
     (defun xungrab-pointer ()
       "Remove the grab on the cursor and restore the cursor shape."