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

[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  468663c98ffd1c19716558750cac01d8cff3d20a (commit)
      from  38fe373b770a3667ce5e37ce330566a292b95bdf (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 468663c98ffd1c19716558750cac01d8cff3d20a
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Wed Nov 21 21:23:06 2012 +0100

    Remove overlapping heads instead of equal heads

diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp
index 8653973..e358998 100644
--- a/src/clfswm-internal.lisp
+++ b/src/clfswm-internal.lisp
@@ -837,7 +837,17 @@ XINERAMA version 1.1 opcode: 150
                 (destructuring-bind (w h x y)
                     (parse-xinerama-info line)
                   (push (list x y w h) sizes))))
-        (remove-duplicates sizes :test #'equal)))))
+        (remove-if (lambda (size)
+                     (destructuring-bind (x y w h) size
+                       (dolist (s sizes)
+                         (unless (equal s size)
+                           (destructuring-bind (x1 y1 w1 h1) s
+                             (when (and (>= x x1)
+                                        (>= y y1)
+                                        (<= (+ x w) (+ x1 w1))
+                                        (<= (+ y h) (+ y1 h1)))
+                               (return t)))))))
+                   sizes)))))
         ;;'((10 10 500 300) (550 50 400 400) (100 320 400 270))))))
         ;;'((10 10 500 580) (540 50 470 500))))))
 

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

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


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