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

[Philippe Brochard]

Author: pbrochard
Date: Sat Dec 25 14:59:38 2010
New Revision: 393

Log:
src/clfswm-second-mode.lisp (second-key-mode): Call the second mode leave function only when the generic mode was ended.

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

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Sat Dec 25 14:59:38 2010
@@ -1,3 +1,8 @@
+2010-12-25  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-second-mode.lisp (second-key-mode): Call the second
+	mode leave function only when the generic mode was ended.
+
 2010-12-08  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-second-mode.lisp (sm-leave-function): Do not use

Modified: clfswm/src/clfswm-second-mode.lisp
==============================================================================
--- clfswm/src/clfswm-second-mode.lisp	(original)
+++ clfswm/src/clfswm-second-mode.lisp	Sat Dec 25 14:59:38 2010
@@ -135,9 +135,6 @@
   (show-all-children)
   (display-all-frame-info)
   (wait-no-key-or-button-press)
-  (when *second-mode-leave-function*
-    (funcall *second-mode-leave-function*)
-    (setf *second-mode-leave-function* nil))
   (setf *in-second-mode* nil))
 
 (defun second-key-mode ()
@@ -146,7 +143,10 @@
 		'exit-second-loop
 		:enter-function #'sm-enter-function
 		:loop-function #'sm-loop-function
-		:leave-function #'sm-leave-function))
+		:leave-function #'sm-leave-function)
+  (when *second-mode-leave-function*
+    (funcall *second-mode-leave-function*)
+    (setf *second-mode-leave-function* nil)))
 
 (defun leave-second-mode ()
   "Leave second mode"

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Sat Dec 25 14:59:38 2010
@@ -72,8 +72,6 @@
        (dbg "Ignore Xlib Error" c ',body))))
 
 
-
-
 (defmacro with-x-pointer (&body body)
   "Bind (x y) to mouse pointer positions"
   `(multiple-value-bind (x y)