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

[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  8f23f83012bba1b87afea860370fd5eaed2e869c (commit)
      from  58219730464bd626c1aacc93c925d51a5905e8b9 (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 8f23f83012bba1b87afea860370fd5eaed2e869c
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Sat Feb 25 22:08:13 2012 +0100

    src/clfswm-util.lisp (jump-to-slot, add-frame-in-parent-frame): Change *current-root*	only when needed.

diff --git a/ChangeLog b/ChangeLog
index 4002d68..123bd91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* src/clfswm-util.lisp (place-frames-from-xrandr)
 	(swap-frame-geometry, rotate-frame-geometry): New helper functions
 	for multiple physical screen.
+	(jump-to-slot, add-frame-in-parent-frame): Change *current-root*
+	only when needed.
 
 2012-01-18  Philippe Brochard  <pbrochard at common-lisp.net>
 
diff --git a/src/clfswm-util.lisp b/src/clfswm-util.lisp
index 85d5ca8..024f823 100644
--- a/src/clfswm-util.lisp
+++ b/src/clfswm-util.lisp
@@ -118,8 +118,9 @@
 	(parent (find-parent-frame *current-child*)))
     (when parent
       (pushnew new-frame (frame-child parent))
-      (setf *current-root* parent
-	    *current-child* parent)
+      (when (child-equal-p *current-child* *current-root*)
+        (setf *current-root* parent))
+      (setf *current-child* parent)
       (set-layout-once #'tile-space-layout)
       (setf *current-child* new-frame)
       (leave-second-mode))))
@@ -774,8 +775,9 @@ For window: set current child to window or its parent according to window-parent
     "Jump to slot"
     (let ((jump-child (aref key-slots current-slot)))
       (when (find-child jump-child *root-frame*)
-	(setf *current-root* jump-child
-	      *current-child* *current-root*)
+        (unless (find-child jump-child *current-root*)
+          (setf *current-root* jump-child))
+	(setf *current-child* jump-child)
 	(focus-all-children *current-child* *current-child*)
 	(show-all-children t))))
 

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

Summary of changes:
 ChangeLog            |    2 ++
 src/clfswm-util.lisp |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)


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