diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-29 00:44:38 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:29 +0200 |
| commit | 687d44b6eaa3c64a12af9bbd557b401419b208eb (patch) | |
| tree | 55c30ba6b0ae6a2618395fae92922ea4402d52f6 /nx-X11/lib/X11/Geom.c | |
| parent | ea24f0b0eb7b82ad879810c8e84292d6bf810bea (diff) | |
| download | nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.tar.gz nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.tar.bz2 nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.zip | |
update src files *[ch] to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/Geom.c')
| -rw-r--r-- | nx-X11/lib/X11/Geom.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/Geom.c b/nx-X11/lib/X11/Geom.c index 6b86be27e..1da74f1c3 100644 --- a/nx-X11/lib/X11/Geom.c +++ b/nx-X11/lib/X11/Geom.c @@ -26,7 +26,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -66,11 +65,11 @@ XGeometry ( dmask = XParseGeometry(def, &dx, &dy, &dwidth, &dheight); /* set default values */ - *x = (dmask & XNegative) ? - DisplayWidth(dpy, screen) + dx - dwidth * fwidth - + *x = (dmask & XNegative) ? + DisplayWidth(dpy, screen) + dx - dwidth * fwidth - 2 * bwidth - xadd : dx; - *y = (dmask & YNegative) ? - DisplayHeight(dpy, screen) + dy - dheight * fheight - + *y = (dmask & YNegative) ? + DisplayHeight(dpy, screen) + dy - dheight * fheight - 2 * bwidth - yadd : dy; *width = dwidth; *height = dheight; @@ -80,11 +79,11 @@ XGeometry ( if (pmask & XValue) *x = (pmask & XNegative) ? - DisplayWidth(dpy, screen) + px - *width * fwidth - + DisplayWidth(dpy, screen) + px - *width * fwidth - 2 * bwidth - xadd : px; if (pmask & YValue) *y = (pmask & YNegative) ? - DisplayHeight(dpy, screen) + py - *height * fheight - + DisplayHeight(dpy, screen) + py - *height * fheight - 2 * bwidth - yadd : py; return (pmask); } |