xserver: Branch 'master' - 6 commits
Adam Jackson
ajax at kemper.freedesktop.org
Thu Jul 24 12:46:25 PDT 2008
Xext/Makefile.am | 15 ++++------
Xext/bigreq.c | 13 --------
Xext/dpms.c | 10 ------
Xext/panoramiXprocs.c | 4 --
Xext/saver.c | 13 --------
Xext/shape.c | 12 --------
Xext/xcalibrate.c | 7 ----
Xext/xcmisc.c | 13 --------
Xext/xevie.c | 10 ------
Xext/xres.c | 6 ----
Xext/xtest.c | 12 --------
Xext/xvmc.c | 8 -----
Xi/warpdevp.c | 2 -
composite/compext.c | 7 ----
dix/dispatch.c | 4 --
dix/events.c | 16 ----------
dix/extension.c | 3 +-
dix/window.c | 20 -------------
hw/dmx/dmx.c | 6 ----
hw/dmx/dmx.h | 2 -
hw/dmx/dmxclient.h | 2 -
hw/dmx/dmxscrinit.c | 4 --
hw/dmx/dmxwindow.c | 8 -----
hw/dmx/dmxwindow.h | 4 --
hw/kdrive/ephyr/ephyrdriext.c | 12 --------
hw/xfree86/dixmods/extmod/modinit.c | 36 ------------------------
hw/xfree86/dixmods/extmod/modinit.h | 19 ------------
hw/xfree86/dixmods/extmod/xf86vmode.c | 13 --------
hw/xfree86/dri2/dri2ext.c | 7 ----
hw/xfree86/loader/dixsym.c | 14 ---------
hw/xnest/Screen.c | 2 -
hw/xnest/Window.c | 10 ------
hw/xnest/XNWindow.h | 4 --
hw/xquartz/applewm.c | 12 --------
hw/xwin/win.h | 6 ----
hw/xwin/winmultiwindowshape.c | 2 -
hw/xwin/winmultiwindowwindow.c | 2 -
hw/xwin/winscrinit.c | 8 -----
hw/xwin/winwindow.c | 8 -----
hw/xwin/winwindowswm.c | 10 ------
include/dix.h | 2 -
include/globals.h | 16 ----------
include/inputstr.h | 2 -
include/scrnintstr.h | 4 --
include/windowstr.h | 8 -----
mi/miexpose.c | 2 -
mi/miinitext.c | 50 +++++-----------------------------
mi/mioverlay.c | 8 -----
mi/miscrinit.c | 2 -
mi/mivaltree.c | 4 --
mi/miwindow.c | 2 -
miext/rootless/rootlessCommon.h | 4 --
miext/rootless/rootlessScreen.c | 2 -
miext/rootless/rootlessValTree.c | 4 --
miext/rootless/rootlessWindow.c | 8 -----
miext/rootless/rootlessWindow.h | 2 -
os/WaitFor.c | 2 -
os/io.c | 20 -------------
os/utils.c | 12 --------
randr/randr.c | 7 ----
randr/rrxinerama.c | 7 ----
render/render.c | 10 ------
xfixes/region.c | 8 -----
xkb/xkb.c | 8 -----
64 files changed, 38 insertions(+), 522 deletions(-)
New commits:
commit f3ff2386016ced7e677817e9761a535f0f385813
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jul 24 15:28:07 2008 -0400
Sync is built-in and mandatory.
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index a941216..60b4c4c 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -21,16 +21,16 @@ endif
# Sources always included in libXextbuiltin.la & libXext.la
BUILTIN_SRCS = \
bigreq.c \
+ geext.c \
shape.c \
sleepuntil.c \
sleepuntil.h \
+ sync.c \
xcmisc.c \
- xtest.c \
- geext.c
+ xtest.c
-# Sources always included in libXextmodule.la & libXext.la
-MODULE_SRCS = \
- sync.c
+# Sources always included in libXextmodule.la & libXext.la. That's right, zero.
+MODULE_SRCS =
# Optional sources included if extension enabled by configure.ac rules
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 85ef198..9bcf51f 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -65,15 +65,6 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
-#ifdef XSYNC
- {
- SyncExtensionInit,
- SYNC_NAME,
- &noSyncExtension,
- NULL,
- NULL
- },
-#endif
#ifdef SCREENSAVER
{
ScreenSaverExtensionInit,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index b48e42d..6134213 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -27,13 +27,6 @@ extern void XTestExtensionInit(INITARGS);
extern void XTestExtension1Init(INITARGS);
#endif
-#ifdef XSYNC
-extern void SyncExtensionInit(INITARGS);
-#define _SYNC_SERVER
-#include <X11/extensions/sync.h>
-#include <X11/extensions/syncstr.h>
-#endif
-
#ifdef SCREENSAVER
extern void ScreenSaverExtensionInit (INITARGS);
#include <X11/extensions/saver.h>
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 9ac8af7..33a687a 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -372,9 +372,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef XCSECURITY
SYMVAR(noSecurityExtension)
#endif
-#ifdef XSYNC
- SYMVAR(noSyncExtension)
-#endif
#ifdef RES
SYMVAR(noResExtension)
#endif
diff --git a/include/globals.h b/include/globals.h
index 2f158ea..c1c8c67 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -89,10 +89,6 @@ extern Bool noRenderExtension;
extern Bool noSecurityExtension;
#endif
-#ifdef XSYNC
-extern Bool noSyncExtension;
-#endif
-
#ifdef RES
extern Bool noResExtension;
#endif
diff --git a/mi/miinitext.c b/mi/miinitext.c
index ea54163..393ee84 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -116,9 +116,6 @@ extern Bool noRenderExtension;
#ifdef XCSECURITY
extern Bool noSecurityExtension;
#endif
-#ifdef XSYNC
-extern Bool noSyncExtension;
-#endif
#ifdef RES
extern Bool noResExtension;
#endif
@@ -225,9 +222,7 @@ extern void ScreenSaverExtensionInit (INITARGS);
extern void XvExtensionInit(INITARGS);
extern void XvMCExtensionInit(INITARGS);
#endif
-#ifdef XSYNC
extern void SyncExtensionInit(INITARGS);
-#endif
#ifdef XKB
extern void XkbExtensionInit(INITARGS);
#endif
@@ -336,9 +331,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef XCSECURITY
{ "SECURITY", &noSecurityExtension },
#endif
-#ifdef XSYNC
- { "SYNC", &noSyncExtension },
-#endif
#ifdef RES
{ "X-Resource", &noResExtension },
#endif
@@ -442,9 +434,7 @@ InitExtensions(int argc, char *argv[])
XvMCExtensionInit();
}
#endif
-#ifdef XSYNC
- if (!noSyncExtension) SyncExtensionInit();
-#endif
+ SyncExtensionInit();
#if defined(XKB)
if (!noXkbExtension) XkbExtensionInit();
#endif
@@ -532,6 +522,7 @@ static ExtensionModule staticExtensions[] = {
#ifdef XIDLE
{ XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL },
#endif
+ { SyncExtensionInit, "SYNC", NULL, NULL, NULL },
#ifdef XKB
{ XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
#endif
diff --git a/os/WaitFor.c b/os/WaitFor.c
index da12976..f07388b 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -364,7 +364,6 @@ WaitForSomething(int *pClientsReady)
curclient = XFD_FD(&savedClientsReadable, i);
client_index = GetConnectionTranslation(curclient);
#endif
-#ifdef XSYNC
/* We implement "strict" priorities.
* Only the highest priority client is returned to
* dix. If multiple clients at the same priority are
@@ -391,7 +390,6 @@ WaitForSomething(int *pClientsReady)
* clients get batched together
*/
else if (client_priority == highest_priority)
-#endif
{
pClientsReady[nready++] = client_index;
}
diff --git a/os/utils.c b/os/utils.c
index a28db55..19b7a7d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -159,9 +159,6 @@ _X_EXPORT Bool noRenderExtension = FALSE;
#ifdef XCSECURITY
_X_EXPORT Bool noSecurityExtension = FALSE;
#endif
-#ifdef XSYNC
-_X_EXPORT Bool noSyncExtension = FALSE;
-#endif
#ifdef RES
_X_EXPORT Bool noResExtension = FALSE;
#endif
commit 3fcf4d3eb89fecaa2be7b5ac4933b693c9c3d97e
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jul 24 15:09:05 2008 -0400
XC-MISC is built-in and mandatory.
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 58e6c6d..a941216 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -24,13 +24,13 @@ BUILTIN_SRCS = \
shape.c \
sleepuntil.c \
sleepuntil.h \
+ xcmisc.c \
xtest.c \
geext.c
# Sources always included in libXextmodule.la & libXext.la
MODULE_SRCS = \
- sync.c \
- xcmisc.c
+ sync.c
# Optional sources included if extension enabled by configure.ac rules
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 57dd0fd..85ef198 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -83,15 +83,6 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
-#ifdef XCMISC
- {
- XCMiscExtensionInit,
- XCMiscExtensionName,
- &noXCMiscExtension,
- NULL,
- NULL
- },
-#endif
#ifdef XF86VIDMODE
{
XFree86VidModeExtensionInit,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index fc31c0d..b48e42d 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -39,11 +39,6 @@ extern void ScreenSaverExtensionInit (INITARGS);
#include <X11/extensions/saver.h>
#endif
-#ifdef XCMISC
-extern void XCMiscExtensionInit(INITARGS);
-#include <X11/extensions/xcmiscstr.h>
-#endif
-
#ifdef XF86VIDMODE
extern void XFree86VidModeExtensionInit(INITARGS);
#define _XF86VIDMODE_SERVER_
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 4441ecc..9ac8af7 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -378,9 +378,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef RES
SYMVAR(noResExtension)
#endif
-#ifdef XCMISC
- SYMVAR(noXCMiscExtension)
-#endif
#ifdef XEVIE
SYMVAR(noXevieExtension)
#endif
diff --git a/include/globals.h b/include/globals.h
index ff11c70..2f158ea 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -97,10 +97,6 @@ extern Bool noSyncExtension;
extern Bool noResExtension;
#endif
-#ifdef XCMISC
-extern Bool noXCMiscExtension;
-#endif
-
#ifdef XEVIE
extern Bool noXevieExtension;
#endif
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 01b1159..ea54163 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -122,9 +122,6 @@ extern Bool noSyncExtension;
#ifdef RES
extern Bool noResExtension;
#endif
-#ifdef XCMISC
-extern Bool noXCMiscExtension;
-#endif
#ifdef XEVIE
extern Bool noXevieExtension;
#endif
@@ -234,9 +231,7 @@ extern void SyncExtensionInit(INITARGS);
#ifdef XKB
extern void XkbExtensionInit(INITARGS);
#endif
-#ifdef XCMISC
extern void XCMiscExtensionInit(INITARGS);
-#endif
#ifdef XRECORD
extern void RecordExtensionInit(INITARGS);
#endif
@@ -347,9 +342,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef RES
{ "X-Resource", &noResExtension },
#endif
-#ifdef XCMISC
- { "XC-MISC", &noXCMiscExtension },
-#endif
#ifdef XEVIE
{ "XEVIE", &noXevieExtension },
#endif
@@ -456,9 +448,7 @@ InitExtensions(int argc, char *argv[])
#if defined(XKB)
if (!noXkbExtension) XkbExtensionInit();
#endif
-#ifdef XCMISC
- if (!noXCMiscExtension) XCMiscExtensionInit();
-#endif
+ XCMiscExtensionInit();
#ifdef XRECORD
if (!noTestExtensions) RecordExtensionInit();
#endif
@@ -545,6 +535,7 @@ static ExtensionModule staticExtensions[] = {
#ifdef XKB
{ XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
#endif
+ { XCMiscExtensionInit, "XC-MISC", NULL, NULL, NULL },
#ifdef XCSECURITY
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
#endif
diff --git a/os/utils.c b/os/utils.c
index 70bbdaa..a28db55 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -165,9 +165,6 @@ _X_EXPORT Bool noSyncExtension = FALSE;
#ifdef RES
_X_EXPORT Bool noResExtension = FALSE;
#endif
-#ifdef XCMISC
-_X_EXPORT Bool noXCMiscExtension = FALSE;
-#endif
#ifdef XEVIE
/* Xevie is disabled by default for now until the
* interface is stable */
commit 9757106bba8f7bea99c5211817fc6b5fde4e6f66
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jul 24 14:59:14 2008 -0400
Remove all empty extension reset hooks, replace with NULL.
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index f0dec29..1e807d8 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -41,10 +41,6 @@ from The Open Group.
#include "opaque.h"
#include "modinit.h"
-static void BigReqResetProc(
- ExtensionEntry * /* extEntry */
-);
-
static DISPATCH_PROC(ProcBigReqDispatch);
void
@@ -52,14 +48,7 @@ BigReqExtensionInit(INITARGS)
{
AddExtension(XBigReqExtensionName, 0, 0,
ProcBigReqDispatch, ProcBigReqDispatch,
- BigReqResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-BigReqResetProc (extEntry)
- ExtensionEntry *extEntry;
-{
+ NULL, StandardMinorOpcode);
}
static int
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 54871c5..bad7aa6 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -68,21 +68,13 @@ static DISPATCH_PROC(ProcDPMSInfo);
static DISPATCH_PROC(SProcDPMSInfo);
static DISPATCH_PROC(ProcDPMSCapable);
static DISPATCH_PROC(SProcDPMSCapable);
-static void DPMSResetProc(ExtensionEntry* extEntry);
void
DPMSExtensionInit(INITARGS)
{
AddExtension(DPMSExtensionName, 0, 0,
ProcDPMSDispatch, SProcDPMSDispatch,
- DPMSResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-DPMSResetProc (extEntry)
- ExtensionEntry *extEntry;
-{
+ NULL, StandardMinorOpcode);
}
static int
diff --git a/Xext/saver.c b/Xext/saver.c
index 69a5fa1..d74495b 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -110,10 +110,6 @@ static void SScreenSaverNotifyEvent (
xScreenSaverNotifyEvent * /* to */
);
-static void ScreenSaverResetProc (
- ExtensionEntry * /* extEntry */
- );
-
static RESTYPE SuspendType; /* resource type for suspension records */
typedef struct _ScreenSaverSuspension *ScreenSaverSuspensionPtr;
@@ -269,20 +265,13 @@ ScreenSaverExtensionInit(INITARGS)
if (AttrType && EventType && SuspendType &&
(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
- ScreenSaverResetProc, StandardMinorOpcode)))
+ NULL, StandardMinorOpcode)))
{
ScreenSaverEventBase = extEntry->eventBase;
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
}
}
-/*ARGSUSED*/
-static void
-ScreenSaverResetProc (extEntry)
-ExtensionEntry *extEntry;
-{
-}
-
static void
CheckScreenPrivate (pScreen)
ScreenPtr pScreen;
diff --git a/Xext/shape.c b/Xext/shape.c
index 6857c28..aaef0cb 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -61,9 +61,6 @@ static int ShapeFreeEvents(
pointer /* data */,
XID /* id */
);
-static void ShapeResetProc(
- ExtensionEntry * /* extEntry */
- );
static void SShapeNotifyEvent(
xShapeNotifyEvent * /* from */,
xShapeNotifyEvent * /* to */
@@ -149,20 +146,13 @@ ShapeExtensionInit(void)
if (ClientType && EventType &&
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
ProcShapeDispatch, SProcShapeDispatch,
- ShapeResetProc, StandardMinorOpcode)))
+ NULL, StandardMinorOpcode)))
{
ShapeEventBase = extEntry->eventBase;
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
}
}
-/*ARGSUSED*/
-static void
-ShapeResetProc (extEntry)
-ExtensionEntry *extEntry;
-{
-}
-
static int
RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
ClientPtr client;
diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c
index 3fe2bdc..3e05e6c 100644
--- a/Xext/xcalibrate.c
+++ b/Xext/xcalibrate.c
@@ -218,11 +218,6 @@ SProcXCalibrateScreenToCoord (ClientPtr client)
return ProcXCalibrateScreenToCoord(client);
}
-static void
-XCalibrateResetProc (ExtensionEntry *extEntry)
-{
-}
-
static int
ProcXCalibrateDispatch (ClientPtr client)
{
@@ -292,7 +287,7 @@ XCalibrateExtensionInit(void)
extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,
ProcXCalibrateDispatch, SProcXCalibrateDispatch,
- XCalibrateResetProc, StandardMinorOpcode);
+ NULL, StandardMinorOpcode);
if (!extEntry)
return;
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 2f6208f..1ee173b 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -48,10 +48,6 @@ from The Open Group.
#define UINT32_MAX 0xffffffffU
#endif
-static void XCMiscResetProc(
- ExtensionEntry * /* extEntry */
-);
-
static DISPATCH_PROC(ProcXCMiscDispatch);
static DISPATCH_PROC(ProcXCMiscGetVersion);
static DISPATCH_PROC(ProcXCMiscGetXIDList);
@@ -66,14 +62,7 @@ XCMiscExtensionInit(INITARGS)
{
AddExtension(XCMiscExtensionName, 0, 0,
ProcXCMiscDispatch, SProcXCMiscDispatch,
- XCMiscResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-XCMiscResetProc (extEntry)
- ExtensionEntry *extEntry;
-{
+ NULL, StandardMinorOpcode);
}
static int
diff --git a/Xext/xevie.c b/Xext/xevie.c
index a5b1837..bbbf045 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -67,8 +67,6 @@ extern int xeviegrabState;
static DISPATCH_PROC(ProcXevieDispatch);
static DISPATCH_PROC(SProcXevieDispatch);
-static void XevieResetProc (ExtensionEntry *extEntry);
-
static unsigned char XevieReqCode = 0;
static int XevieErrorBase;
@@ -140,19 +138,13 @@ XevieExtensionInit (void)
XevieNumberErrors,
ProcXevieDispatch,
SProcXevieDispatch,
- XevieResetProc,
+ NULL,
StandardMinorOpcode))) {
XevieReqCode = (unsigned char)extEntry->base;
XevieErrorBase = extEntry->errorBase;
}
}
-/*ARGSUSED*/
-static
-void XevieResetProc (ExtensionEntry *extEntry)
-{
-}
-
static
int ProcXevieQueryVersion (ClientPtr client)
{
diff --git a/Xext/xres.c b/Xext/xres.c
index 3c47012..75ade58 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -301,10 +301,6 @@ ProcXResQueryClientPixmapBytes (ClientPtr client)
return (client->noClientException);
}
-
-static void
-ResResetProc (ExtensionEntry *extEntry) { }
-
static int
ProcResDispatch (ClientPtr client)
{
@@ -386,5 +382,5 @@ ResExtensionInit(INITARGS)
{
(void) AddExtension(XRES_NAME, 0, 0,
ProcResDispatch, SProcResDispatch,
- ResResetProc, StandardMinorOpcode);
+ NULL, StandardMinorOpcode);
}
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 8e96f65..fbf2a27 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -60,9 +60,6 @@ extern int DeviceMotionNotify;
#include "panoramiXsrv.h"
#endif
-static void XTestResetProc(
- ExtensionEntry * /* extEntry */
- );
static int XTestSwapFakeInput(
ClientPtr /* client */,
xReq * /* req */
@@ -84,14 +81,7 @@ XTestExtensionInit(INITARGS)
{
AddExtension(XTestExtensionName, 0, 0,
ProcXTestDispatch, SProcXTestDispatch,
- XTestResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-XTestResetProc (extEntry)
- ExtensionEntry *extEntry;
-{
+ NULL, StandardMinorOpcode);
}
static int
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 3a77eb6..dc1e7dd 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -108,12 +108,6 @@ XvMCDestroySubpictureRes(pointer data, XID id)
return Success;
}
-static void
-XvMCResetProc (ExtensionEntry *extEntry)
-{
-}
-
-
static int
ProcXvMCQueryVersion(ClientPtr client)
{
@@ -688,7 +682,7 @@ XvMCExtensionInit(void)
extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors,
ProcXvMCDispatch, SProcXvMCDispatch,
- XvMCResetProc, StandardMinorOpcode);
+ NULL, StandardMinorOpcode);
if(!extEntry) return;
diff --git a/composite/compext.c b/composite/compext.c
index e720f6c..154f719 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -77,11 +77,6 @@ CompositeClientCallback (CallbackListPtr *list,
pCompositeClient->minor_version = 0;
}
-static void
-CompositeResetProc (ExtensionEntry *extEntry)
-{
-}
-
static int
FreeCompositeClientWindow (pointer value, XID ccwid)
{
@@ -598,7 +593,7 @@ CompositeExtensionInit (void)
extEntry = AddExtension (COMPOSITE_NAME, 0, 0,
ProcCompositeDispatch, SProcCompositeDispatch,
- CompositeResetProc, StandardMinorOpcode);
+ NULL, StandardMinorOpcode);
if (!extEntry)
return;
CompositeReqCode = (CARD8) extEntry->base;
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 5f1fc05..10d9e22 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -113,10 +113,6 @@ static int _DMXXineramaActive(void)
return 0;
}
-static void DMXResetProc(ExtensionEntry *extEntry)
-{
-}
-
/** Initialize the extension. */
void DMXExtensionInit(void)
{
@@ -124,7 +120,7 @@ void DMXExtensionInit(void)
if ((extEntry = AddExtension(DMX_EXTENSION_NAME, 0, 0,
ProcDMXDispatch, SProcDMXDispatch,
- DMXResetProc, StandardMinorOpcode)))
+ NULL, StandardMinorOpcode)))
DMXCode = extEntry->base;
}
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index 21e895f..05cecf4 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -92,8 +92,6 @@ static DISPATCH_PROC(SProcXF86DRIQueryVersion);
static DISPATCH_PROC(SProcXF86DRIQueryDirectRenderingCapable);
static DISPATCH_PROC(SProcXF86DRIDispatch);
-static void XF86DRIResetProc(ExtensionEntry* extEntry);
-
static Bool ephyrDRIScreenInit (ScreenPtr a_screen) ;
static Bool ephyrDRICreateWindow (WindowPtr a_win) ;
static Bool ephyrDRIDestroyWindow (WindowPtr a_win) ;
@@ -150,7 +148,7 @@ ephyrDRIExtensionInit (ScreenPtr a_screen)
XF86DRINumberErrors,
ProcXF86DRIDispatch,
SProcXF86DRIDispatch,
- XF86DRIResetProc,
+ NULL,
StandardMinorOpcode))) {
DRIReqCode = (unsigned char)extEntry->base;
DRIErrorBase = extEntry->errorBase;
@@ -612,14 +610,6 @@ out:
}
-/*ARGSUSED*/
-static void
-XF86DRIResetProc (
- ExtensionEntry* extEntry
-)
-{
-}
-
static int
ProcXF86DRIQueryVersion (register ClientPtr client)
{
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 718d40f..91d5865 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -65,10 +65,6 @@ typedef struct {
#define VM_SETPRIV(c,p) \
dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p)
-static void XF86VidModeResetProc(
- ExtensionEntry* /* extEntry */
-);
-
static DISPATCH_PROC(ProcXF86VidModeDispatch);
static DISPATCH_PROC(ProcXF86VidModeGetAllModeLines);
static DISPATCH_PROC(ProcXF86VidModeGetModeLine);
@@ -199,7 +195,7 @@ XFree86VidModeExtensionInit(void)
XF86VidModeNumberErrors,
ProcXF86VidModeDispatch,
SProcXF86VidModeDispatch,
- XF86VidModeResetProc,
+ NULL,
StandardMinorOpcode))) {
#if 0
XF86VidModeReqCode = (unsigned char)extEntry->base;
@@ -212,13 +208,6 @@ XFree86VidModeExtensionInit(void)
}
}
-/*ARGSUSED*/
-static void
-XF86VidModeResetProc (extEntry)
- ExtensionEntry* extEntry;
-{
-}
-
static int
ClientMajorVersion(ClientPtr client)
{
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 4ae0fda..8b93914 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -322,11 +322,6 @@ SProcDRI2Dispatch (ClientPtr client)
}
}
-static void
-DRI2ResetProc (ExtensionEntry *extEntry)
-{
-}
-
static int DRI2DrawableGone(pointer p, XID id)
{
DrawablePtr pDrawable = p;
@@ -344,7 +339,7 @@ DRI2ExtensionInit(void)
DRI2NumberErrors,
ProcDRI2Dispatch,
SProcDRI2Dispatch,
- DRI2ResetProc,
+ NULL,
StandardMinorOpcode);
dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone);
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index ba86f10..c5ca8e2 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -74,8 +74,6 @@ static int WMErrorBase;
static DISPATCH_PROC(ProcAppleWMDispatch);
static DISPATCH_PROC(SProcAppleWMDispatch);
-static void AppleWMResetProc(ExtensionEntry* extEntry);
-
static unsigned char WMReqCode = 0;
static int WMEventBase = 0;
@@ -124,7 +122,7 @@ AppleWMExtensionInit(
AppleWMNumberErrors,
ProcAppleWMDispatch,
SProcAppleWMDispatch,
- AppleWMResetProc,
+ NULL,
StandardMinorOpcode)))
{
WMReqCode = (unsigned char)extEntry->base;
@@ -135,14 +133,6 @@ AppleWMExtensionInit(
}
}
-/*ARGSUSED*/
-static void
-AppleWMResetProc (
- ExtensionEntry* extEntry
-)
-{
-}
-
/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
void
AppleWMSetScreenOrigin(
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index e1994de..28bcb64 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -49,8 +49,6 @@ static int WMErrorBase;
static DISPATCH_PROC(ProcWindowsWMDispatch);
static DISPATCH_PROC(SProcWindowsWMDispatch);
-static void WindowsWMResetProc(ExtensionEntry* extEntry);
-
static unsigned char WMReqCode = 0;
static int WMEventBase = 0;
@@ -98,7 +96,7 @@ winWindowsWMExtensionInit ()
WindowsWMNumberErrors,
ProcWindowsWMDispatch,
SProcWindowsWMDispatch,
- WindowsWMResetProc,
+ NULL,
StandardMinorOpcode)))
{
WMReqCode = (unsigned char)extEntry->base;
@@ -108,12 +106,6 @@ winWindowsWMExtensionInit ()
}
}
-/*ARGSUSED*/
-static void
-WindowsWMResetProc (ExtensionEntry* extEntry)
-{
-}
-
static int
ProcWindowsWMQueryVersion(register ClientPtr client)
{
diff --git a/randr/randr.c b/randr/randr.c
index bc2b995..9bfed05 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -86,11 +86,6 @@ RRClientCallback (CallbackListPtr *list,
}
}
-static void
-RRResetProc (ExtensionEntry *extEntry)
-{
-}
-
static Bool
RRCloseScreen (int i, ScreenPtr pScreen)
{
@@ -339,7 +334,7 @@ RRExtensionInit (void)
return;
extEntry = AddExtension (RANDR_NAME, RRNumberEvents, RRNumberErrors,
ProcRRDispatch, SProcRRDispatch,
- RRResetProc, StandardMinorOpcode);
+ NULL, StandardMinorOpcode);
if (!extEntry)
return;
RRErrorBase = extEntry->errorBase;
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index 240fca2..e994590 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -415,11 +415,6 @@ SProcRRXineramaDispatch(ClientPtr client)
return BadRequest;
}
-static void
-RRXineramaResetProc(ExtensionEntry* extEntry)
-{
-}
-
void
RRXineramaExtensionInit(void)
{
@@ -439,6 +434,6 @@ RRXineramaExtensionInit(void)
(void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
ProcRRXineramaDispatch,
SProcRRXineramaDispatch,
- RRXineramaResetProc,
+ NULL,
StandardMinorOpcode);
}
diff --git a/render/render.c b/render/render.c
index 638aa46..538697b 100644
--- a/render/render.c
+++ b/render/render.c
@@ -210,9 +210,6 @@ int (*SProcRenderVector[RenderNumberRequests])(ClientPtr) = {
SProcRenderCreateConicalGradient
};
-static void
-RenderResetProc (ExtensionEntry *extEntry);
-
int RenderErrBase;
DevPrivateKey RenderClientPrivateKey;
@@ -252,17 +249,12 @@ RenderExtensionInit (void)
extEntry = AddExtension (RENDER_NAME, 0, RenderNumberErrors,
ProcRenderDispatch, SProcRenderDispatch,
- RenderResetProc, StandardMinorOpcode);
+ NULL, StandardMinorOpcode);
if (!extEntry)
return;
RenderErrBase = extEntry->errorBase;
}
-static void
-RenderResetProc (ExtensionEntry *extEntry)
-{
-}
-
static int
ProcRenderQueryVersion (ClientPtr client)
{
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 9b3d78e..696586a 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -6199,12 +6199,6 @@ XkbClientGone(pointer data,XID id)
return 1;
}
-/*ARGSUSED*/
-static void
-XkbResetProc(ExtensionEntry *extEntry)
-{
-}
-
void
XkbExtensionInit(void)
{
@@ -6212,7 +6206,7 @@ XkbExtensionInit(void)
if ((extEntry = AddExtension(XkbName, XkbNumberEvents, XkbNumberErrors,
ProcXkbDispatch, SProcXkbDispatch,
- XkbResetProc, StandardMinorOpcode))) {
+ NULL, StandardMinorOpcode))) {
XkbReqCode = (unsigned char)extEntry->base;
XkbEventBase = (unsigned char)extEntry->eventBase;
XkbErrorBase = (unsigned char)extEntry->errorBase;
commit 6bcde69585fcc8f8dbfe81c115649f19274922fa
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jul 24 09:13:26 2008 -0400
Allow extension closedown hook to be null.
diff --git a/dix/extension.c b/dix/extension.c
index 9740c1b..5dbdb95 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -247,7 +247,8 @@ CloseDownExtensions(void)
for (i = NumExtensions - 1; i >= 0; i--)
{
- (* extensions[i]->CloseDown)(extensions[i]);
+ if (extensions[i]->CloseDown)
+ extensions[i]->CloseDown(extensions[i]);
NumExtensions = i;
xfree(extensions[i]->name);
for (j = extensions[i]->num_aliases; --j >= 0;)
commit f65c50c4e902c7b5619fb7bbee8462434d809ec7
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jul 24 09:07:42 2008 -0400
Bigreqs are built-in and mandatory.
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 3ae6013..58e6c6d 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -20,6 +20,7 @@ endif
# Sources always included in libXextbuiltin.la & libXext.la
BUILTIN_SRCS = \
+ bigreq.c \
shape.c \
sleepuntil.c \
sleepuntil.h \
@@ -28,7 +29,6 @@ BUILTIN_SRCS = \
# Sources always included in libXextmodule.la & libXext.la
MODULE_SRCS = \
- bigreq.c \
sync.c \
xcmisc.c
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index bfbd31c..57dd0fd 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -65,15 +65,6 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
-#ifdef BIGREQS
- {
- BigReqExtensionInit,
- XBigReqExtensionName,
- &noBigReqExtension,
- NULL,
- NULL
- },
-#endif
#ifdef XSYNC
{
SyncExtensionInit,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index a376a59..fc31c0d 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -27,11 +27,6 @@ extern void XTestExtensionInit(INITARGS);
extern void XTestExtension1Init(INITARGS);
#endif
-#ifdef BIGREQS
-extern void BigReqExtensionInit(INITARGS);
-#include <X11/extensions/bigreqstr.h>
-#endif
-
#ifdef XSYNC
extern void SyncExtensionInit(INITARGS);
#define _SYNC_SERVER
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 748e895..4441ecc 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -226,8 +226,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(DPMSDisabledSwitch)
SYMVAR(defaultDPMSEnabled)
#endif
- /* bigreq */
- SYMVAR(maxBigRequestSize)
#ifdef XV
/* XXX These are exported from the DDX, not DIX. */
SYMVAR(XvScreenInitProc)
@@ -341,9 +339,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(noTestExtensions)
SYMFUNC(GiveUp)
-#ifdef BIGREQS
- SYMVAR(noBigReqExtension)
-#endif
#ifdef COMPOSITE
SYMVAR(noCompositeExtension)
#endif
diff --git a/include/globals.h b/include/globals.h
index ccd71b3..ff11c70 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -45,10 +45,6 @@ extern Bool DPMSCapableFlag;
extern Bool PanoramiXExtensionDisabledHack;
#endif
-#ifdef BIGREQS
-extern Bool noBigReqExtension;
-#endif
-
#ifdef COMPOSITE
extern Bool noCompositeExtension;
#endif
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 0263ff1..01b1159 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -86,9 +86,6 @@ SOFTWARE.
extern Bool noTestExtensions;
-#ifdef BIGREQS
-extern Bool noBigReqExtension;
-#endif
#ifdef COMPOSITE
extern Bool noCompositeExtension;
#endif
@@ -220,9 +217,7 @@ extern void XInputExtensionInit(INITARGS);
#ifdef XTEST
extern void XTestExtensionInit(INITARGS);
#endif
-#ifdef BIGREQS
extern void BigReqExtensionInit(INITARGS);
-#endif
#ifdef XIDLE
extern void XIdleExtensionInit(INITARGS);
#endif
@@ -313,9 +308,6 @@ static ExtensionToggle ExtensionToggleList[] =
{
/* sort order is extension name string as shown in xdpyinfo */
{ "Generic Events", &noGEExtension },
-#ifdef BIGREQS
- { "BIG-REQUESTS", &noBigReqExtension },
-#endif
#ifdef COMPOSITE
{ "Composite", &noCompositeExtension },
#endif
@@ -445,9 +437,7 @@ InitExtensions(int argc, char *argv[])
#ifdef XTEST
if (!noTestExtensions) XTestExtensionInit();
#endif
-#ifdef BIGREQS
- if (!noBigReqExtension) BigReqExtensionInit();
-#endif
+ BigReqExtensionInit();
#ifdef XIDLE
if (!noXIdleExtension) XIdleExtensionInit();
#endif
@@ -548,6 +538,7 @@ static ExtensionModule staticExtensions[] = {
#ifdef XTEST
{ XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
#endif
+ { BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL, NULL },
#ifdef XIDLE
{ XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL },
#endif
diff --git a/os/io.c b/os/io.c
index 4a2f52f..723ff6a 100644
--- a/os/io.c
+++ b/os/io.c
@@ -106,13 +106,11 @@ static OsCommPtr AvailableInput = (OsCommPtr)NULL;
#define get_req_len(req,cli) ((cli)->swapped ? \
lswaps((req)->length) : (req)->length)
-#ifdef BIGREQS
#include <X11/extensions/bigreqstr.h>
#define get_big_req_len(req,cli) ((cli)->swapped ? \
lswapl(((xBigReq *)(req))->length) : \
((xBigReq *)(req))->length)
-#endif
#define MAX_TIMES_PER 10
@@ -192,9 +190,7 @@ ReadRequestFromClient(ClientPtr client)
int result;
register xReq *request;
Bool need_header;
-#ifdef BIGREQS
Bool move_header;
-#endif
/* If an input buffer was empty, either free it if it is too big
* or link it into our list of free input buffers. This means that
@@ -243,9 +239,7 @@ ReadRequestFromClient(ClientPtr client)
oci->bufptr += oci->lenLastReq;
need_header = FALSE;
-#ifdef BIGREQS
move_header = FALSE;
-#endif
gotnow = oci->bufcnt + oci->buffer - oci->bufptr;
if (gotnow < sizeof(xReq))
{
@@ -262,7 +256,6 @@ ReadRequestFromClient(ClientPtr client)
*/
request = (xReq *)oci->bufptr;
needed = get_req_len(request, client);
-#ifdef BIGREQS
if (!needed && client->big_requests)
{
/* It's a Big Request. */
@@ -276,7 +269,6 @@ ReadRequestFromClient(ClientPtr client)
else
needed = get_big_req_len(request, client);
}
-#endif
client->req_len = needed;
needed <<= 2; /* needed is in bytes now */
}
@@ -289,14 +281,12 @@ ReadRequestFromClient(ClientPtr client)
*/
oci->lenLastReq = 0;
-#ifdef BIGREQS
if (needed > maxBigRequestSize << 2)
{
/* request is too big for us to handle */
YieldControlDeath();
return -1;
}
-#endif
if ((gotnow == 0) ||
((oci->bufptr - oci->buffer + needed) > oci->size))
{
@@ -373,7 +363,6 @@ ReadRequestFromClient(ClientPtr client)
/* We wanted an xReq, now we've gotten it. */
request = (xReq *)oci->bufptr;
needed = get_req_len(request, client);
-#ifdef BIGREQS
if (!needed && client->big_requests)
{
move_header = TRUE;
@@ -382,7 +371,6 @@ ReadRequestFromClient(ClientPtr client)
else
needed = get_big_req_len(request, client);
}
-#endif
client->req_len = needed;
needed <<= 2;
}
@@ -395,11 +383,9 @@ ReadRequestFromClient(ClientPtr client)
}
if (needed == 0)
{
-#ifdef BIGREQS
if (client->big_requests)
needed = sizeof(xBigReq);
else
-#endif
needed = sizeof(xReq);
}
oci->lenLastReq = needed;
@@ -417,12 +403,10 @@ ReadRequestFromClient(ClientPtr client)
{
request = (xReq *)(oci->bufptr + needed);
if (gotnow >= (result = (get_req_len(request, client) << 2))
-#ifdef BIGREQS
&& (result ||
(client->big_requests &&
(gotnow >= sizeof(xBigReq) &&
gotnow >= (get_big_req_len(request, client) << 2))))
-#endif
)
FD_SET(fd, &ClientsWithInput);
else
@@ -451,7 +435,6 @@ ReadRequestFromClient(ClientPtr client)
#endif
if (++timesThisConnection >= MAX_TIMES_PER)
YieldControl();
-#ifdef BIGREQS
if (move_header)
{
request = (xReq *)oci->bufptr;
@@ -460,7 +443,6 @@ ReadRequestFromClient(ClientPtr client)
oci->lenLastReq -= (sizeof(xBigReq) - sizeof(xReq));
client->req_len -= (sizeof(xBigReq) - sizeof(xReq)) >> 2;
}
-#endif
client->requestBuffer = (pointer)oci->bufptr;
#ifdef DEBUG_COMMUNICATION
{
@@ -572,7 +554,6 @@ ResetCurrentRequest(ClientPtr client)
{
request = (xReq *)oci->bufptr;
needed = get_req_len(request, client);
-#ifdef BIGREQS
if (!needed && client->big_requests)
{
oci->bufptr -= sizeof(xBigReq) - sizeof(xReq);
@@ -584,7 +565,6 @@ ResetCurrentRequest(ClientPtr client)
swapl(&((xBigReq *)oci->bufptr)->length, n);
}
}
-#endif
if (gotnow >= (needed << 2))
{
if (FD_ISSET(fd, &AllClients))
diff --git a/os/utils.c b/os/utils.c
index 21203e4..70bbdaa 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -124,9 +124,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#endif
_X_EXPORT Bool noTestExtensions;
-#ifdef BIGREQS
-_X_EXPORT Bool noBigReqExtension = FALSE;
-#endif
#ifdef COMPOSITE
_X_EXPORT Bool noCompositeExtension = FALSE;
#endif
commit d6228cb22aa89b90834d80d98b91862c1fc01b54
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jul 24 09:00:22 2008 -0400
Shape extension is built-in and mandatory.
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 37c68d7..3ae6013 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 30aff74..38199a5 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;
diff --git a/Xi/warpdevp.c b/Xi/warpdevp.c
index 502cab4..c8e8d61 100644
--- a/Xi/warpdevp.c
+++ b/Xi/warpdevp.c
@@ -155,10 +155,8 @@ ProcXWarpDevicePointer(ClientPtr client)
else if (y >= pSprite->physLimits.y2)
y = pSprite->physLimits.y2 - 1;
-#if defined(SHAPE)
if (pSprite->hotShape)
ConfineToShape(pDev, pSprite->hotShape, &x, &y);
-#endif
(*newScreen->SetCursorPosition)(pDev, newScreen, x, y, TRUE);
} else if (!PointerConfinedToScreen(pDev))
{
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 8b21690..c04443b 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1044,9 +1044,7 @@ ProcTranslateCoords(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 +
@@ -1054,7 +1052,6 @@ ProcTranslateCoords(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
@@ -1068,7 +1065,6 @@ ProcTranslateCoords(ClientPtr client)
wInputShape(pWin),
x - pWin->drawable.x,
y - pWin->drawable.y, &box))
-#endif
)
{
rep.child = pWin->drawable.id;
diff --git a/dix/events.c b/dix/events.c
index b244482..c5578b0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -815,7 +815,6 @@ SetCriticalEvent(int event)
criticalEvents[event >> 3] |= 1 << (event & 7);
}
-#ifdef SHAPE
void
ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
{
@@ -853,7 +852,6 @@ ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
*px = x;
*py = y;
}
-#endif
static void
CheckPhysLimits(
@@ -887,10 +885,8 @@ CheckPhysLimits(
else
if (new.y >= pSprite->physLimits.y2)
new.y = pSprite->physLimits.y2 - 1;
-#ifdef SHAPE
if (pSprite->hotShape)
ConfineToShape(pDev, pSprite->hotShape, &new.x, &new.y);
-#endif
if ((pScreen != pSprite->hotPhys.pScreen) ||
(new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y))
{
@@ -942,11 +938,9 @@ CheckVirtualMotion(
pSprite->hot.y = lims.y1;
else if (pSprite->hot.y >= lims.y2)
pSprite->hot.y = lims.y2 - 1;
-#ifdef SHAPE
if (wBoundingShape(pWin))
ConfineToShape(pDev, &pWin->borderSize,
&pSprite->hot.x, &pSprite->hot.y);
-#endif
if (qe)
{
qe->pScreen = pSprite->hot.pScreen;
@@ -982,10 +976,8 @@ ConfineCursorToWindow(DeviceIntPtr pDev, WindowPtr pWin, Bool generateEvents, Bo
else
{
pSprite->hotLimits = *REGION_EXTENTS( pScreen, &pWin->borderSize);
-#ifdef SHAPE
pSprite->hotShape = wBoundingShape(pWin) ? &pWin->borderSize
: NullRegion;
-#endif
CheckPhysLimits(pDev, pSprite->current, generateEvents,
confineToScreen, pScreen);
}
@@ -2628,7 +2620,6 @@ XYToWindow(DeviceIntPtr pDev, int x, int y)
(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
@@ -2639,7 +2630,6 @@ XYToWindow(DeviceIntPtr pDev, int x, int y)
wInputShape(pWin),
x - pWin->drawable.x,
y - pWin->drawable.y, &box))
-#endif
#ifdef ROOTLESS
/* In rootless mode windows may be offscreen, even when
* they're in X's stack. (E.g. if the native window system
@@ -2732,10 +2722,8 @@ CheckMotion(xEvent *xE, DeviceIntPtr pDev)
pSprite->hot.y = pSprite->physLimits.y1;
else if (pSprite->hot.y >= pSprite->physLimits.y2)
pSprite->hot.y = pSprite->physLimits.y2 - 1;
-#ifdef SHAPE
if (pSprite->hotShape)
ConfineToShape(pDev, pSprite->hotShape, &pSprite->hot.x, &pSprite->hot.y);
-#endif
#ifdef XEVIE
xeviehot.x = pSprite->hot.x;
xeviehot.y = pSprite->hot.y;
@@ -2970,9 +2958,7 @@ InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
pSprite->hotLimits.y2 = PanoramiXPixHeight - panoramiXdataPtr[0].y;
pSprite->physLimits = pSprite->hotLimits;
pSprite->confineWin = NullWindow;
-#ifdef SHAPE
pSprite->hotShape = NullRegion;
-#endif
pSprite->screen = pScreen;
/* gotta UNINIT these someplace */
REGION_NULL(pScreen, &pSprite->Reg1);
@@ -3305,10 +3291,8 @@ ProcWarpPointer(ClientPtr client)
y = pSprite->physLimits.y1;
else if (y >= pSprite->physLimits.y2)
y = pSprite->physLimits.y2 - 1;
-#if defined(SHAPE)
if (pSprite->hotShape)
ConfineToShape(PickPointer(client), pSprite->hotShape, &x, &y);
-#endif
(*newScreen->SetCursorPosition)(PickPointer(client), newScreen, x, y,
TRUE);
}
diff --git a/dix/window.c b/dix/window.c
index a780d64..14fccab 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -407,11 +407,9 @@ CreateRootWindow(ScreenPtr pScreen)
pWin->optional->userProps = NULL;
pWin->optional->backingBitPlanes = ~0L;
pWin->optional->backingPixel = 0;
-#ifdef SHAPE
pWin->optional->boundingShape = NULL;
pWin->optional->clipShape = NULL;
pWin->optional->inputShape = NULL;
-#endif
pWin->optional->inputMasks = NULL;
pWin->optional->deviceCursors = NULL;
pWin->optional->geMasks = (GenericClientMasksPtr)xcalloc(1, sizeof(GenericClientMasksRec));
@@ -884,14 +882,12 @@ FreeWindowResources(WindowPtr pWin)
REGION_UNINIT(pScreen, &pWin->winSize);
REGION_UNINIT(pScreen, &pWin->borderClip);
REGION_UNINIT(pScreen, &pWin->borderSize);
-#ifdef SHAPE
if (wBoundingShape (pWin))
REGION_DESTROY(pScreen, wBoundingShape (pWin));
if (wClipShape (pWin))
REGION_DESTROY(pScreen, wClipShape (pWin));
if (wInputShape (pWin))
REGION_DESTROY(pScreen, wInputShape (pWin));
-#endif
if (pWin->borderIsPixel == FALSE)
(*pScreen->DestroyPixmap)(pWin->border.pixmap);
if (pWin->backgroundState == BackgroundPixmap)
@@ -1679,7 +1675,6 @@ CreateUnclippedWinSize (WindowPtr pWin)
box.x2 = pWin->drawable.x + (int) pWin->drawable.width;
box.y2 = pWin->drawable.y + (int) pWin->drawable.height;
pRgn = REGION_CREATE(pWin->drawable.pScreen, &box, 1);
-#ifdef SHAPE
if (wBoundingShape (pWin) || wClipShape (pWin)) {
ScreenPtr pScreen;
pScreen = pWin->drawable.pScreen;
@@ -1692,7 +1687,6 @@ CreateUnclippedWinSize (WindowPtr pWin)
REGION_INTERSECT(pScreen, pRgn, pRgn, wClipShape (pWin));
REGION_TRANSLATE(pScreen, pRgn, pWin->drawable.x, pWin->drawable.y);
}
-#endif
return pRgn;
}
@@ -1720,7 +1714,6 @@ SetWinSize (WindowPtr pWin)
pWin->drawable.x, pWin->drawable.y,
(int)pWin->drawable.width,
(int)pWin->drawable.height);
-#ifdef SHAPE
if (wBoundingShape (pWin) || wClipShape (pWin)) {
ScreenPtr pScreen;
pScreen = pWin->drawable.pScreen;
@@ -1736,7 +1729,6 @@ SetWinSize (WindowPtr pWin)
REGION_TRANSLATE(pScreen, &pWin->winSize, pWin->drawable.x,
pWin->drawable.y);
}
-#endif
}
_X_EXPORT void
@@ -1767,7 +1759,6 @@ SetBorderSize (WindowPtr pWin)
pWin->drawable.x - bw, pWin->drawable.y - bw,
(int)(pWin->drawable.width + (bw<<1)),
(int)(pWin->drawable.height + (bw<<1)));
-#ifdef SHAPE
if (wBoundingShape (pWin)) {
ScreenPtr pScreen;
pScreen = pWin->drawable.pScreen;
@@ -1781,7 +1772,6 @@ SetBorderSize (WindowPtr pWin)
REGION_UNION(pScreen, &pWin->borderSize, &pWin->borderSize,
&pWin->winSize);
}
-#endif
} else {
REGION_COPY(pWin->drawable.pScreen, &pWin->borderSize,
&pWin->winSize);
@@ -1972,7 +1962,6 @@ WindowExtents(
return(pBox);
}
-#ifdef SHAPE
#define IS_SHAPED(pWin) (wBoundingShape (pWin) != (RegionPtr) NULL)
static RegionPtr
@@ -2017,7 +2006,6 @@ ShapeOverlap (
REGION_DESTROY(pScreen, pSibRgn);
return ret;
}
-#endif
static Bool
AnyWindowOverlapsMe(
@@ -2035,9 +2023,7 @@ AnyWindowOverlapsMe(
{
sbox = WindowExtents(pSib, &sboxrec);
if (BOXES_OVERLAP(sbox, box)
-#ifdef SHAPE
&& ShapeOverlap (pWin, box, pSib, sbox)
-#endif
)
return(TRUE);
}
@@ -2060,9 +2046,7 @@ IOverlapAnyWindow(
{
sbox = WindowExtents(pSib, &sboxrec);
if (BOXES_OVERLAP(sbox, box)
-#ifdef SHAPE
&& ShapeOverlap (pWin, box, pSib, sbox)
-#endif
)
return(TRUE);
}
@@ -3617,14 +3601,12 @@ CheckWindowOptionalNeed (WindowPtr w)
return;
if (optional->backingPixel != 0)
return;
-#ifdef SHAPE
if (optional->boundingShape != NULL)
return;
if (optional->clipShape != NULL)
return;
if (optional->inputShape != NULL)
return;
-#endif
if (optional->inputMasks != NULL)
return;
if (optional->deviceCursors != NULL)
@@ -3681,11 +3663,9 @@ MakeWindowOptional (WindowPtr pWin)
optional->userProps = NULL;
optional->backingBitPlanes = ~0L;
optional->backingPixel = 0;
-#ifdef SHAPE
optional->boundingShape = NULL;
optional->clipShape = NULL;
optional->inputShape = NULL;
-#endif
optional->inputMasks = NULL;
optional->deviceCursors = NULL;
diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h
index 4fef915..00200a8 100644
--- a/hw/dmx/dmx.h
+++ b/hw/dmx/dmx.h
@@ -231,9 +231,7 @@ typedef struct _DMXScreenInfo {
InstallColormapProcPtr InstallColormap;
StoreColorsProcPtr StoreColors;
-#ifdef SHAPE
SetShapeProcPtr SetShape;
-#endif
#ifdef RENDER
CreatePictureProcPtr CreatePicture;
diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h
index 91ba049..f0c3608 100644
--- a/hw/dmx/dmxclient.h
+++ b/hw/dmx/dmxclient.h
@@ -84,9 +84,7 @@ typedef XID KeySym64;
#include <X11/cursorfont.h>
#include <X11/Xmu/SysUtil.h> /* For XmuSnprintf */
-#ifdef SHAPE
#include <X11/extensions/shape.h>
-#endif
#ifdef RENDER
#include <X11/extensions/Xrender.h>
diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 1d12ec3..0e49e96 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -340,10 +340,8 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
DMX_WRAP(InstallColormap, dmxInstallColormap, dmxScreen, pScreen);
DMX_WRAP(StoreColors, dmxStoreColors, dmxScreen, pScreen);
-#ifdef SHAPE
/* Wrap Shape functions */
DMX_WRAP(SetShape, dmxSetShape, dmxScreen, pScreen);
-#endif
}
if (!dmxCreateDefColormap(pScreen))
@@ -434,10 +432,8 @@ Bool dmxCloseScreen(int idx, ScreenPtr pScreen)
xfree(dmxScreen->shadow);
} else {
-#ifdef SHAPE
/* Unwrap Shape functions */
DMX_UNWRAP(SetShape, dmxScreen, pScreen);
-#endif
/* Unwrap the pScreen functions */
DMX_UNWRAP(CreateGC, dmxScreen, pScreen);
diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index 7494e6d..24acc08 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -57,9 +57,7 @@ static void dmxDoChangeWindowAttributes(WindowPtr pWindow,
unsigned long *mask,
XSetWindowAttributes *attribs);
-#ifdef SHAPE
static void dmxDoSetShape(WindowPtr pWindow);
-#endif
/** Initialize the private area for the window functions. */
Bool dmxInitWindow(ScreenPtr pScreen)
@@ -289,9 +287,7 @@ void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync)
pWinPriv->window = dmxCreateNonRootWindow(pWindow);
if (pWinPriv->restacked) dmxDoRestackWindow(pWindow);
-#ifdef SHAPE
if (pWinPriv->isShaped) dmxDoSetShape(pWindow);
-#endif
#ifdef RENDER
if (pWinPriv->hasPict) dmxCreatePictureList(pWindow);
#endif
@@ -323,9 +319,7 @@ Bool dmxCreateWindow(WindowPtr pWindow)
pWinPriv->mapped = FALSE;
pWinPriv->restacked = FALSE;
pWinPriv->attribMask = 0;
-#ifdef SHAPE
pWinPriv->isShaped = FALSE;
-#endif
#ifdef RENDER
pWinPriv->hasPict = FALSE;
#endif
@@ -942,7 +936,6 @@ void dmxChangeBorderWidth(WindowPtr pWindow, unsigned int width)
DMX_WRAP(ChangeBorderWidth, dmxChangeBorderWidth, dmxScreen, pScreen);
}
-#ifdef SHAPE
static void dmxDoSetShape(WindowPtr pWindow)
{
ScreenPtr pScreen = pWindow->drawable.pScreen;
@@ -1029,4 +1022,3 @@ void dmxSetShape(WindowPtr pWindow)
DMX_WRAP(SetShape, dmxSetShape, dmxScreen, pScreen);
}
-#endif
diff --git a/hw/dmx/dmxwindow.h b/hw/dmx/dmxwindow.h
index 72c76aa..353d0a3 100644
--- a/hw/dmx/dmxwindow.h
+++ b/hw/dmx/dmxwindow.h
@@ -48,9 +48,7 @@ typedef struct _dmxWinPriv {
unsigned long attribMask;
Colormap cmap;
Visual *visual;
-#ifdef SHAPE
Bool isShaped;
-#endif
#ifdef RENDER
Bool hasPict;
#endif
@@ -97,10 +95,8 @@ extern void dmxResizeRootWindow(WindowPtr pRoot,
extern Bool dmxBEDestroyWindow(WindowPtr pWindow);
-#ifdef SHAPE
/* Support for shape extension */
extern void dmxSetShape(WindowPtr pWindow);
-#endif
/** Private index. \see dmxwindow.c \see dmxscrinit.c */
extern DevPrivateKey dmxWinPrivateKey;
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index a18118a..bfbd31c 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -47,15 +47,6 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
-#ifdef SHAPE
- {
- ShapeExtensionInit,
- SHAPENAME,
- &noShapeExtension,
- NULL,
- NULL
- },
-#endif
#ifdef MULTIBUFFER
{
MultibufferExtensionInit,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index fe95c49..a376a59 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -7,10 +7,8 @@
#define INITARGS void
#endif
-#ifdef SHAPE
#define _SHAPE_SERVER_ /* don't want Xlib structures */
#include <X11/extensions/shapestr.h>
-#endif
#ifdef MULTIBUFFER
extern void MultibufferExtensionInit(INITARGS);
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index eb7988f..748e895 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -374,9 +374,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef RENDER
SYMVAR(noRenderExtension)
#endif
-#ifdef SHAPE
- SYMVAR(noShapeExtension)
-#endif
#ifdef XCSECURITY
SYMVAR(noSecurityExtension)
#endif
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 1c129e7..0229455 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -331,10 +331,8 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
if (!miScreenDevPrivateInit(pScreen, xnestWidth, NULL))
return FALSE;
-#ifdef SHAPE
/* overwrite miSetShape with our own */
pScreen->SetShape = xnestSetShape;
-#endif /* SHAPE */
/* devPrivates */
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index bc9d8be..23383e1 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -131,12 +131,10 @@ xnestCreateWindow(WindowPtr pWin)
xnestWindowPriv(pWin)->sibling_above = None;
if (pWin->nextSib)
xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);
-#ifdef SHAPE
xnestWindowPriv(pWin)->bounding_shape =
REGION_CREATE(pWin->drawable.pScreen, NULL, 1);
xnestWindowPriv(pWin)->clip_shape =
REGION_CREATE(pWin->drawable.pScreen, NULL, 1);
-#endif /* SHAPE */
if (!pWin->parent) /* only the root window will have the right colormap */
xnestSetInstalledColormapWindows(pWin->drawable.pScreen);
@@ -150,12 +148,10 @@ xnestDestroyWindow(WindowPtr pWin)
if (pWin->nextSib)
xnestWindowPriv(pWin->nextSib)->sibling_above =
xnestWindowPriv(pWin)->sibling_above;
-#ifdef SHAPE
REGION_DESTROY(pWin->drawable.pScreen,
xnestWindowPriv(pWin)->bounding_shape);
REGION_DESTROY(pWin->drawable.pScreen,
xnestWindowPriv(pWin)->clip_shape);
-#endif
XDestroyWindow(xnestDisplay, xnestWindow(pWin));
xnestWindowPriv(pWin)->window = None;
@@ -362,9 +358,7 @@ Bool
xnestRealizeWindow(WindowPtr pWin)
{
xnestConfigureWindow(pWin, CWStackingOrder);
-#ifdef SHAPE
xnestShapeWindow(pWin);
-#endif /* SHAPE */
XMapWindow(xnestDisplay, xnestWindow(pWin));
return True;
@@ -387,9 +381,7 @@ void
xnestClipNotify(WindowPtr pWin, int dx, int dy)
{
xnestConfigureWindow(pWin, CWStackingOrder);
-#ifdef SHAPE
xnestShapeWindow(pWin);
-#endif /* SHAPE */
}
static Bool
@@ -426,7 +418,6 @@ xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed)
miWindowExposures(pWin, pRgn, other_exposed);
}
-#ifdef SHAPE
void
xnestSetShape(WindowPtr pWin)
{
@@ -529,4 +520,3 @@ xnestShapeWindow(WindowPtr pWin)
}
}
}
-#endif /* SHAPE */
diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h
index 4cb66c8..b59d86a 100644
--- a/hw/xnest/XNWindow.h
+++ b/hw/xnest/XNWindow.h
@@ -24,10 +24,8 @@ typedef struct {
unsigned int height;
unsigned int border_width;
Window sibling_above;
-#ifdef SHAPE
RegionPtr bounding_shape;
RegionPtr clip_shape;
-#endif /* SHAPE */
} xnestPrivWin;
typedef struct {
@@ -68,9 +66,7 @@ void xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion);
void xnestClipNotify(WindowPtr pWin, int dx, int dy);
void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn,
RegionPtr other_exposed);
-#ifdef SHAPE
void xnestSetShape(WindowPtr pWin);
void xnestShapeWindow(WindowPtr pWin);
-#endif /* SHAPE */
#endif /* XNESTWINDOW_H */
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 3ab3249..ea54b99 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -586,9 +586,7 @@ typedef struct _winPrivScreenRec
ReparentWindowProcPtr ReparentWindow;
ResizeWindowProcPtr ResizeWindow;
MoveWindowProcPtr MoveWindow;
-#ifdef SHAPE
SetShapeProcPtr SetShape;
-#endif
winCursorRec cursor;
} winPrivScreenRec;
@@ -1196,10 +1194,8 @@ winUnmapWindowRootless (WindowPtr pWindow);
Bool
winMapWindowRootless (WindowPtr pWindow);
-#ifdef SHAPE
void
winSetShapeRootless (WindowPtr pWindow);
-#endif
/*
@@ -1215,7 +1211,6 @@ winXIconToHICON (WindowPtr pWin, int iconSize);
* winmultiwindowshape.c
*/
-# ifdef SHAPE
void
winReshapeMultiWindow (WindowPtr pWin);
@@ -1224,7 +1219,6 @@ winSetShapeMultiWindow (WindowPtr pWindow);
void
winUpdateRgnMultiWindow (WindowPtr pWindow);
-# endif
#endif
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 33deae3..62cddd0 100644
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -32,7 +32,6 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
-#ifdef SHAPE
#include "win.h"
@@ -208,4 +207,3 @@ winReshapeMultiWindow (WindowPtr pWin)
return;
}
-#endif
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 037c881..75bef97 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -352,11 +352,9 @@ winMapWindowMultiWindow (WindowPtr pWin)
/* Refresh/redisplay the Windows window associated with this X window */
winUpdateWindowsWindow (pWin);
-#ifdef SHAPE
/* Update the Windows window's shape */
winReshapeMultiWindow (pWin);
winUpdateRgnMultiWindow (pWin);
-#endif
return fResult;
}
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 9dc4c3d..5121095 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -478,9 +478,7 @@ winFinishScreenInitFB (int index,
WRAP(UnrealizeWindow);
WRAP(PositionWindow);
WRAP(ChangeWindowAttributes);
-#ifdef SHAPE
WRAP(SetShape);
-#endif
/* Assign rootless window procedures to be top level procedures */
pScreen->CreateWindow = winCreateWindowRootless;
@@ -489,9 +487,7 @@ winFinishScreenInitFB (int index,
/*pScreen->ChangeWindowAttributes = winChangeWindowAttributesRootless;*/
pScreen->RealizeWindow = winMapWindowRootless;
pScreen->UnrealizeWindow = winUnmapWindowRootless;
-#ifdef SHAPE
pScreen->SetShape = winSetShapeRootless;
-#endif
/* Undefine the WRAP macro, as it is not needed elsewhere */
#undef WRAP
@@ -523,9 +519,7 @@ winFinishScreenInitFB (int index,
WRAP(ResizeWindow);
WRAP(MoveWindow);
WRAP(CopyWindow);
-#ifdef SHAPE
WRAP(SetShape);
-#endif
/* Assign multi-window window procedures to be top level procedures */
pScreen->CreateWindow = winCreateWindowMultiWindow;
@@ -539,9 +533,7 @@ winFinishScreenInitFB (int index,
pScreen->ResizeWindow = winResizeWindowMultiWindow;
pScreen->MoveWindow = winMoveWindowMultiWindow;
pScreen->CopyWindow = winCopyWindowMultiWindow;
-#ifdef SHAPE
pScreen->SetShape = winSetShapeMultiWindow;
-#endif
/* Undefine the WRAP macro, as it is not needed elsewhere */
#undef WRAP
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 1600996..285a344 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -46,11 +46,9 @@ static
void
winUpdateRgnRootless (WindowPtr pWindow);
-#ifdef SHAPE
static
void
winReshapeRootless (WindowPtr pWin);
-#endif
#ifdef XWIN_NATIVEGDI
@@ -447,9 +445,7 @@ winMapWindowRootless (WindowPtr pWin)
fResult = (*pScreen->RealizeWindow)(pWin);
WIN_WRAP(RealizeWindow, winMapWindowRootless);
-#ifdef SHAPE
winReshapeRootless (pWin);
-#endif
winUpdateRgnRootless (pWin);
@@ -457,7 +453,6 @@ winMapWindowRootless (WindowPtr pWin)
}
-#ifdef SHAPE
void
winSetShapeRootless (WindowPtr pWin)
{
@@ -478,7 +473,6 @@ winSetShapeRootless (WindowPtr pWin)
return;
}
-#endif
/*
@@ -569,7 +563,6 @@ winUpdateRgnRootless (WindowPtr pWin)
}
-#ifdef SHAPE
static
void
winReshapeRootless (WindowPtr pWin)
@@ -646,4 +639,3 @@ winReshapeRootless (WindowPtr pWin)
return;
}
-#endif
diff --git a/include/dix.h b/include/dix.h
index fcb2488..4b8a96e 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -313,13 +313,11 @@ extern void SetMaskForEvent(
Mask /* mask */,
int /* event */);
-#ifdef SHAPE
extern void ConfineToShape(
DeviceIntPtr /* pDev */,
RegionPtr /* shape */,
int* /* px */,
int* /* py */);
-#endif
extern Bool IsParent(
WindowPtr /* maybeparent */,
diff --git a/include/globals.h b/include/globals.h
index d9f140e..ccd71b3 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -89,10 +89,6 @@ extern Bool noRRExtension;
extern Bool noRenderExtension;
#endif
-#ifdef SHAPE
-extern Bool noShapeExtension;
-#endif
-
#ifdef XCSECURITY
extern Bool noSecurityExtension;
#endif
diff --git a/include/inputstr.h b/include/inputstr.h
index 3f5c768..6bba47c 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -314,9 +314,7 @@ typedef struct {
CursorPtr current;
BoxRec hotLimits; /* logical constraints of hot spot */
Bool confined; /* confined to screen */
-#if defined(SHAPE) || defined(PANORAMIX)
RegionPtr hotShape; /* additional logical shape constraint */
-#endif
BoxRec physLimits; /* physical constraints of hot spot */
WindowPtr win; /* window of logical position */
HotSpot hot; /* logical pointer position */
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 5d4ddbb..a309077 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -426,10 +426,8 @@ typedef void (* ReparentWindowProcPtr)(
WindowPtr /*pWin*/,
WindowPtr /*pPriorParent*/);
-#ifdef SHAPE
typedef void (* SetShapeProcPtr)(
WindowPtr /*pWin*/);
-#endif /* SHAPE */
typedef void (* ChangeBorderWidthProcPtr)(
WindowPtr /*pWin*/,
@@ -589,9 +587,7 @@ typedef struct _Screen {
HandleExposuresProcPtr HandleExposures;
ReparentWindowProcPtr ReparentWindow;
-#ifdef SHAPE
SetShapeProcPtr SetShape;
-#endif /* SHAPE */
ChangeBorderWidthProcPtr ChangeBorderWidth;
MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
diff --git a/include/windowstr.h b/include/windowstr.h
index 2d11f6e..76501c7 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -108,11 +108,9 @@ typedef struct _WindowOpt {
PropertyPtr userProps; /* default: NULL */
unsigned long backingBitPlanes; /* default: ~0L */
unsigned long backingPixel; /* default: 0 */
-#ifdef SHAPE
RegionPtr boundingShape; /* default: NULL */
RegionPtr clipShape; /* default: NULL */
RegionPtr inputShape; /* default: NULL */
-#endif
struct _OtherInputMasks *inputMasks; /* default: NULL */
DevCursorList deviceCursors; /* default: NULL */
struct _GenericClientMasks *geMasks; /* default: NULL */
@@ -217,21 +215,15 @@ extern Mask DontPropagateMasks[];
#define wUserProps(w) wUseDefault(w, userProps, NULL)
#define wBackingBitPlanes(w) wUseDefault(w, backingBitPlanes, ~0L)
#define wBackingPixel(w) wUseDefault(w, backingPixel, 0)
-#ifdef SHAPE
#define wBoundingShape(w) wUseDefault(w, boundingShape, NULL)
#define wClipShape(w) wUseDefault(w, clipShape, NULL)
#define wInputShape(w) wUseDefault(w, inputShape, NULL)
-#endif
#define wClient(w) (clients[CLIENT_ID((w)->drawable.id)])
#define wBorderWidth(w) ((int) (w)->borderWidth)
/* true when w needs a border drawn. */
-#ifdef SHAPE
#define HasBorder(w) ((w)->borderWidth || wClipShape(w))
-#else
-#define HasBorder(w) ((w)->borderWidth)
-#endif
typedef struct _ScreenSaverStuff {
WindowPtr pWindow;
diff --git a/mi/miexpose.c b/mi/miexpose.c
index b1bc013..7da1324 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -265,7 +265,6 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
extents = pGC->graphicsExposures &&
(REGION_NUM_RECTS(&rgnExposed) > RECTLIMIT) &&
(pDstDrawable->type != DRAWABLE_PIXMAP);
-#ifdef SHAPE
if (pSrcWin)
{
RegionPtr region;
@@ -279,7 +278,6 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
(RECT_IN_REGION(pscr, region, &srcBox) != rgnIN))
extents = FALSE;
}
-#endif
if (extents)
{
expBox = *REGION_EXTENTS(pscr, &rgnExposed);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index cd0a843..0263ff1 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -116,9 +116,6 @@ extern Bool noRRExtension;
#ifdef RENDER
extern Bool noRenderExtension;
#endif
-#ifdef SHAPE
-extern Bool noShapeExtension;
-#endif
#ifdef XCSECURITY
extern Bool noSecurityExtension;
#endif
@@ -349,9 +346,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef RENDER
{ "RENDER", &noRenderExtension },
#endif
-#ifdef SHAPE
- { "SHAPE", &noShapeExtension },
-#endif
#ifdef XCSECURITY
{ "SECURITY", &noSecurityExtension },
#endif
@@ -440,9 +434,7 @@ InitExtensions(int argc, char *argv[])
#ifdef INXQUARTZ
if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
#endif
-#ifdef SHAPE
- if (!noShapeExtension) ShapeExtensionInit();
-#endif
+ ShapeExtensionInit();
#ifdef MITSHM
if (!noMITShmExtension) ShmExtensionInit();
#endif
@@ -548,6 +540,7 @@ InitVisualWrap()
/* List of built-in (statically linked) extensions */
static ExtensionModule staticExtensions[] = {
{ GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL, NULL},
+ { ShapeExtensionInit, "SHAPE", NULL, NULL, NULL },
#ifdef MITSHM
{ ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
#endif
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 6ddcc05..77687fb 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -80,9 +80,7 @@ static void miOverlayResizeWindow(WindowPtr, int, int, unsigned int,
unsigned int, WindowPtr);
static void miOverlayClearToBackground(WindowPtr, int, int, int, int, Bool);
-#ifdef SHAPE
static void miOverlaySetShape(WindowPtr);
-#endif
static void miOverlayChangeBorderWidth(WindowPtr, unsigned int);
#define MIOVERLAY_GET_SCREEN_PRIVATE(pScreen) ((miOverlayScreenPtr) \
@@ -148,9 +146,7 @@ miInitOverlay(
pScreen->ResizeWindow = miOverlayResizeWindow;
pScreen->MarkWindow = miOverlayMarkWindow;
pScreen->ClearToBackground = miOverlayClearToBackground;
-#ifdef SHAPE
pScreen->SetShape = miOverlaySetShape;
-#endif
pScreen->ChangeBorderWidth = miOverlayChangeBorderWidth;
return TRUE;
@@ -480,7 +476,6 @@ miOverlayComputeClips(
break;
case rgnPART:
newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
{
RegionPtr pBounding;
@@ -499,7 +494,6 @@ miOverlayComputeClips(
}
}
}
-#endif
break;
default:
newVis = VisibilityFullyObscured;
@@ -1522,7 +1516,6 @@ miOverlayResizeWindow(
}
-#ifdef SHAPE
static void
miOverlaySetShape(WindowPtr pWin)
{
@@ -1584,7 +1577,6 @@ miOverlaySetShape(WindowPtr pWin)
WindowsRestructured ();
CheckCursorConfinement(pWin);
}
-#endif
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 9757113..ee60746 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -265,9 +265,7 @@ miScreenInit(
pScreen->HandleExposures = miHandleValidateExposures;
pScreen->ReparentWindow = (ReparentWindowProcPtr) 0;
pScreen->ChangeBorderWidth = miChangeBorderWidth;
-#ifdef SHAPE
pScreen->SetShape = miSetShape;
-#endif
pScreen->MarkUnrealizedWindow = miMarkUnrealizedWindow;
pScreen->SaveDoomedAreas = 0;
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 9449db7..92dcffe 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -103,7 +103,6 @@ Equipment Corporation.
#include "globals.h"
-#ifdef SHAPE
/*
* Compute the visibility of a shaped window
*/
@@ -163,7 +162,6 @@ miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding,
return rgnIN;
return rgnOUT;
}
-#endif
static GetRedirectBorderClipProcPtr miGetRedirectBorderClipProc;
static SetRedirectBorderClipProcPtr miSetRedirectBorderClipProc;
@@ -269,7 +267,6 @@ miComputeClips (
break;
case rgnPART:
newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
{
RegionPtr pBounding;
@@ -289,7 +286,6 @@ miComputeClips (
}
}
}
-#endif
break;
default:
newVis = VisibilityFullyObscured;
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 9f24c7e..1a8b194 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -909,7 +909,6 @@ miGetLayerWindow(WindowPtr pWin)
return pWin->firstChild;
}
-#ifdef SHAPE
/******
*
* miSetShape
@@ -983,7 +982,6 @@ miSetShape(WindowPtr pWin)
WindowsRestructured ();
CheckCursorConfinement(pWin);
}
-#endif
/* Keeps the same inside(!) origin */
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index 9e4a14a..56f81f5 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -39,9 +39,7 @@
#include "rootless.h"
#include "fb.h"
-#ifdef SHAPE
#include "scrnintstr.h"
-#endif /* SHAPE */
#ifdef RENDER
#include "picturestr.h"
@@ -99,9 +97,7 @@ typedef struct _RootlessScreenRec {
MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
ValidateTreeProcPtr ValidateTree;
-#ifdef SHAPE
SetShapeProcPtr SetShape;
-#endif
#ifdef RENDER
CompositeProcPtr Composite;
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index 5031858..8eaacca 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -666,9 +666,7 @@ RootlessWrap(ScreenPtr pScreen)
WRAP(UninstallColormap);
WRAP(StoreColors);
-#ifdef SHAPE
WRAP(SetShape);
-#endif
#ifdef RENDER
{
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index 4f16530..d52a2af 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -104,7 +104,6 @@ Equipment Corporation.
#include "globals.h"
-#ifdef SHAPE
/*
* Compute the visibility of a shaped window
*/
@@ -167,7 +166,6 @@ RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y)
return rgnIN;
return rgnOUT;
}
-#endif
#define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
HasBorder(w) && \
@@ -235,7 +233,6 @@ RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
break;
case rgnPART:
newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
{
RegionPtr pBounding;
@@ -255,7 +252,6 @@ RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
}
}
}
-#endif
break;
default:
newVis = VisibilityFullyObscured;
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 0edafe7..d863e39 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -265,7 +265,6 @@ RootlessDestroyWindow(WindowPtr pWin)
}
-#ifdef SHAPE
static Bool
RootlessGetShape(WindowPtr pWin, RegionPtr pShape)
@@ -345,7 +344,6 @@ RootlessSetShape(WindowPtr pWin)
RootlessReshapeFrame(pWin);
}
-#endif // SHAPE
/* Disallow ParentRelative background on top-level windows
@@ -463,9 +461,7 @@ RootlessEnsureFrame(WindowPtr pWin)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
RootlessWindowRec *winRec;
-#ifdef SHAPE
RegionRec shape;
-#endif
RegionPtr pShape = NULL;
if (WINREC(pWin) != NULL)
@@ -491,11 +487,9 @@ RootlessEnsureFrame(WindowPtr pWin)
SETWINREC(pWin, winRec);
-#ifdef SHAPE
// Set the frame's shape if the window is shaped
if (RootlessGetShape(pWin, &shape))
pShape = &shape;
-#endif
RL_DEBUG_MSG("creating frame ");
@@ -513,10 +507,8 @@ RootlessEnsureFrame(WindowPtr pWin)
if (pWin->drawable.depth == 8)
RootlessFlushWindowColormap(pWin);
-#ifdef SHAPE
if (pShape != NULL)
REGION_UNINIT(pScreen, &shape);
-#endif
return winRec;
}
diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h
index 45bc4c2..2d2555e 100644
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@@ -39,9 +39,7 @@
Bool RootlessCreateWindow(WindowPtr pWin);
Bool RootlessDestroyWindow(WindowPtr pWin);
-#ifdef SHAPE
void RootlessSetShape(WindowPtr pWin);
-#endif // SHAPE
Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask);
Bool RootlessPositionWindow(WindowPtr pWin, int x, int y);
diff --git a/os/utils.c b/os/utils.c
index 86f13f1..21203e4 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -159,9 +159,6 @@ _X_EXPORT Bool noRRExtension = FALSE;
#ifdef RENDER
_X_EXPORT Bool noRenderExtension = FALSE;
#endif
-#ifdef SHAPE
-_X_EXPORT Bool noShapeExtension = FALSE;
-#endif
#ifdef XCSECURITY
_X_EXPORT Bool noSecurityExtension = FALSE;
#endif
diff --git a/xfixes/region.c b/xfixes/region.c
old mode 100755
new mode 100644
index d90b1e0..cac24b5
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -169,20 +169,16 @@ ProcXFixesCreateRegionFromWindow (ClientPtr client)
}
switch (stuff->kind) {
case WindowRegionBounding:
-#ifdef SHAPE
pRegion = wBoundingShape(pWin);
if (!pRegion)
-#endif
{
pRegion = CreateBoundingShape (pWin);
copy = FALSE;
}
break;
case WindowRegionClip:
-#ifdef SHAPE
pRegion = wClipShape(pWin);
if (!pRegion)
-#endif
{
pRegion = CreateClipShape (pWin);
copy = FALSE;
@@ -678,7 +674,6 @@ typedef RegionPtr (*CreateDftPtr)(WindowPtr pWin);
int
ProcXFixesSetWindowShapeRegion (ClientPtr client)
{
-#ifdef SHAPE
WindowPtr pWin;
ScreenPtr pScreen;
RegionPtr pRegion;
@@ -753,9 +748,6 @@ ProcXFixesSetWindowShapeRegion (ClientPtr client)
(*pScreen->SetShape) (pWin);
SendShapeNotify (pWin, stuff->destKind);
return (client->noClientException);
-#else
- return BadRequest;
-#endif
}
int
More information about the xorg-commit
mailing list