[clfswm-cvs] r240 - in clfswm: . src

[Philippe Brochard]

Author: pbrochard
Date: Thu Jun 18 10:23:56 2009
New Revision: 240

Log:
get-fullscreen-size, *-child-placement: One pixel adjustment (again).

Modified:
   clfswm/ChangeLog
   clfswm/load.lisp
   clfswm/src/clfswm-placement.lisp
   clfswm/src/config.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Thu Jun 18 10:23:56 2009
@@ -1,3 +1,11 @@
+2009-06-18  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/config.lisp (get-fullscreen-size):  One pixel adjustment
+ 	(again).
+
+	* src/clfswm-placement.lisp (*-child-placement): One pixel
+	adjustment (again).
+
 2009-06-16  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-circulate-mode.lisp (draw-circulate-mode-window):

Modified: clfswm/load.lisp
==============================================================================
--- clfswm/load.lisp	(original)
+++ clfswm/load.lisp	Thu Jun 18 10:23:56 2009
@@ -38,7 +38,7 @@
 #+SBCL
 (require :sb-posix)
 
-#+SBCL
+#+(or SBCL ECL)
 (require :clx)
 
 #-ASDF

Modified: clfswm/src/clfswm-placement.lisp
==============================================================================
--- clfswm/src/clfswm-placement.lisp	(original)
+++ clfswm/src/clfswm-placement.lisp	Thu Jun 18 10:23:56 2009
@@ -127,22 +127,22 @@
   (declare (ignore width height))
   (with-current-child-coord (x y w h)
     (declare (ignore w h))
-    (values (1+ x)
-	    (1+ y))))
+    (values (+ x 2)
+	    (+ y 2))))
 
 (defun top-middle-child-placement (&optional (width 0) (height 0))
   (declare (ignore height))
   (with-current-child-coord (x y w h)
     (declare (ignore h))
     (values (+ x (truncate (/ (- w width) 2)))
-	    (1+ y))))
+	    (+ y 2))))
 
 (defun top-right-child-placement (&optional (width 0) (height 0))
   (declare (ignore height))
   (with-current-child-coord (x y w h)
     (declare (ignore h))
-    (values (+ x (- w width 1))
-	    (1+ y))))
+    (values (+ x (- w width 2))
+	    (+ y 2))))
 
 
 
@@ -150,7 +150,7 @@
   (declare (ignore width))
   (with-current-child-coord (x y w h)
     (declare (ignore w))
-    (values (1+ x)
+    (values (+ x 2)
 	    (+ y (truncate (/ (- h height) 2))))))
 
 (defun middle-middle-child-placement (&optional (width 0) (height 0))
@@ -160,7 +160,7 @@
 
 (defun middle-right-child-placement (&optional (width 0) (height 0))
   (with-current-child-coord (x y w h)
-    (values (+ x (- w width 1))
+    (values (+ x (- w width 2))
 	    (+ y (truncate (/ (- h height) 2))))))
 
 
@@ -168,15 +168,15 @@
   (declare (ignore width))
   (with-current-child-coord (x y w h)
     (declare (ignore w))
-    (values (1+ x)
-	    (+ y (- h height 1)))))
+    (values (+ x 2)
+	    (+ y (- h height 2)))))
 
 (defun bottom-middle-child-placement (&optional (width 0) (height 0))
   (with-current-child-coord (x y w h)
     (values (+ x (truncate (/ (- w width) 2)))
-	    (+ y (- h height 1)))))
+	    (+ y (- h height 2)))))
 
 (defun bottom-right-child-placement (&optional (width 0) (height 0))
   (with-current-child-coord (x y w h)
-    (values (+ x (- w width 1))
-	    (+ y (- h height 1)))))
+    (values (+ x (- w width 2))
+	    (+ y (- h height 2)))))

Modified: clfswm/src/config.lisp
==============================================================================
--- clfswm/src/config.lisp	(original)
+++ clfswm/src/config.lisp	Thu Jun 18 10:23:56 2009
@@ -59,7 +59,7 @@
 (defun get-fullscreen-size ()
   "Return the size of root child (values rx ry rw rh)
 You can tweak this to what you want"
-  (values -1 -1 (+ (xlib:screen-width *screen*)) (+ (xlib:screen-height *screen*))))
+  (values -2 -2 (+ (xlib:screen-width *screen*) 2) (+ (xlib:screen-height *screen*) 2)))
   ;;(values -1 -1 (xlib:screen-width *screen*) (xlib:screen-height *screen*)))
 ;; (values -1 -1 1024 768))
 ;;  (values 100 100 800 600))