[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch test updated. R-1106-44-g32642a7

[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, test has been updated
       via  32642a72d744e6cca2f6196c9fda1fbc7eee4d5f (commit)
      from  21b53b3f04745a661d8a881bccde644eb1c08065 (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 32642a72d744e6cca2f6196c9fda1fbc7eee4d5f
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Thu May 17 10:59:22 2012 +0200

    minor check for root

diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp
index de7d85e..facf8e4 100644
--- a/src/clfswm-internal.lisp
+++ b/src/clfswm-internal.lisp
@@ -642,10 +642,11 @@
     (root-child (find-root (current-child))))
 
   (defun exchange-root-geometry (root-1 root-2)
-    (rotatef (root-x root-1) (root-x root-2))
-    (rotatef (root-y root-1) (root-y root-2))
-    (rotatef (root-w root-1) (root-w root-2))
-    (rotatef (root-h root-1) (root-h root-2)))
+    (when (and root-1 root-2)
+      (rotatef (root-x root-1) (root-x root-2))
+      (rotatef (root-y root-1) (root-y root-2))
+      (rotatef (root-w root-1) (root-w root-2))
+      (rotatef (root-h root-1) (root-h root-2))))
 
   (defun rotate-root-geometry ()
     (let* ((first (first root-list))
@@ -726,7 +727,7 @@
                     (parse-integer string :junk-allowed t))
                   (split-string (substitute #\space #\x (substitute #\space #\, line))))))
 
-(defun get-connected-heads-size (&optional (fake nil))
+(defun get-connected-heads-size (&optional (fake (string= (getenv "DISPLAY") ":1")))
   (labels ((heads-info ()
              (if (not fake)
                  (do-shell "xdpyinfo -ext XINERAMA")
diff --git a/src/clfswm-util.lisp b/src/clfswm-util.lisp
index 88c4594..20ad0c7 100644
--- a/src/clfswm-util.lisp
+++ b/src/clfswm-util.lisp
@@ -1729,11 +1729,12 @@ For window: set current child to window or its parent according to window-parent
   (no-focus)
   (let* ((current-root (find-root (current-child)))
          (parent (find-parent-frame (root-original current-root))))
-    (setf (frame-child parent) (funcall fun (frame-child parent)))
-    (let ((new-root (find-root (frame-selected-child parent))))
-      (setf (current-child) (aif (root-current-child new-root)
-                                 it
-                                 (frame-selected-child parent)))))
+    (when parent
+      (setf (frame-child parent) (funcall fun (frame-child parent)))
+      (let ((new-root (find-root (frame-selected-child parent))))
+        (setf (current-child) (aif (root-current-child new-root)
+                                   it
+                                   (frame-selected-child parent))))))
   (show-all-children t)
   (if restart-menu
       (open-menu (find-menu 'root-menu))
diff --git a/src/menu-def.lisp b/src/menu-def.lisp
index c1049e4..fcd508b 100644
--- a/src/menu-def.lisp
+++ b/src/menu-def.lisp
@@ -94,7 +94,7 @@
 (add-menu-key 'root-menu "p" 'select-previous-root-restart-menu)
 (add-menu-key 'root-menu "g" 'rotate-root-geometry-next-restart-menu)
 (add-menu-key 'root-menu "f" 'rotate-root-geometry-previous-restart-menu)
-(add-menu-key 'root-menu "m" 'exchange-root-geometry-with-mouse)
+(add-menu-key 'root-menu "x" 'exchange-root-geometry-with-mouse)
 
 
 (add-sub-menu 'frame-menu "a" 'frame-adding-menu "Adding frame menu")

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

Summary of changes:
 src/clfswm-internal.lisp |   11 ++++++-----
 src/clfswm-util.lisp     |   11 ++++++-----
 src/menu-def.lisp        |    2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)


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