[clfswm-cvs] r408 - in clfswm: . contrib src

[Philippe Brochard]

Author: pbrochard
Date: Mon Feb 14 18:34:19 2011
New Revision: 408

Log:
src/clfswm.lisp (main-unprotected): Destroy the notify window before closing the display. Tis fix a bug when resetting/reloading clfswm.

Modified:
   clfswm/ChangeLog
   clfswm/contrib/clfswm
   clfswm/src/clfswm.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Mon Feb 14 18:34:19 2011
@@ -1,3 +1,9 @@
+2011-02-15  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm.lisp (main-unprotected): Destroy the notify window
+	before closing the display. This fix a bug when resetting/reloading
+	clfswm.
+
 2011-02-12  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/xlib-util.lisp (equal-wm-class-fun, equal-wm-name-fun)

Modified: clfswm/contrib/clfswm
==============================================================================
--- clfswm/contrib/clfswm	(original)
+++ clfswm/contrib/clfswm	Mon Feb 14 18:34:19 2011
@@ -72,7 +72,8 @@
 
 build_sbcl()
 {
-   sbcl $lisp_opt --disable-debugger  --eval "(require :asdf)" \
+   sbcl $lisp_opt --disable-debugger --eval "(require :asdf)" \
+       --eval "(require :sb-posix)" \
        --eval "(load \"$clfswm_asd_path/clfswm.asd\")" \
        --eval "(require :clfswm)" \
        --eval "(save-lisp-and-die \"$dump_image\" :toplevel 'clfswm:main)"

Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp	(original)
+++ clfswm/src/clfswm.lisp	Mon Feb 14 18:34:19 2011
@@ -215,7 +215,6 @@
 
 
 
-
 (defun read-conf-file ()
   (let* ((conf (conf-file-name)))
     (if conf
@@ -276,6 +275,7 @@
 	(ungrab-main-keys)
 	(xlib:destroy-window *no-focus-window*)
 	(xlib:free-pixmap *pixmap-buffer*)
+	(close-notify-window)
 	(xlib:close-display *display*)
 	#+:event-debug
 	(format t "~2&Unhandled events: ~A~%" *unhandled-events*))))