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

[Philippe Brochard]

Author: pbrochard
Date: Sat Oct 23 17:05:44 2010
New Revision: 359

Log:
src/clfswm-internal.lisp (show-child): Show window only if not hidden.

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

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Sat Oct 23 17:05:44 2010
@@ -1,5 +1,8 @@
 2010-10-23  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/clfswm-internal.lisp (show-child): Show window only if not
+	hidden.
+
 	* src/clfswm-keys.lisp (binding-substitute-modifier): Utility to
 	change modifiers after binding definition.
 

Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp	(original)
+++ clfswm/src/clfswm-internal.lisp	Sat Oct 23 17:05:44 2010
@@ -580,8 +580,9 @@
     (if show-window-p
 	(when (or *show-root-frame-p* (not (child-equal-p frame *current-root*)))
 	  (map-window window)
-	  (when raise-p (raise-window window))
-	  (display-frame-info frame))
+	  (when raise-p
+	    (raise-window window)
+	    (display-frame-info frame)))
 	(hide-window window))))
 
 
@@ -595,12 +596,13 @@
 
 
 (defmethod show-child ((window xlib:window) parent raise-p)
-  (if (or (managed-window-p window parent)
-	  (not (hide-unmanager-window-p parent))
-	  (child-equal-p parent *current-child*))
+  (if (and raise-p
+	   (or (managed-window-p window parent)
+	       (not (hide-unmanager-window-p parent))
+	       (child-equal-p parent *current-child*)))
       (progn
 	(map-window window)
-	(when raise-p (raise-window window)))
+	(raise-window window))
       (hide-window window)))
 
 (defmethod show-child (child parent raise-p)

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Sat Oct 23 17:05:44 2010
@@ -232,6 +232,7 @@
   (xlib:display-finish-output *display*))
 
 
+
 (defun map-window (window)
   (when window
     (xlib:map-window window)