summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-07-24 09:00:22 -0400
committerAdam Jackson <ajax@redhat.com>2008-07-24 15:46:08 -0400
commitd6228cb22aa89b90834d80d98b91862c1fc01b54 (patch)
tree4e284d35f26e728cfe5c4502f25ddf1c5591aa58 /Xext
parent990fc643ae90c034187707e7de414d80640ec6da (diff)
Shape extension is built-in and mandatory.
Diffstat (limited to 'Xext')
-rw-r--r--Xext/Makefile.am1
-rw-r--r--Xext/panoramiXprocs.c4
2 files changed, 0 insertions, 5 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 37c68d7d3..3ae6013c0 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -29,7 +29,6 @@ BUILTIN_SRCS = \
# Sources always included in libXextmodule.la & libXext.la
MODULE_SRCS = \
bigreq.c \
- shape.c \
sync.c \
xcmisc.c
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 30aff7460..38199a5df 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -595,9 +595,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
}
pWin = pDst->firstChild;
while (pWin) {
-#ifdef SHAPE
BoxRec box;
-#endif
if ((pWin->mapped) &&
(x >= pWin->drawable.x - wBorderWidth (pWin)) &&
(x < pWin->drawable.x + (int)pWin->drawable.width +
@@ -605,7 +603,6 @@ int PanoramiXTranslateCoords(ClientPtr client)
(y >= pWin->drawable.y - wBorderWidth (pWin)) &&
(y < pWin->drawable.y + (int)pWin->drawable.height +
wBorderWidth (pWin))
-#ifdef SHAPE
/* When a window is shaped, a further check
* is made to see if the point is inside
* borderSize
@@ -615,7 +612,6 @@ int PanoramiXTranslateCoords(ClientPtr client)
wBoundingShape(pWin),
x - pWin->drawable.x,
y - pWin->drawable.y, &box))
-#endif
)
{
rep.child = pWin->drawable.id;