aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-01 11:43:14 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-11-02 11:18:00 +0100
commita9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff (patch)
tree4bb4baa2366f42dd648a26ab905f10dffda28f23
parente755e660009f57f58ecf001c65b69e1bc0a29430 (diff)
downloadnx-libs-a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff.tar.gz
nx-libs-a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff.tar.bz2
nx-libs-a9bdfd2171f74be3bfc6d1e4f1e22765f3bb54ff.zip
NXshm.c: use upstream versions of Dispatch functions
instead of having an own (identical) copy
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c12
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXshm.c94
2 files changed, 14 insertions, 92 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index 8e99b1047..afd5b7572 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -1138,9 +1138,12 @@ CreatePmap:
return (BadAlloc);
}
-#ifndef NXAGENT_SERVER
static int
+#ifdef NXAGENT_SERVER
+xorg_ProcShmDispatch (client)
+#else
ProcShmDispatch (client)
+#endif
register ClientPtr client;
{
REQUEST(xReq);
@@ -1174,7 +1177,6 @@ ProcShmDispatch (client)
return BadRequest;
}
}
-#endif /* NXAGENT_SERVER */
static void
SShmCompletionEvent(from, to)
@@ -1278,9 +1280,12 @@ SProcShmCreatePixmap(client)
return ProcShmCreatePixmap(client);
}
-#ifndef NXAGENT_SERVER
static int
+#ifdef NXAGENT_SERVER
+xorg_SProcShmDispatch (client)
+#else
SProcShmDispatch (client)
+#endif
register ClientPtr client;
{
REQUEST(xReq);
@@ -1302,4 +1307,3 @@ SProcShmDispatch (client)
return BadRequest;
}
}
-#endif /* NXAGENT_SERVER */
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;