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

[pbrochard at common-lisp.net]

Author: pbrochard
Date: Mon Apr 14 03:02:16 2008
New Revision: 77

Modified:
   clfswm/ChangeLog
   clfswm/src/clfswm.lisp
   clfswm/src/package.lisp
Log:
Move the default frame creation on the default init hook.


Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Mon Apr 14 03:02:16 2008
@@ -1,12 +1,15 @@
 2008-04-14  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/clfswm.lisp (init-display): Move the default frame creation
+	on the default init hook.
+
 	* src/clfswm-keys.lisp (define-ungrab/grab): Handle all keysyms in
 	the main mode (for example: "1" on an azerty keyboard).
 
 2008-04-13  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-keys.lisp (find-key-from-code): Better handle of
-	keysyms. Revert to hold grabbing method for the main mode.
+	keysyms. Revert to old grabbing method for the main mode.
 
 2008-04-12  Philippe Brochard  <pbrochard at common-lisp.net>
 

Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp	(original)
+++ clfswm/src/clfswm.lisp	Mon Apr 14 03:02:16 2008
@@ -217,8 +217,6 @@
   (setf *root-frame* (create-frame :name "Root" :number 0) ;; :layout #'tile-space-layout)
 	*current-root* *root-frame*
 	*current-child* *current-root*)
-  (add-frame (create-frame :name "Default" :layout nil :x 0.05 :y 0.05 :w 0.9 :h 0.9) *root-frame*)
-  (setf *current-child* (first (frame-child *current-root*)))
   (call-hook *init-hook*)
   (process-existing-windows *screen*)
   (show-all-children)

Modified: clfswm/src/package.lisp
==============================================================================
--- clfswm/src/package.lisp	(original)
+++ clfswm/src/package.lisp	Mon Apr 14 03:02:16 2008
@@ -129,7 +129,14 @@
 ;;; See clfswm.lisp for hooks examples.
 
 ;;; Init hook. This hook is run just after the first root frame is created
-(defparameter *init-hook* nil)
+(defun default-init-hook ()
+  (let ((frame (add-frame (create-frame :name "Default"
+                                        :layout nil :x 0.05 :y 0.05
+                                        :w 0.9 :h 0.9) *root-frame*)))
+    (setf *current-child* (first (frame-child *current-root*)))))
+
+(defparameter *init-hook* #'default-init-hook)
+
 
 ;;; Main mode hooks (set in clfswm.lisp)
 (defparameter *button-press-hook* nil)