From e755e660009f57f58ecf001c65b69e1bc0a29430 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 1 May 2019 11:07:21 +0200 Subject: NXshm.c: rework code to be identical for ProcShmDispatch and SProcShmDispatch --- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 120 ++++++++++++++--------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'nx-X11/programs/Xserver/hw') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index e1b55f561..2e96c5006 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -492,20 +492,6 @@ nxagent_ProcShmDispatch (client) register ClientPtr client; { REQUEST(xReq); - -#ifdef NXAGENT_SERVER - #ifdef TEST - fprintf(stderr, "ProcShmDispatch: Going to execute operation [%d] for client [%d].\n", - stuff -> data, client -> index); - - if (stuff->data <= X_ShmCreatePixmap) - { - fprintf(stderr, "ProcShmDispatch: Request [%s] OPCODE#%d.\n", - nxagentShmRequestLiteral[stuff->data], stuff->data); - } - #endif -#endif - switch (stuff->data) { case X_ShmQueryVersion: @@ -516,13 +502,6 @@ nxagent_ProcShmDispatch (client) return ProcShmDetach(client); case X_ShmPutImage: { -#ifdef NXAGENT_SERVER - #ifdef TEST - fprintf(stderr, "ProcShmDispatch: Going to execute ProcShmPutImage() for client [%d].\n", - client -> index); - #endif -#endif - #ifdef PANORAMIX if ( !noPanoramiXExtension ) return ProcPanoramiXShmPutImage(client); @@ -546,6 +525,31 @@ nxagent_ProcShmDispatch (client) } } +static int +nxagent_SProcShmDispatch (client) + register ClientPtr client; +{ + REQUEST(xReq); + + switch (stuff->data) + { + case X_ShmQueryVersion: + return SProcShmQueryVersion(client); + case X_ShmAttach: + return SProcShmAttach(client); + case X_ShmDetach: + return SProcShmDetach(client); + case X_ShmPutImage: + return SProcShmPutImage(client); + case X_ShmGetImage: + return SProcShmGetImage(client); + case X_ShmCreatePixmap: + return SProcShmCreatePixmap(client); + default: + return BadRequest; + } +} + /* A wrapper that handles the trap. This construct is used to keep the derived code closer to the original */ @@ -554,6 +558,24 @@ ProcShmDispatch (register ClientPtr client) { int result; + #ifdef TEST + REQUEST(xReq); + fprintf(stderr, "ProcShmDispatch: Going to execute operation [%d] for client [%d].\n", + stuff -> data, client -> index); + + if (stuff->data <= X_ShmCreatePixmap) + { + fprintf(stderr, "ProcShmDispatch: Request [%s] OPCODE#%d.\n", + nxagentShmRequestLiteral[stuff->data], stuff->data); + } + + if (stuff->data == X_ShmPutImage) + { + fprintf(stderr, "ProcShmDispatch: Going to execute ProcShmPutImage() for client [%d].\n", + client -> index); + } + #endif + nxagentShmTrap = 1; result = nxagent_ProcShmDispatch(client); @@ -564,55 +586,33 @@ ProcShmDispatch (register ClientPtr client) } static int -SProcShmDispatch (client) - register ClientPtr client; +SProcShmDispatch (register ClientPtr client) { - REQUEST(xReq); + int result; #ifdef TEST + REQUEST(xReq); fprintf(stderr, "SProcShmDispatch: Going to execute operation [%d] for client [%d].\n", stuff -> data, client -> index); - #endif - switch (stuff->data) + if (stuff->data <= X_ShmCreatePixmap) { - case X_ShmQueryVersion: - return SProcShmQueryVersion(client); - case X_ShmAttach: - return SProcShmAttach(client); - case X_ShmDetach: - return SProcShmDetach(client); - case X_ShmPutImage: - { - int result; - - #ifdef TEST - fprintf(stderr, "SProcShmDispatch: Going to execute SProcShmPutImage() for client [%d].\n", - client -> index); - #endif + fprintf(stderr, "ProcShmDispatch: Request [%s] OPCODE#%d.\n", + nxagentShmRequestLiteral[stuff->data], stuff->data); + } -#ifdef NXAGENT_SERVER - nxagentShmTrap = 1; -#endif + if (stuff->data == X_ProxShmPutImage) + { + fprintf(stderr, "SProcShmDispatch: Going to execute SProcShmPutImage() for client [%d].\n", + client -> index); + } + #endif - result = SProcShmPutImage(client); + nxagentShmTrap = 1; -#ifdef NXAGENT_SERVER - nxagentShmTrap = 0; -#endif + result = nxagent_SProcShmDispatch(client); - #ifdef TEST - fprintf(stderr, "SProcShmDispatch: Returning from SProcShmPutImage() for client [%d].\n", - client -> index); - #endif + nxagentShmTrap = 0; - return result; - } - case X_ShmGetImage: - return SProcShmGetImage(client); - case X_ShmCreatePixmap: - return SProcShmCreatePixmap(client); - default: - return BadRequest; - } + return result; } -- cgit v1.2.3 From a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 1 May 2019 11:43:14 +0200 Subject: NXshm.c: use upstream versions of Dispatch functions instead of having an own (identical) copy --- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 94 ++---------------------------- 1 file changed, 6 insertions(+), 88 deletions(-) (limited to 'nx-X11/programs/Xserver/hw') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 2e96c5006..3b597fe6d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -486,70 +486,6 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr) return result; } - -static int -nxagent_ProcShmDispatch (client) - register ClientPtr client; -{ - REQUEST(xReq); - switch (stuff->data) - { - case X_ShmQueryVersion: - return ProcShmQueryVersion(client); - case X_ShmAttach: - return ProcShmAttach(client); - case X_ShmDetach: - return ProcShmDetach(client); - case X_ShmPutImage: - { -#ifdef PANORAMIX - if ( !noPanoramiXExtension ) - return ProcPanoramiXShmPutImage(client); -#endif - return ProcShmPutImage(client); - } - case X_ShmGetImage: -#ifdef PANORAMIX - if ( !noPanoramiXExtension ) - return ProcPanoramiXShmGetImage(client); -#endif - return ProcShmGetImage(client); - case X_ShmCreatePixmap: -#ifdef PANORAMIX - if ( !noPanoramiXExtension ) - return ProcPanoramiXShmCreatePixmap(client); -#endif - return ProcShmCreatePixmap(client); - default: - return BadRequest; - } -} - -static int -nxagent_SProcShmDispatch (client) - register ClientPtr client; -{ - REQUEST(xReq); - - switch (stuff->data) - { - case X_ShmQueryVersion: - return SProcShmQueryVersion(client); - case X_ShmAttach: - return SProcShmAttach(client); - case X_ShmDetach: - return SProcShmDetach(client); - case X_ShmPutImage: - return SProcShmPutImage(client); - case X_ShmGetImage: - return SProcShmGetImage(client); - case X_ShmCreatePixmap: - return SProcShmCreatePixmap(client); - default: - return BadRequest; - } -} - /* A wrapper that handles the trap. This construct is used to keep the derived code closer to the original */ @@ -560,25 +496,16 @@ ProcShmDispatch (register ClientPtr client) #ifdef TEST REQUEST(xReq); - fprintf(stderr, "ProcShmDispatch: Going to execute operation [%d] for client [%d].\n", - stuff -> data, client -> index); - if (stuff->data <= X_ShmCreatePixmap) { - fprintf(stderr, "ProcShmDispatch: Request [%s] OPCODE#%d.\n", - nxagentShmRequestLiteral[stuff->data], stuff->data); - } - - if (stuff->data == X_ShmPutImage) - { - fprintf(stderr, "ProcShmDispatch: Going to execute ProcShmPutImage() for client [%d].\n", - client -> index); + fprintf(stderr, "ProcShmDispatch: Request [%s] OPCODE [%d] for client [%d].\n", + nxagentShmRequestLiteral[stuff->data], stuff->data, client->index); } #endif nxagentShmTrap = 1; - result = nxagent_ProcShmDispatch(client); + result = xorg_ProcShmDispatch(client); nxagentShmTrap = 0; @@ -592,25 +519,16 @@ SProcShmDispatch (register ClientPtr client) #ifdef TEST REQUEST(xReq); - fprintf(stderr, "SProcShmDispatch: Going to execute operation [%d] for client [%d].\n", - stuff -> data, client -> index); - if (stuff->data <= X_ShmCreatePixmap) { - fprintf(stderr, "ProcShmDispatch: Request [%s] OPCODE#%d.\n", - nxagentShmRequestLiteral[stuff->data], stuff->data); - } - - if (stuff->data == X_ProxShmPutImage) - { - fprintf(stderr, "SProcShmDispatch: Going to execute SProcShmPutImage() for client [%d].\n", - client -> index); + fprintf(stderr, "SProcShmDispatch: Request [%s] OPCODE [%d] for client [%d].\n", + nxagentShmRequestLiteral[stuff->data], stuff->data, client->index); } #endif nxagentShmTrap = 1; - result = nxagent_SProcShmDispatch(client); + result = xorg_SProcShmDispatch(client); nxagentShmTrap = 0; -- cgit v1.2.3 From 6fd0ffc99890c413d003bef323024f0cee62916f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 30 May 2019 23:24:16 +0200 Subject: NXshm.c: call upstream miShmPutImage instead of having an identical copy in nxagent_miShmPutImage --- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 38 +----------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'nx-X11/programs/Xserver/hw') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 3b597fe6d..83deb74c4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -163,42 +163,6 @@ ShmExtensionInit(void) } } -static void -nxagent_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) - DrawablePtr dst; - GCPtr pGC; - int depth, w, h, sx, sy, sw, sh, dx, dy; - unsigned int format; - char *data; -{ - PixmapPtr pmap; - GCPtr putGC; - - putGC = GetScratchGC(depth, dst->pScreen); - if (!putGC) - { - return; - } - pmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pmap) - { - FreeScratchGC(putGC); - return; - } - ValidateGC((DrawablePtr)pmap, putGC); - (*putGC->ops->PutImage)((DrawablePtr)pmap, putGC, depth, -sx, -sy, w, h, 0, - (format == XYPixmap) ? XYPixmap : ZPixmap, data); - FreeScratchGC(putGC); - if (format == XYBitmap) - (void)(*pGC->ops->CopyPlane)((DrawablePtr)pmap, dst, pGC, 0, 0, sw, sh, - dx, dy, 1L); - else - (void)(*pGC->ops->CopyArea)((DrawablePtr)pmap, dst, pGC, 0, 0, sw, sh, - dx, dy); - (*pmap->drawable.pScreen->DestroyPixmap)(pmap); -} - static void miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) DrawablePtr dst; @@ -211,7 +175,7 @@ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) nxagentShmTrap = 0; - nxagent_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data); + xorg_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data); nxagentShmTrap = 1; -- cgit v1.2.3