aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/composite
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-01-15 21:23:25 +0100
committermarha <marha@users.sourceforge.net>2014-01-15 21:23:25 +0100
commit1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch)
treed08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/composite
parentaaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff)
downloadvcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz
vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2
vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/composite')
-rw-r--r--xorg-server/composite/compalloc.c2
-rw-r--r--xorg-server/composite/compext.c26
-rw-r--r--xorg-server/composite/compinit.c2
-rw-r--r--xorg-server/composite/compint.h2
-rw-r--r--xorg-server/composite/compoverlay.c4
-rw-r--r--xorg-server/composite/compwindow.c10
6 files changed, 21 insertions, 25 deletions
diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index b7d731e33..dfbff06ca 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -55,7 +55,7 @@ compScreenUpdate(ScreenPtr pScreen)
}
static void
-compBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask)
+compBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
{
CompScreenPtr cs = GetCompScreen(pScreen);
diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c
index e4821c5fc..a945f721f 100644
--- a/xorg-server/composite/compext.c
+++ b/xorg-server/composite/compext.c
@@ -67,7 +67,7 @@ typedef struct _CompositeClient {
dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey))
static void
-CompositeClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+CompositeClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -78,7 +78,7 @@ CompositeClientCallback(CallbackListPtr *list, pointer closure, pointer data)
}
static int
-FreeCompositeClientWindow(pointer value, XID ccwid)
+FreeCompositeClientWindow(void *value, XID ccwid)
{
WindowPtr pWin = value;
@@ -87,7 +87,7 @@ FreeCompositeClientWindow(pointer value, XID ccwid)
}
static int
-FreeCompositeClientSubwindows(pointer value, XID ccwid)
+FreeCompositeClientSubwindows(void *value, XID ccwid)
{
WindowPtr pWin = value;
@@ -96,7 +96,7 @@ FreeCompositeClientSubwindows(pointer value, XID ccwid)
}
static int
-FreeCompositeClientOverlay(pointer value, XID ccwid)
+FreeCompositeClientOverlay(void *value, XID ccwid)
{
CompOverlayClientPtr pOc = (CompOverlayClientPtr) value;
@@ -140,7 +140,7 @@ ProcCompositeQueryVersion(ClientPtr client)
#define VERIFY_WINDOW(pWindow, wid, client, mode) \
do { \
int err; \
- err = dixLookupResourceByType((pointer *) &pWindow, wid, \
+ err = dixLookupResourceByType((void **) &pWindow, wid, \
RT_WINDOW, client, mode); \
if (err != Success) { \
client->errorValue = wid; \
@@ -227,7 +227,7 @@ ProcCompositeCreateRegionFromBorderClip(ClientPtr client)
return BadAlloc;
RegionTranslate(pRegion, -pWin->drawable.x, -pWin->drawable.y);
- if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@@ -267,7 +267,7 @@ ProcCompositeNameWindowPixmap(ClientPtr client)
++pPixmap->refcnt;
- if (!AddResource(stuff->pixmap, RT_PIXMAP, (pointer) pPixmap))
+ if (!AddResource(stuff->pixmap, RT_PIXMAP, (void *) pPixmap))
return BadAlloc;
return Success;
@@ -335,12 +335,10 @@ ProcCompositeReleaseOverlayWindow(ClientPtr client)
{
REQUEST(xCompositeReleaseOverlayWindowReq);
WindowPtr pWin;
- ScreenPtr pScreen;
CompOverlayClientPtr pOc;
REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq);
VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);
- pScreen = pWin->drawable.pScreen;
/*
* Has client queried a reference to the overlay window
@@ -502,7 +500,7 @@ SProcCompositeDispatch(ClientPtr client)
/** @see GetDefaultBytes */
static void
-GetCompositeClientWindowBytes(pointer value, XID id, ResourceSizePtr size)
+GetCompositeClientWindowBytes(void *value, XID id, ResourceSizePtr size)
{
WindowPtr window = value;
@@ -756,13 +754,13 @@ PanoramiXCompositeNameWindowPixmap(ClientPtr client)
return BadMatch;
}
- if (!AddResource(newPix->info[i].id, RT_PIXMAP, (pointer) pPixmap))
+ if (!AddResource(newPix->info[i].id, RT_PIXMAP, (void *) pPixmap))
return BadAlloc;
++pPixmap->refcnt;
}
- if (!AddResource(stuff->pixmap, XRT_PIXMAP, (pointer) newPix))
+ if (!AddResource(stuff->pixmap, XRT_PIXMAP, (void *) newPix))
return BadAlloc;
return Success;
@@ -799,7 +797,7 @@ PanoramiXCompositeGetOverlayWindow(ClientPtr client)
}
FOR_NSCREENS_BACKWARD(i) {
- rc = dixLookupResourceByType((pointer *) &pWin, win->info[i].id,
+ rc = dixLookupResourceByType((void **) &pWin, win->info[i].id,
RT_WINDOW, client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->window;
@@ -873,7 +871,6 @@ PanoramiXCompositeReleaseOverlayWindow(ClientPtr client)
{
REQUEST(xCompositeReleaseOverlayWindowReq);
WindowPtr pWin;
- ScreenPtr pScreen;
CompOverlayClientPtr pOc;
PanoramiXRes *win;
int i, rc;
@@ -893,7 +890,6 @@ PanoramiXCompositeReleaseOverlayWindow(ClientPtr client)
client->errorValue = stuff->window;
return rc;
}
- pScreen = pWin->drawable.pScreen;
/*
* Has client queried a reference to the overlay window
diff --git a/xorg-server/composite/compinit.c b/xorg-server/composite/compinit.c
index 3c910914e..1db9e0bf5 100644
--- a/xorg-server/composite/compinit.c
+++ b/xorg-server/composite/compinit.c
@@ -119,7 +119,7 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
pScreen->backingStoreSupport != NotUseful) {
if (pWin->backingStore != NotUseful && !pWin->backStorage) {
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
- pWin->backStorage = (pointer) (intptr_t) 1;
+ pWin->backStorage = (void *) (intptr_t) 1;
}
else if (pWin->backingStore == NotUseful && pWin->backStorage) {
compUnredirectWindow(serverClient, pWin,
diff --git a/xorg-server/composite/compint.h b/xorg-server/composite/compint.h
index 45b5824a9..12dc8b3f7 100644
--- a/xorg-server/composite/compint.h
+++ b/xorg-server/composite/compint.h
@@ -319,7 +319,7 @@ WindowPtr
CompositeRealChildHead(WindowPtr pWin);
int
- DeleteWindowNoInputDevices(pointer value, XID wid);
+ DeleteWindowNoInputDevices(void *value, XID wid);
int
diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c
index bf5434ccb..7932dda8d 100644
--- a/xorg-server/composite/compoverlay.c
+++ b/xorg-server/composite/compoverlay.c
@@ -114,7 +114,7 @@ compCreateOverlayClient(ScreenPtr pScreen, ClientPtr pClient)
* Create a resource for this element so it can be deleted
* when the client goes away.
*/
- if (!AddResource(pOc->resource, CompositeClientOverlayType, (pointer) pOc))
+ if (!AddResource(pOc->resource, CompositeClientOverlayType, (void *) pOc))
return NULL;
return pOc;
@@ -152,7 +152,7 @@ compCreateOverlayWindow(ScreenPtr pScreen)
if (pWin == NULL)
return FALSE;
- if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer) pWin))
+ if (!AddResource(pWin->drawable.id, RT_WINDOW, (void *) pWin))
return FALSE;
MapWindow(pWin, serverClient);
diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c
index 0be7a1b34..8dce21d9b 100644
--- a/xorg-server/composite/compwindow.c
+++ b/xorg-server/composite/compwindow.c
@@ -53,7 +53,7 @@
#ifdef COMPOSITE_DEBUG
static int
-compCheckWindow(WindowPtr pWin, pointer data)
+compCheckWindow(WindowPtr pWin, void *data)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
PixmapPtr pWinPixmap = (*pScreen->GetWindowPixmap) (pWin);
@@ -92,7 +92,7 @@ typedef struct _compPixmapVisit {
} CompPixmapVisitRec, *CompPixmapVisitPtr;
static Bool
-compRepaintBorder(ClientPtr pClient, pointer closure)
+compRepaintBorder(ClientPtr pClient, void *closure)
{
WindowPtr pWindow;
int rc =
@@ -111,7 +111,7 @@ compRepaintBorder(ClientPtr pClient, pointer closure)
}
static int
-compSetPixmapVisitWindow(WindowPtr pWindow, pointer data)
+compSetPixmapVisitWindow(WindowPtr pWindow, void *data)
{
CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data;
ScreenPtr pScreen = pWindow->drawable.pScreen;
@@ -128,7 +128,7 @@ compSetPixmapVisitWindow(WindowPtr pWindow, pointer data)
SetBorderSize(pWindow);
if (HasBorder(pWindow))
QueueWorkProc(compRepaintBorder, serverClient,
- (pointer) (intptr_t) pWindow->drawable.id);
+ (void *) (intptr_t) pWindow->drawable.id);
return WT_WALKCHILDREN;
}
@@ -139,7 +139,7 @@ compSetPixmap(WindowPtr pWindow, PixmapPtr pPixmap)
visitRec.pWindow = pWindow;
visitRec.pPixmap = pPixmap;
- TraverseTree(pWindow, compSetPixmapVisitWindow, (pointer) &visitRec);
+ TraverseTree(pWindow, compSetPixmapVisitWindow, (void *) &visitRec);
compCheckTree(pWindow->drawable.pScreen);
}