frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 2004-07-29 23:43:40 +00:00
parent 274d5044ac
commit 813d75f9d3
7 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Xext/shape.c
View File

@ -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 $ */ /* $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 */, pointer /* data */,
XID /* id */ XID /* id */
); );
void SendShapeNotify(
WindowPtr /* pWin */,
int /* which */
);
static void ShapeResetProc( static void ShapeResetProc(
ExtensionEntry * /* extEntry */ ExtensionEntry * /* extEntry */
); );
@ -85,12 +81,9 @@ RegionOperate (
CreateDftPtr /* create */ CreateDftPtr /* create */
); );
#define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */) /* SendShapeNotify, CreateBoundingShape and CreateClipShape are used
* externally by the Xfixes extension and are now defined in window.h
CREATE_PROC(CreateBoundingShape); */
CREATE_PROC(CreateClipShape);
#undef CREATE_PROC
static DISPATCH_PROC(ProcShapeCombine); static DISPATCH_PROC(ProcShapeCombine);
static DISPATCH_PROC(ProcShapeDispatch); static DISPATCH_PROC(ProcShapeDispatch);

16
dix/dixutils.c
View File

@ -354,11 +354,7 @@ AlterSaveSetForClient(ClientPtr client,
Bool remap) Bool remap)
{ {
int numnow; int numnow;
#ifdef XFIXES
SaveSetElt *pTmp = NULL; SaveSetElt *pTmp = NULL;
#else
pointer *pTmp = NULL;
#endif
int j; int j;
numnow = client->numSaved; numnow = client->numSaved;
@ -374,11 +370,7 @@ AlterSaveSetForClient(ClientPtr client,
if (j < numnow) /* duplicate */ if (j < numnow) /* duplicate */
return(Success); return(Success);
numnow++; numnow++;
#ifdef XFIXES pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow);
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow);
#else
pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow);
#endif
if (!pTmp) if (!pTmp)
return(BadAlloc); return(BadAlloc);
client->saveSet = pTmp; client->saveSet = pTmp;
@ -398,11 +390,7 @@ AlterSaveSetForClient(ClientPtr client,
numnow--; numnow--;
if (numnow) if (numnow)
{ {
#ifdef XFIXES pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow);
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow);
#else
pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow);
#endif
if (pTmp) if (pTmp)
client->saveSet = pTmp; client->saveSet = pTmp;
} }

6
dix/window.c
View File

@ -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 $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
/* /*
@ -3179,11 +3179,7 @@ HandleSaveSet(client)
} }
xfree(client->saveSet); xfree(client->saveSet);
client->numSaved = 0; client->numSaved = 0;
#ifdef XFIXES
client->saveSet = (SaveSetElt *)NULL; client->saveSet = (SaveSetElt *)NULL;
#else
client->saveSet = (pointer *)NULL;
#endif
} }
Bool Bool

4
include/dix.h
View File

@ -433,14 +433,14 @@ extern ClientPtr LookupClient(
extern void NoopDDA(void); extern void NoopDDA(void);
int AlterSaveSetForClient( extern int AlterSaveSetForClient(
ClientPtr /*client*/, ClientPtr /*client*/,
WindowPtr /*pWin*/, WindowPtr /*pWin*/,
unsigned /*mode*/, unsigned /*mode*/,
Bool /*toRoot*/, Bool /*toRoot*/,
Bool /*remap*/); Bool /*remap*/);
void DeleteWindowFromAnySaveSet( extern void DeleteWindowFromAnySaveSet(
WindowPtr /*pWin*/); WindowPtr /*pWin*/);
extern void BlockHandler( extern void BlockHandler(

12
include/window.h
View File

@ -252,10 +252,14 @@ void ResizeChildrenWinSize(
int /*dw*/, int /*dw*/,
int /*dh*/); int /*dh*/);
RegionPtr extern void SendShapeNotify(
CreateBoundingShape (WindowPtr pWin); WindowPtr /* pWin */,
int /* which */ );
RegionPtr extern RegionPtr CreateBoundingShape(
CreateClipShape (WindowPtr pWin); WindowPtr /* pWin */ );
extern RegionPtr CreateClipShape(
WindowPtr /* pWin */ );
#endif /* WINDOW_H */ #endif /* WINDOW_H */

2
miext/damage/damage.c
View File

@ -274,7 +274,7 @@ damageCreateGC(GCPtr pGC)
return ret; return ret;
} }
#if NOTUSED #ifdef NOTUSED
static void static void
damageWrapGC (GCPtr pGC) damageWrapGC (GCPtr pGC)
{ {

9
render/picturestr.h
View File

@ -303,6 +303,15 @@ extern RESTYPE GlyphSetType;
} \ } \
} \ } \
void
ResetPicturePrivateIndex (void);
int
AllocatePicturePrivateIndex (void);
Bool
AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount);
Bool Bool
PictureDestroyWindow (WindowPtr pWindow); PictureDestroyWindow (WindowPtr pWindow);