dix: FIXES is not optional
It's already not optional at configure time, this just makes it so at build time too. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
dff81687f5
commit
abbd85742a
|
@ -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
|
||||
|
@ -890,9 +886,7 @@ PanoramiXResetProc(ExtensionEntry * extEntry)
|
|||
int i;
|
||||
|
||||
PanoramiXRenderReset();
|
||||
#ifdef XFIXES
|
||||
PanoramiXFixesReset();
|
||||
#endif
|
||||
#ifdef COMPOSITE
|
||||
PanoramiXCompositeReset ();
|
||||
#endif
|
||||
|
|
|
@ -71,9 +71,7 @@ static GlyphSharePtr sharedGlyphs = (GlyphSharePtr) NULL;
|
|||
|
||||
DevScreenPrivateKeyRec cursorScreenDevPriv;
|
||||
|
||||
#ifdef XFIXES
|
||||
static CARD32 cursorSerial;
|
||||
#endif
|
||||
|
||||
static void
|
||||
FreeCursorBits(CursorBitsPtr bits)
|
||||
|
@ -272,10 +270,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;
|
||||
|
@ -433,10 +429,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;
|
||||
|
|
|
@ -2847,11 +2847,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))
|
||||
|
@ -2859,11 +2857,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,
|
||||
|
@ -2872,9 +2868,7 @@ HandleSaveSet(ClientPtr client)
|
|||
if (!pWin->realized && pWin->mapped)
|
||||
pWin->mapped = FALSE;
|
||||
}
|
||||
#ifdef XFIXES
|
||||
if (SaveSetShouldMap(client->saveSet[j]))
|
||||
#endif
|
||||
MapWindow(pWin, client);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -140,10 +140,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,
|
||||
|
|
|
@ -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
|
||||
|
@ -263,10 +260,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
|
||||
|
|
|
@ -169,9 +169,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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user