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

- Add some XFIXES bits apparently missed in the DAMAGE-XFIXES merge 

- Add missing XCSECURITY ifdef.
- Sync some whitespace to xserver CVS and surrounding style.
This commit is contained in:
Eric Anholt 2004-07-31 01:48:27 +00:00
parent 370bda820b
commit 326729ebca
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dix/cursor.c
View File

@ -68,6 +68,10 @@ typedef struct _GlyphShare {
static GlyphSharePtr sharedGlyphs = (GlyphSharePtr)NULL; static GlyphSharePtr sharedGlyphs = (GlyphSharePtr)NULL;
#ifdef XFIXES
static CARD32 cursorSerial;
#endif
static void static void
FreeCursorBits(CursorBitsPtr bits) FreeCursorBits(CursorBitsPtr bits)
{ {
@ -189,6 +193,10 @@ AllocCursorARGB(psrcbits, pmaskbits, argb, cm,
pCurs->bits = bits; pCurs->bits = bits;
pCurs->refcnt = 1; pCurs->refcnt = 1;
#ifdef XFIXES
pCurs->serialNumber = ++cursorSerial;
pCurs->name = None;
#endif
pCurs->foreRed = foreRed; pCurs->foreRed = foreRed;
pCurs->foreGreen = foreGreen; pCurs->foreGreen = foreGreen;
@ -379,6 +387,10 @@ AllocGlyphCursor(source, sourceChar, mask, maskChar,
CheckForEmptyMask(bits); CheckForEmptyMask(bits);
pCurs->bits = bits; pCurs->bits = bits;
pCurs->refcnt = 1; pCurs->refcnt = 1;
#ifdef XFIXES
pCurs->serialNumber = ++cursorSerial;
pCurs->name = None;
#endif
pCurs->foreRed = foreRed; pCurs->foreRed = foreRed;
pCurs->foreGreen = foreGreen; pCurs->foreGreen = foreGreen;

5
dix/dispatch.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.3 2004/06/21 13:40:25 ago Exp $ */ /* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.4 2004/07/29 18:43:58 stukreit Exp $ */
/* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
/************************************************************ /************************************************************
@ -1056,7 +1056,6 @@ ProcSetSelectionOwner(client)
info.kind= SelectionSetOwner; info.kind= SelectionSetOwner;
CallCallbacks(&SelectionCallback, &info); CallCallbacks(&SelectionCallback, &info);
} }
return (client->noClientException); return (client->noClientException);
} }
else else
@ -2130,7 +2129,9 @@ DoGetImage(client, format, drawable, x, y, width, height, planemask, im_return)
Mask plane = 0; Mask plane = 0;
char *pBuf; char *pBuf;
xGetImageReply xgi; xGetImageReply xgi;
#ifdef XCSECURITY
RegionPtr pVisibleRegion = NULL; RegionPtr pVisibleRegion = NULL;
#endif
if ((format != XYPixmap) && (format != ZPixmap)) if ((format != XYPixmap) && (format != ZPixmap))
{ {

5
dix/window.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.3 2004/07/29 18:43:58 stukreit Exp $ */ /* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.4 2004/07/29 23:43:39 kem 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 $ */
/* /*
@ -3174,6 +3174,9 @@ HandleSaveSet(client)
if(!pWin->realized && pWin->mapped) if(!pWin->realized && pWin->mapped)
pWin->mapped = FALSE; pWin->mapped = FALSE;
} }
#ifdef XFIXES
if (SaveSetRemap (client->saveSet[j]))
#endif
MapWindow(pWin, client); MapWindow(pWin, client);
} }
} }