aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-01-31 19:20:25 +0100
committerUlrich Sibiller <uli42@gmx.de>2021-01-31 19:23:27 +0100
commit5121188f08680b49deb6a3cc7362222a1797607c (patch)
tree1c45d5a430f4b9625fa1145abbbd25463ca4b0f9
parentd627e948f558f4210feb54c674e7c112b1d6a2e7 (diff)
downloadnx-libs-5121188f08680b49deb6a3cc7362222a1797607c.tar.gz
nx-libs-5121188f08680b49deb6a3cc7362222a1797607c.tar.bz2
nx-libs-5121188f08680b49deb6a3cc7362222a1797607c.zip
NXproperty.c: reorder functions
Make it obvious that GetWindowProperty() and ChangeWindowProperty are not derived from dix.
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXproperty.c60
1 files changed, 31 insertions, 29 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
index 7cf41f241..8461f4a30 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
@@ -208,28 +208,6 @@ ProcChangeProperty(ClientPtr client)
}
}
-int
-ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
- int mode, unsigned long len, void * value,
- Bool sendevent)
-{
- int sizeInBytes = format>>3;
- int totalSize = len * sizeInBytes;
- int copySize = nxagentOption(CopyBufferSize);
-
- if (copySize != COPY_UNLIMITED && property == clientCutProperty)
- {
- if (totalSize > copySize)
- {
- totalSize = copySize;
- totalSize = totalSize - (totalSize % sizeInBytes);
- len = totalSize / sizeInBytes;
- }
- }
-
- return xorg_ChangeWindowProperty(pWin, property, type, format, mode, len, value, sendevent);
-}
-
/*****************
* GetProperty
* If type Any is specified, returns the property from the specified
@@ -443,6 +421,20 @@ ProcGetProperty(ClientPtr client)
return(client->noClientException);
}
+int
+ProcDeleteProperty(register ClientPtr client)
+{
+ REQUEST(xDeletePropertyReq);
+ REQUEST_SIZE_MATCH(xDeletePropertyReq);
+ /* prevent clients from deleting the NX_AGENT_VERSION property */
+ if (stuff->property == MakeAtom("NX_AGENT_VERSION", strlen("NX_AGENT_VERSION"), True))
+ return client->noClientException;
+
+ return xorg_ProcDeleteProperty(client);
+}
+
+/* ---------------------------------------------------------------------- */
+
/*
* GetWindowProperty is the internal implementation of the
* XGetWindowProperty() Xlib call. It is called from
@@ -572,13 +564,23 @@ GetWindowProperty(WindowPtr pWin, Atom property, long longOffset,
}
int
-ProcDeleteProperty(register ClientPtr client)
+ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
+ int mode, unsigned long len, void * value,
+ Bool sendevent)
{
- REQUEST(xDeletePropertyReq);
- REQUEST_SIZE_MATCH(xDeletePropertyReq);
- /* prevent clients from deleting the NX_AGENT_VERSION property */
- if (stuff->property == MakeAtom("NX_AGENT_VERSION", strlen("NX_AGENT_VERSION"), True))
- return client->noClientException;
+ int sizeInBytes = format>>3;
+ int totalSize = len * sizeInBytes;
+ int copySize = nxagentOption(CopyBufferSize);
- return xorg_ProcDeleteProperty(client);
+ if (copySize != COPY_UNLIMITED && property == clientCutProperty)
+ {
+ if (totalSize > copySize)
+ {
+ totalSize = copySize;
+ totalSize = totalSize - (totalSize % sizeInBytes);
+ len = totalSize / sizeInBytes;
+ }
+ }
+
+ return xorg_ChangeWindowProperty(pWin, property, type, format, mode, len, value, sendevent);
}