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

[Philippe Brochard]

Author: pbrochard
Date: Mon Dec 27 08:18:45 2010
New Revision: 394

Log:
src/xlib-util.lisp (with-xlib-protect): Force to revert to the main mode state.

Modified:
   clfswm/ChangeLog
   clfswm/src/xlib-util.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Mon Dec 27 08:18:45 2010
@@ -1,3 +1,8 @@
+2010-12-27  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/xlib-util.lisp (with-xlib-protect): Force to revert to the
+	main mode state.
+
 2010-12-25  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-second-mode.lisp (second-key-mode): Call the second

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Mon Dec 27 08:18:45 2010
@@ -69,7 +69,11 @@
        (with-simple-restart (top-level "Return to clfswm's top level")
 	 , at body)
      ((or xlib:match-error xlib:window-error xlib:drawable-error) (c)
-       (dbg "Ignore Xlib Error" c ',body))))
+       (progn
+	 (dbg "Ignore Xlib Error" c ',body)
+	 (unassoc-keyword-handle-event)
+	 (assoc-keyword-handle-event 'main-mode)
+	 (setf *in-second-mode* nil)))))
 
 
 (defmacro with-x-pointer (&body body)