Use LibraryTargetName when not building a loadable server
Move extern function declarations to window.h
Cleaned up code since client's saveSet is no longer defined as a pointer*
Added externs back in
Change #if to #ifdef to fix compiler warning
Add function declarations that were inadvertently removed by previous check
in
Disable extensions that are not (yet) supported by DMX
This commit is contained in:
Kevin E Martin
parent
274d5044ac
commit
813d75f9d3
15
Xext/shape.c
15
Xext/shape.c
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.3 2004/07/29 18:46:37 stukreit Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
|
||||
/************************************************************
|
||||
|
||||
|
|
@ -61,10 +61,6 @@ static int ShapeFreeEvents(
|
|||
pointer /* data */,
|
||||
XID /* id */
|
||||
);
|
||||
void SendShapeNotify(
|
||||
WindowPtr /* pWin */,
|
||||
int /* which */
|
||||
);
|
||||
static void ShapeResetProc(
|
||||
ExtensionEntry * /* extEntry */
|
||||
);
|
||||
|
|
@ -85,12 +81,9 @@ RegionOperate (
|
|||
CreateDftPtr /* create */
|
||||
);
|
||||
|
||||
#define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */)
|
||||
|
||||
CREATE_PROC(CreateBoundingShape);
|
||||
CREATE_PROC(CreateClipShape);
|
||||
|
||||
#undef CREATE_PROC
|
||||
/* SendShapeNotify, CreateBoundingShape and CreateClipShape are used
|
||||
* externally by the Xfixes extension and are now defined in window.h
|
||||
*/
|
||||
|
||||
static DISPATCH_PROC(ProcShapeCombine);
|
||||
static DISPATCH_PROC(ProcShapeDispatch);
|
||||
|
|
|
|||
|
|
@ -354,11 +354,7 @@ AlterSaveSetForClient(ClientPtr client,
|
|||
Bool remap)
|
||||
{
|
||||
int numnow;
|
||||
#ifdef XFIXES
|
||||
SaveSetElt *pTmp = NULL;
|
||||
#else
|
||||
pointer *pTmp = NULL;
|
||||
#endif
|
||||
int j;
|
||||
|
||||
numnow = client->numSaved;
|
||||
|
|
@ -374,11 +370,7 @@ AlterSaveSetForClient(ClientPtr client,
|
|||
if (j < numnow) /* duplicate */
|
||||
return(Success);
|
||||
numnow++;
|
||||
#ifdef XFIXES
|
||||
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow);
|
||||
#else
|
||||
pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow);
|
||||
#endif
|
||||
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow);
|
||||
if (!pTmp)
|
||||
return(BadAlloc);
|
||||
client->saveSet = pTmp;
|
||||
|
|
@ -398,11 +390,7 @@ AlterSaveSetForClient(ClientPtr client,
|
|||
numnow--;
|
||||
if (numnow)
|
||||
{
|
||||
#ifdef XFIXES
|
||||
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow);
|
||||
#else
|
||||
pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow);
|
||||
#endif
|
||||
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow);
|
||||
if (pTmp)
|
||||
client->saveSet = pTmp;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.3 2004/07/29 18:43:58 stukreit Exp $ */
|
||||
/* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
|
|
@ -3179,11 +3179,7 @@ HandleSaveSet(client)
|
|||
}
|
||||
xfree(client->saveSet);
|
||||
client->numSaved = 0;
|
||||
#ifdef XFIXES
|
||||
client->saveSet = (SaveSetElt *)NULL;
|
||||
#else
|
||||
client->saveSet = (pointer *)NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
Bool
|
||||
|
|
|
|||
|
|
@ -433,14 +433,14 @@ extern ClientPtr LookupClient(
|
|||
|
||||
extern void NoopDDA(void);
|
||||
|
||||
int AlterSaveSetForClient(
|
||||
extern int AlterSaveSetForClient(
|
||||
ClientPtr /*client*/,
|
||||
WindowPtr /*pWin*/,
|
||||
unsigned /*mode*/,
|
||||
Bool /*toRoot*/,
|
||||
Bool /*remap*/);
|
||||
|
||||
void DeleteWindowFromAnySaveSet(
|
||||
extern void DeleteWindowFromAnySaveSet(
|
||||
WindowPtr /*pWin*/);
|
||||
|
||||
extern void BlockHandler(
|
||||
|
|
|
|||
|
|
@ -252,10 +252,14 @@ void ResizeChildrenWinSize(
|
|||
int /*dw*/,
|
||||
int /*dh*/);
|
||||
|
||||
RegionPtr
|
||||
CreateBoundingShape (WindowPtr pWin);
|
||||
extern void SendShapeNotify(
|
||||
WindowPtr /* pWin */,
|
||||
int /* which */ );
|
||||
|
||||
RegionPtr
|
||||
CreateClipShape (WindowPtr pWin);
|
||||
extern RegionPtr CreateBoundingShape(
|
||||
WindowPtr /* pWin */ );
|
||||
|
||||
extern RegionPtr CreateClipShape(
|
||||
WindowPtr /* pWin */ );
|
||||
|
||||
#endif /* WINDOW_H */
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ damageCreateGC(GCPtr pGC)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#if NOTUSED
|
||||
#ifdef NOTUSED
|
||||
static void
|
||||
damageWrapGC (GCPtr pGC)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -303,6 +303,15 @@ extern RESTYPE GlyphSetType;
|
|||
} \
|
||||
} \
|
||||
|
||||
void
|
||||
ResetPicturePrivateIndex (void);
|
||||
|
||||
int
|
||||
AllocatePicturePrivateIndex (void);
|
||||
|
||||
Bool
|
||||
AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount);
|
||||
|
||||
Bool
|
||||
PictureDestroyWindow (WindowPtr pWindow);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue