[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1212-10-g53b3bd4

[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  53b3bd4d5badf51a6f69f3fba27b1b21fde7ba85 (commit)
      from  2c2d14a8691c1145d8ac4e151a73502b8880119f (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 53b3bd4d5badf51a6f69f3fba27b1b21fde7ba85
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Thu Jan 10 11:18:31 2013 +0100

    Move child in its original parent if no destination child is found. Show all children before waiting the child move.

diff --git a/src/clfswm-util.lisp b/src/clfswm-util.lisp
index 859ef9f..6ccabf1 100644
--- a/src/clfswm-util.lisp
+++ b/src/clfswm-util.lisp
@@ -1248,16 +1248,18 @@ For window: set current child to window or its parent according to window-parent
   (let ((child (find-child-under-mouse root-x root-y)))
     (unless (child-root-p child)
       (hide-all child)
-      (remove-child-in-frame child (find-parent-frame child))
-      (wait-mouse-button-release 50 51)
-      (multiple-value-bind (x y)
-	  (xlib:query-pointer *root*)
-	(let ((dest (find-child-under-mouse x y)))
-	  (when (xlib:window-p dest)
-	    (setf dest (find-parent-frame dest)))
-	  (unless (child-equal-p child dest)
-	    (move-child-to child dest)
-	    (show-all-children))))))
+      (let ((parent (find-parent-frame child)))
+        (remove-child-in-frame child parent)
+        (show-all-children)
+        (wait-mouse-button-release 50 51)
+        (multiple-value-bind (x y)
+            (xlib:query-pointer *root*)
+          (let ((dest (find-child-under-mouse x y)))
+            (when (xlib:window-p dest)
+              (setf dest (find-parent-frame dest)))
+            (unless (child-equal-p child dest)
+              (move-child-to child (or dest parent))))))
+      (show-all-children)))
   (stop-button-event))
 
 

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

Summary of changes:
 src/clfswm-util.lisp |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)


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