This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 4c5e9a295230362ef072132cdc0f5b92150fc2b9 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Feb 26 06:11:56 2018 +0100 Lift dbe to xorg-xserver-7.1/1.1.0 state - non-functional changes only --- nx-X11/programs/Xserver/dbe/dbe.c | 87 +++++++++++-------------------------- nx-X11/programs/Xserver/dbe/midbe.c | 33 ++++---------- 2 files changed, 34 insertions(+), 86 deletions(-) diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 0860801..89df088 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -100,10 +100,7 @@ static Bool firstRegistrationPass = TRUE; *****************************************************************************/ void -DbeValidateBuffer(pWin, drawID, dstbuf) - WindowPtr pWin; - XID drawID; - Bool dstbuf; +DbeValidateBuffer(WindowPtr pWin, XID drawID, Bool dstbuf) { DbeScreenPrivPtr pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(pWin); if (pDbeScreenPriv->ValidateBuffer) @@ -122,9 +119,7 @@ DbeValidateBuffer(pWin, drawID, dstbuf) *****************************************************************************/ void -DbeRegisterFunction(pScreen, funct) - ScreenPtr pScreen; - Bool (*funct)(); +DbeRegisterFunction(ScreenPtr pScreen, Bool (*funct) (/* ??? */)) { int i; @@ -158,8 +153,7 @@ DbeRegisterFunction(pScreen, funct) * *****************************************************************************/ static DbeWindowPrivPtr -DbeAllocWinPriv(pScreen) - ScreenPtr pScreen; +DbeAllocWinPriv(ScreenPtr pScreen) { DbeWindowPrivPtr pDbeWindowPriv; DbeScreenPrivPtr pDbeScreenPriv; @@ -248,10 +242,7 @@ DbeAllocWinPrivPrivIndex(void) *****************************************************************************/ static Bool -DbeAllocWinPrivPriv(pScreen, index, amount) - register ScreenPtr pScreen; - int index; - unsigned int amount; +DbeAllocWinPrivPriv(register ScreenPtr pScreen, int index, unsigned int amount) { DbeScreenPrivPtr pDbeScreenPriv; unsigned int oldamount; @@ -302,9 +293,7 @@ DbeAllocWinPrivPriv(pScreen, index, amount) *****************************************************************************/ static void -DbeStubScreen(pDbeScreenPriv, nStubbedScreens) - DbeScreenPrivPtr pDbeScreenPriv; - int *nStubbedScreens; +DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens) { /* Stub DIX. */ pDbeScreenPriv->SetupBackgroundPainter = NULL; @@ -351,8 +340,7 @@ DbeStubScreen(pDbeScreenPriv, nStubbedScreens) *****************************************************************************/ static int -ProcDbeGetVersion(client) - ClientPtr client; +ProcDbeGetVersion(ClientPtr client) { /* REQUEST(xDbeGetVersionReq); */ xDbeGetVersionReply rep; @@ -401,8 +389,7 @@ ProcDbeGetVersion(client) *****************************************************************************/ static int -ProcDbeAllocateBackBufferName(client) - ClientPtr client; +ProcDbeAllocateBackBufferName(ClientPtr client) { REQUEST(xDbeAllocateBackBufferNameReq); WindowPtr pWin; @@ -636,8 +623,7 @@ ProcDbeAllocateBackBufferName(client) *****************************************************************************/ static int -ProcDbeDeallocateBackBufferName(client) - ClientPtr client; +ProcDbeDeallocateBackBufferName(ClientPtr client) { REQUEST(xDbeDeallocateBackBufferNameReq); DbeWindowPrivPtr pDbeWindowPriv; @@ -708,8 +694,7 @@ ProcDbeDeallocateBackBufferName(client) *****************************************************************************/ static int -ProcDbeSwapBuffers(client) - ClientPtr client; +ProcDbeSwapBuffers(ClientPtr client) { REQUEST(xDbeSwapBuffersReq); WindowPtr pWin; @@ -839,8 +824,7 @@ ProcDbeSwapBuffers(client) *****************************************************************************/ static int -ProcDbeBeginIdiom(client) - ClientPtr client; +ProcDbeBeginIdiom(ClientPtr client) { /* REQUEST(xDbeBeginIdiomReq); */ DbeScreenPrivPtr pDbeScreenPriv; @@ -883,8 +867,7 @@ ProcDbeBeginIdiom(client) *****************************************************************************/ static int -ProcDbeGetVisualInfo(client) - ClientPtr client; +ProcDbeGetVisualInfo(ClientPtr client) { REQUEST(xDbeGetVisualInfoReq); DbeScreenPrivPtr pDbeScreenPriv; @@ -1062,8 +1045,7 @@ ProcDbeGetVisualInfo(client) *****************************************************************************/ static int -ProcDbeGetBackBufferAttributes(client) - ClientPtr client; +ProcDbeGetBackBufferAttributes(ClientPtr client) { REQUEST(xDbeGetBackBufferAttributesReq); xDbeGetBackBufferAttributesReply rep; @@ -1110,8 +1092,7 @@ ProcDbeGetBackBufferAttributes(client) *****************************************************************************/ static int -ProcDbeDispatch(client) - ClientPtr client; +ProcDbeDispatch(ClientPtr client) { REQUEST(xReq); @@ -1166,8 +1147,7 @@ ProcDbeDispatch(client) *****************************************************************************/ static int -SProcDbeGetVersion(client) - ClientPtr client; +SProcDbeGetVersion(ClientPtr client) { REQUEST(xDbeGetVersionReq); @@ -1201,8 +1181,7 @@ SProcDbeGetVersion(client) *****************************************************************************/ static int -SProcDbeAllocateBackBufferName(client) - ClientPtr client; +SProcDbeAllocateBackBufferName(ClientPtr client) { REQUEST(xDbeAllocateBackBufferNameReq); @@ -1236,8 +1215,7 @@ SProcDbeAllocateBackBufferName(client) *****************************************************************************/ static int -SProcDbeDeallocateBackBufferName(client) - ClientPtr client; +SProcDbeDeallocateBackBufferName(ClientPtr client) { REQUEST (xDbeDeallocateBackBufferNameReq); @@ -1273,8 +1251,7 @@ SProcDbeDeallocateBackBufferName(client) *****************************************************************************/ static int -SProcDbeSwapBuffers(client) - ClientPtr client; +SProcDbeSwapBuffers(ClientPtr client) { REQUEST(xDbeSwapBuffersReq); unsigned int i; @@ -1325,8 +1302,7 @@ SProcDbeSwapBuffers(client) *****************************************************************************/ static int -SProcDbeBeginIdiom(client) - ClientPtr client; +SProcDbeBeginIdiom(ClientPtr client) { REQUEST(xDbeBeginIdiomReq); @@ -1354,8 +1330,7 @@ SProcDbeBeginIdiom(client) *****************************************************************************/ static int -SProcDbeGetVisualInfo(client) - ClientPtr client; +SProcDbeGetVisualInfo(ClientPtr client) { REQUEST(xDbeGetVisualInfoReq); @@ -1387,8 +1362,7 @@ SProcDbeGetVisualInfo(client) *****************************************************************************/ static int -SProcDbeGetBackBufferAttributes(client) - ClientPtr client; +SProcDbeGetBackBufferAttributes(ClientPtr client) { REQUEST (xDbeGetBackBufferAttributesReq); @@ -1413,8 +1387,7 @@ SProcDbeGetBackBufferAttributes(client) *****************************************************************************/ static int -SProcDbeDispatch(client) - ClientPtr client; +SProcDbeDispatch(ClientPtr client) { REQUEST(xReq); @@ -1468,9 +1441,7 @@ SProcDbeDispatch(client) *****************************************************************************/ static Bool -DbeSetupBackgroundPainter(pWin, pGC) - WindowPtr pWin; - GCPtr pGC; +DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC) { void *gcvalues[4]; int ts_x_origin, ts_y_origin; @@ -1543,9 +1514,7 @@ DbeSetupBackgroundPainter(pWin, pGC) * *****************************************************************************/ static int -DbeDrawableDelete(pDrawable, id) - void *pDrawable; - XID id; +DbeDrawableDelete(void * pDrawable, XID id) { return(Success); @@ -1564,9 +1533,7 @@ DbeDrawableDelete(pDrawable, id) * *****************************************************************************/ static int -DbeWindowPrivDelete(pDbeWinPriv, id) - void *pDbeWinPriv; - XID id; +DbeWindowPrivDelete(void * pDbeWinPriv, XID id) { DbeScreenPrivPtr pDbeScreenPriv; DbeWindowPrivPtr pDbeWindowPriv = (DbeWindowPrivPtr)pDbeWinPriv; @@ -1673,8 +1640,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id) * *****************************************************************************/ static void -DbeResetProc(extEntry) - ExtensionEntry *extEntry; +DbeResetProc(ExtensionEntry *extEntry) { int i; ScreenPtr pScreen; @@ -1729,8 +1695,7 @@ DbeResetProc(extEntry) *****************************************************************************/ static Bool -DbeDestroyWindow(pWin) - WindowPtr pWin; +DbeDestroyWindow(WindowPtr pWin) { DbeScreenPrivPtr pDbeScreenPriv; DbeWindowPrivPtr pDbeWindowPriv; diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index b005420..0c98731 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -91,9 +91,7 @@ int dbeWindowPrivIndex = -1; *****************************************************************************/ static Bool -miDbeGetVisualInfo(pScreen, pScrVisInfo) - ScreenPtr pScreen; - XdbeScreenVisualInfo *pScrVisInfo; +miDbeGetVisualInfo(ScreenPtr pScreen, XdbeScreenVisualInfo *pScrVisInfo) { register int i, j, k; register int count; @@ -155,10 +153,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo) *****************************************************************************/ static int -miDbeAllocBackBufferName(pWin, bufId, swapAction) - WindowPtr pWin; - XID bufId; - int swapAction; +miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction) { ScreenPtr pScreen; DbeWindowPrivPtr pDbeWindowPriv; @@ -269,8 +264,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction) *****************************************************************************/ static void -miDbeAliasBuffers(pDbeWindowPriv) - DbeWindowPrivPtr pDbeWindowPriv; +miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv) { int i; MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv = @@ -296,10 +290,7 @@ miDbeAliasBuffers(pDbeWindowPriv) *****************************************************************************/ static int -miDbeSwapBuffers(client, pNumWindows, swapInfo) - ClientPtr client; - int *pNumWindows; - DbeSwapInfoPtr swapInfo; +miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo) { DbeScreenPrivPtr pDbeScreenPriv; GCPtr pGC; @@ -478,9 +469,7 @@ miDbeSwapBuffers(client, pNumWindows, swapInfo) *****************************************************************************/ static void -miDbeWinPrivDelete(pDbeWindowPriv, bufId) - DbeWindowPrivPtr pDbeWindowPriv; - XID bufId; +miDbeWinPrivDelete(DbeWindowPrivPtr pDbeWindowPriv, XID bufId) { MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv; @@ -527,10 +516,7 @@ miDbeWinPrivDelete(pDbeWindowPriv, bufId) *****************************************************************************/ static Bool -miDbePositionWindow(pWin, x, y) - WindowPtr pWin; - int x; - int y; +miDbePositionWindow(WindowPtr pWin, int x, int y) { ScreenPtr pScreen; DbeScreenPrivPtr pDbeScreenPriv; @@ -768,8 +754,7 @@ miDbePositionWindow(pWin, x, y) *****************************************************************************/ static void -miDbeResetProc(pScreen) - ScreenPtr pScreen; +miDbeResetProc(ScreenPtr pScreen) { DbeScreenPrivPtr pDbeScreenPriv; @@ -798,9 +783,7 @@ miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) *****************************************************************************/ Bool -miDbeInit(pScreen, pDbeScreenPriv) - ScreenPtr pScreen; - DbeScreenPrivPtr pDbeScreenPriv; +miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv) { /* Copy resource types created by DIX */ dbeDrawableResType = pDbeScreenPriv->dbeDrawableResType; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git