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

[Philippe Brochard]

Author: pbrochard
Date: Sat Mar  5 19:09:16 2011
New Revision: 421

Log:
src/clfswm-internal.lisp (show-all-children): Simplify the selection method.

Modified:
   clfswm/ChangeLog
   clfswm/TODO
   clfswm/src/clfswm-internal.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Sat Mar  5 19:09:16 2011
@@ -1,5 +1,8 @@
 2011-03-06  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/clfswm-internal.lisp (show-all-children): Simplify the
+	selection method.
+
 	* src/xlib-util.lisp (move-window,resize-window): Add a
 	*color-move-window* border when moving or resizing a window.
 

Modified: clfswm/TODO
==============================================================================
--- clfswm/TODO	(original)
+++ clfswm/TODO	Sat Mar  5 19:09:16 2011
@@ -17,8 +17,6 @@
   *root-frame* and hide all those who are not in *current-root*.
   -> remove hide-all-children when needed.
 
-- in show-all-children: simplify the selected method -> remove the parent one.
-
 - Estimate the time to raise/lower a child in show-all-children and
   see if there is a need for a rectangular optimization
 

Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp	(original)
+++ clfswm/src/clfswm-internal.lisp	Sat Mar  5 19:09:16 2011
@@ -734,19 +734,19 @@
   "Show all children from *current-root*."
   (let ((geometry-change nil)
 	(previous nil))
-    (labels ((rec (child parent selected-p selected-parent-p)
+    (labels ((rec (child parent selected-p)
 	       (when (adapt-child-to-parent child parent)
 		 (setf geometry-change t))
 	       (select-child child (cond ((child-equal-p child *current-child*) t)
-					 ((and selected-p selected-parent-p) :maybe)
+					 (selected-p :maybe)
 					 (t nil)))
 	       (when (frame-p child)
 		 (let ((selected-child (frame-selected-child child)))
 		   (dolist (sub-child (frame-child child))
-		     (rec sub-child child (child-equal-p sub-child selected-child) (and selected-p selected-parent-p)))))
+		     (rec sub-child child (and selected-p (child-equal-p sub-child selected-child))))))
 	       (show-child child parent previous)
 	       (setf previous child)))
-      (rec *current-root* nil t t)
+      (rec *current-root* nil t)
       (set-focus-to-current-child)
       geometry-change)))