From f53a1ad3bbffb633bd9d94bd35d16142e2cd74d2 Mon Sep 17 00:00:00 2001
From: Philippe Brochard <pbrochard@common-lisp.net>
Date: Mon, 30 Apr 2012 22:26:06 +0200
Subject: [PATCH] src/config.lisp: Do not use get-fullscreen-size anymore

---
 src/clfswm-internal.lisp | 21 +++++++++++----------
 src/config.lisp          | 12 ------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp
index 3dbe83c..7e10483 100644
--- a/src/clfswm-internal.lisp
+++ b/src/clfswm-internal.lisp
@@ -838,16 +838,17 @@
 
 (defun get-parent-layout (child parent)
   (aif (child-root-p child)
-      ;;(values-list (rest (child-root-p child)))
-      (values (root-x it) (root-y it) (root-w it) (root-h it))
-      (if (or (frame-p child) (managed-window-p child parent))
-          (if (frame-p parent)
-              (aif (frame-layout parent)
-                   (funcall it child parent)
-                   (no-layout child parent))
-              (get-fullscreen-size))
-          (values (x-drawable-x child) (x-drawable-y child)
-                  (x-drawable-width child) (x-drawable-height child)))))
+       (values (root-x it) (root-y it) (root-w it) (root-h it))
+       (if (or (frame-p child) (managed-window-p child parent))
+           (if (frame-p parent)
+               (aif (frame-layout parent)
+                    (funcall it child parent)
+                    (no-layout child parent))
+               (values (- *border-size*) (- *border-size*)
+                       (xlib:screen-width *screen*)
+                       (xlib:screen-height *screen*)))
+           (values (x-drawable-x child) (x-drawable-y child)
+                   (x-drawable-width child) (x-drawable-height child)))))
 
 
 
diff --git a/src/config.lisp b/src/config.lisp
index a7481ce..253b037 100644
--- a/src/config.lisp
+++ b/src/config.lisp
@@ -73,18 +73,6 @@ A list of (list match-function handle-function)")
            "Delay to display the new child after doing a spatial move")
 
 
-;;; CONFIG - Screen size
-(defun get-fullscreen-size ()
-  "Return the size of root child (values rx ry rw rh)
-You can tweak this to what you want"
-  (values (- *border-size*) (- *border-size*)
-          (xlib:screen-width *screen*)
-          (xlib:screen-height *screen*)))
-  ;;(values -1 -1 (xlib:screen-width *screen*) (xlib:screen-height *screen*)))
-;; (values -1 -1 1024 768))
-;;  (values 100 100 800 600))
-
-
 (defconfig  *corner-size* 3 'Corner
             "The size of the corner square")
 
-- 
2.11.4.GIT