[PATCH 3/6] dix: FIXES is not optional
Adam Jackson
ajax at redhat.com
Thu Oct 18 11:24:20 PDT 2012
It's already not optional at configure time, this just makes it so at
runtime too.
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
Xext/panoramiX.c | 6 ------
dix/cursor.c | 6 ------
dix/window.c | 6 ------
include/cursorstr.h | 2 --
include/dixstruct.h | 11 -----------
include/extinit.h | 2 --
mi/miinitext.c | 5 -----
os/utils.c | 2 --
8 files changed, 40 deletions(-)
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 1c7197d..8febc0c 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -53,9 +53,7 @@ Equipment Corporation.
#include "servermd.h"
#include "resource.h"
#include "picturestr.h"
-#ifdef XFIXES
#include "xfixesint.h"
-#endif
#ifdef COMPOSITE
#include "compint.h"
#endif
@@ -583,9 +581,7 @@ PanoramiXExtensionInit(void)
ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor;
PanoramiXRenderInit();
-#ifdef XFIXES
PanoramiXFixesInit();
-#endif
#ifdef COMPOSITE
PanoramiXCompositeInit();
#endif
@@ -892,9 +888,7 @@ PanoramiXResetProc(ExtensionEntry * extEntry)
int i;
PanoramiXRenderReset();
-#ifdef XFIXES
PanoramiXFixesReset();
-#endif
#ifdef COMPOSITE
PanoramiXCompositeReset ();
#endif
diff --git a/dix/cursor.c b/dix/cursor.c
index 1ee127a..2b9ac94 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -71,9 +71,7 @@ static GlyphSharePtr sharedGlyphs = (GlyphSharePtr) NULL;
DevScreenPrivateKeyRec cursorScreenDevPriv;
-#ifdef XFIXES
static CARD32 cursorSerial;
-#endif
static void
FreeCursorBits(CursorBitsPtr bits)
@@ -245,10 +243,8 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
bits->refcnt = -1;
CheckForEmptyMask(bits);
pCurs->bits = bits;
-#ifdef XFIXES
pCurs->serialNumber = ++cursorSerial;
pCurs->name = None;
-#endif
pCurs->foreRed = foreRed;
pCurs->foreGreen = foreGreen;
@@ -406,10 +402,8 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
CheckForEmptyMask(bits);
pCurs->bits = bits;
pCurs->refcnt = 1;
-#ifdef XFIXES
pCurs->serialNumber = ++cursorSerial;
pCurs->name = None;
-#endif
pCurs->foreRed = foreRed;
pCurs->foreGreen = foreGreen;
diff --git a/dix/window.c b/dix/window.c
index e70531a..94219a5 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2846,11 +2846,9 @@ HandleSaveSet(ClientPtr client)
for (j = 0; j < client->numSaved; j++) {
pWin = SaveSetWindow(client->saveSet[j]);
-#ifdef XFIXES
if (SaveSetToRoot(client->saveSet[j]))
pParent = pWin->drawable.pScreen->root;
else
-#endif
{
pParent = pWin->parent;
while (pParent && (wClient(pParent) == client))
@@ -2858,11 +2856,9 @@ HandleSaveSet(ClientPtr client)
}
if (pParent) {
if (pParent != pWin->parent) {
-#ifdef XFIXES
/* unmap first so that ReparentWindow doesn't remap */
if (!SaveSetShouldMap(client->saveSet[j]))
UnmapWindow(pWin, FALSE);
-#endif
ReparentWindow(pWin, pParent,
pWin->drawable.x - wBorderWidth(pWin) -
pParent->drawable.x,
@@ -2871,9 +2867,7 @@ HandleSaveSet(ClientPtr client)
if (!pWin->realized && pWin->mapped)
pWin->mapped = FALSE;
}
-#ifdef XFIXES
if (SaveSetShouldMap(client->saveSet[j]))
-#endif
MapWindow(pWin, client);
}
}
diff --git a/include/cursorstr.h b/include/cursorstr.h
index 68ab2ec..2157954 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -78,10 +78,8 @@ typedef struct _Cursor {
int refcnt;
PrivateRec *devPrivates; /* set by pScr->RealizeCursor */
XID id;
-#ifdef XFIXES
CARD32 serialNumber;
Atom name;
-#endif
} CursorRec;
#define CURSOR_REC_SIZE (sizeof(CursorRec) + dixPrivatesSize(PRIVATE_CURSOR))
diff --git a/include/dixstruct.h b/include/dixstruct.h
index c1236f5..37c7e9d 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -61,7 +61,6 @@ typedef enum { ClientStateInitial,
ClientStateGone
} ClientState;
-#ifdef XFIXES
typedef struct _saveSet {
struct _Window *windowPtr;
Bool toRoot;
@@ -73,16 +72,6 @@ typedef struct _saveSet {
#define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w))
#define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr))
#define SaveSetAssignMap(ss,m) ((ss).map = (m))
-#else
-typedef struct _Window *SaveSetElt;
-
-#define SaveSetWindow(ss) (ss)
-#define SaveSetToRoot(ss) FALSE
-#define SaveSetShouldMap(ss) TRUE
-#define SaveSetAssignWindow(ss,w) ((ss) = (w))
-#define SaveSetAssignToRoot(ss,tr)
-#define SaveSetAssignMap(ss,m)
-#endif
typedef struct _Client {
pointer requestBuffer;
diff --git a/include/extinit.h b/include/extinit.h
index 7f4718f..61e28b8 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -144,10 +144,8 @@ extern void XFree86BigfontExtensionInit(void);
extern void BigReqExtensionInit(void);
-#ifdef XFIXES
extern _X_EXPORT Bool noXFixesExtension;
extern void XFixesExtensionInit(void);
-#endif
extern void XInputExtensionInit(void);
extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
diff --git a/mi/miinitext.c b/mi/miinitext.c
index d175440..7c45383 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -86,7 +86,6 @@ SOFTWARE.
#undef DBE
#undef SCREENSAVER
#undef RANDR
-#undef XFIXES
#undef DAMAGE
#undef COMPOSITE
#undef MITSHM
@@ -168,9 +167,7 @@ static ExtensionToggle ExtensionToggleList[] = {
{"XFree86-VidModeExtension", &noXFree86VidModeExtension},
#endif
#endif
-#ifdef XFIXES
{"XFIXES", &noXFixesExtension},
-#endif
#ifdef PANORAMIX
{"XINERAMA", &noPanoramiXExtension},
#endif
@@ -260,10 +257,8 @@ static ExtensionModule staticExtensions[] = {
*/
{PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension},
#endif
-#ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */
{XFixesExtensionInit, "XFIXES", &noXFixesExtension},
-#endif
#ifdef XF86BIGFONT
{XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension},
#endif
diff --git a/os/utils.c b/os/utils.c
index 04bcbc6..273eb3d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -168,9 +168,7 @@ Bool noXFree86DRIExtension = FALSE;
#ifdef XF86VIDMODE
Bool noXFree86VidModeExtension = FALSE;
#endif
-#ifdef XFIXES
Bool noXFixesExtension = FALSE;
-#endif
#ifdef PANORAMIX
/* Xinerama is disabled by default unless enabled via +xinerama */
Bool noPanoramiXExtension = TRUE;
--
1.7.11.7
More information about the xorg-devel
mailing list