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

[Philippe Brochard]

Author: pbrochard
Date: Wed Nov 10 18:33:30 2010
New Revision: 383

Log:
src/clfswm-internal.lisp (set-current-root): Handle window-parent in set-current-root.

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

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Wed Nov 10 18:33:30 2010
@@ -1,3 +1,11 @@
+2010-11-11  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-internal.lisp (set-current-root): Handle
+	window-parent in set-current-root.
+
+	* src/clfswm-util.lisp (mouse-click-to-focus-generic): Do not
+	focus the parent child when the current root is a window.
+
 2010-11-09  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-expose-mode.lisp (expose-windows-current-child-mode):

Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp	(original)
+++ clfswm/src/clfswm-internal.lisp	Wed Nov 10 18:33:30 2010
@@ -798,9 +798,9 @@
   ())
 
 
-(defun set-current-root (parent)
+(defun set-current-root (parent window-parent)
   "Set current root if parent is not in current root"
-  (unless (find-child parent *current-root*)
+  (when (and window-parent (not (find-child parent *current-root*)))
     (setf *current-root* parent)))
 
 
@@ -809,9 +809,7 @@
 For window: set current child to window or its parent according to window-parent"
   (let ((new-focus (focus-child-rec child parent))
 	(new-current-child (set-current-child child parent window-parent))
-	(new-root (if window-parent
-		      (set-current-root parent)
-		      child)))
+	(new-root (set-current-root parent window-parent)))
     (or new-focus new-current-child new-root)))