aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-12-29 00:48:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-06 00:50:30 +0100
commit12358d64a44889eef243eb316ca1ac962cca5422 (patch)
tree1fc0de855d12203915fe9d9506eff258a96b2d04 /nx-X11/programs/Xserver/hw
parent662708b3d49aa2772a855a337369ed882a41da9a (diff)
downloadnx-libs-12358d64a44889eef243eb316ca1ac962cca5422.tar.gz
nx-libs-12358d64a44889eef243eb316ca1ac962cca5422.tar.bz2
nx-libs-12358d64a44889eef243eb316ca1ac962cca5422.zip
nxagent: remove another xprint renmant
reqeuestingClient was dropped with the XPRINT drop. Unfortunetely we are usign it in Image.c. So let's introduce nxagentRequestingClient as replacement for now.
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.c3
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c14
2 files changed, 14 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 69a51075c..ba0fe9252 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -99,6 +99,7 @@ extern void nxagentBitOrderInvert(unsigned char *, int);
extern void nxagentTwoByteSwap(unsigned char *, register int);
extern void nxagentFourByteSwap(register unsigned char *, register int);
+extern ClientPtr nxagentRequestingClient;
/*
* Store the last visual used to unpack the images for the given
* client.
@@ -1073,7 +1074,7 @@ void nxagentPutSubImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
/*
FIXME: Should use an unpack resource here.
*/
- client = requestingClient;
+ client = nxagentRequestingClient;
if (client == NULL)
{
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index aae2b2efc..e804acbd2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -200,6 +200,12 @@ extern int nxagentMaxSelections;
extern int nxOpenFont(ClientPtr, XID, Mask, unsigned, char*);
+
+/*
+ * This used to be a dix variable used only by XPRINT, so xorg dropped it.
+ */
+ClientPtr nxagentRequestingClient;
+
void
InitSelections(void)
{
@@ -413,7 +419,9 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
}
isItTimeToYield = FALSE;
- requestingClient = client;
+#ifdef NXAGENT_SERVER
+ nxagentRequestingClient = client;
+#endif
start_tick = SmartScheduleTime;
while (!isItTimeToYield)
{
@@ -528,7 +536,9 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
client = clients[clientReady[nready]];
if (client)
client->smart_stop_tick = SmartScheduleTime;
- requestingClient = NULL;
+#ifdef NXAGENT_SERVER
+ nxagentRequestingClient = NULL;
+#endif
}
dispatchException &= ~DE_PRIORITYCHANGE;
}