[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1106-33-gaacece7

[Philippe Brochard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CLFSWM - A(nother) Common Lisp FullScreen Window Manager".

The branch, master has been updated
       via  aacece7d7b5b312d54104ecc32a10efe1c231cd3 (commit)
      from  4b41ede4606956b7d072d5f9f1e92b01db4824f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aacece7d7b5b312d54104ecc32a10efe1c231cd3
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Fri May 4 21:45:56 2012 +0200

    src/*.lisp: replace find-current-root by find-related-root when needed

diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp
index d99ea03..e1111fe 100644
--- a/src/clfswm-internal.lisp
+++ b/src/clfswm-internal.lisp
@@ -1291,7 +1291,7 @@ For window: set current child to window or its parent according to window-parent
         (when (child-root-p child)
           (change-root child (find-parent-frame child)))
         (when (child-equal-p child *current-child*)
-          (setf *current-child* (find-current-root)))
+          (setf *current-child* (find-related-root child)))
         t)))
 
 
diff --git a/src/clfswm.lisp b/src/clfswm.lisp
index bb642e3..ff978fd 100644
--- a/src/clfswm.lisp
+++ b/src/clfswm.lisp
@@ -58,12 +58,13 @@
     (xlib:with-state (window)
       (when (has-bw value-mask)
 	(setf (x-drawable-border-width window) border-width))
-      (if (find-child window (find-current-root))
-	  (let ((parent (find-parent-frame window (find-current-root))))
-	    (if (and parent (managed-window-p window parent))
-		(adapt-child-to-parent window parent)
-		(adjust-from-request)))
-	  (adjust-from-request))
+      (let ((current-root (find-current-root)))
+        (if (find-child window current-root)
+            (let ((parent (find-parent-frame window current-root)))
+              (if (and parent (managed-window-p window parent))
+                  (adapt-child-to-parent window parent)
+                  (adjust-from-request)))
+            (adjust-from-request)))
       (send-configuration-notify window (x-drawable-x window) (x-drawable-y window)
 				 (x-drawable-width window) (x-drawable-height window)
 				 (x-drawable-border-width window))

-----------------------------------------------------------------------

Summary of changes:
 src/clfswm-internal.lisp |    2 +-
 src/clfswm.lisp          |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CLFSWM - A(nother) Common Lisp FullScreen Window Manager