aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/rrxinerama.c.NX.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
commitabd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch)
treeaa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/rrxinerama.c.NX.patch
parent2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff)
downloadnx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/rrxinerama.c.NX.patch')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/rrxinerama.c.NX.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/rrxinerama.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/rrxinerama.c.NX.patch
deleted file mode 100644
index f95d6325a..000000000
--- a/doc/nx-X11_vs_XOrg69_patches/rrxinerama.c.NX.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- ./nx-X11/programs/Xserver/randr/rrxinerama.c.X.original 2015-02-13 14:03:44.792440567 +0100
-+++ ./nx-X11/programs/Xserver/randr/rrxinerama.c 2015-02-10 19:13:13.620692775 +0100
-@@ -68,9 +68,30 @@
- * David Thomas <davtom@dream.org.uk>.
- */
-
-+/**************************************************************************/
-+/* */
-+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
-+/* */
-+/* NX-X11, NX protocol compression and NX extensions to this software */
-+/* are copyright of NoMachine. Redistribution and use of the present */
-+/* software is allowed according to terms specified in the file LICENSE */
-+/* which comes in the source distribution. */
-+/* */
-+/* Check http://www.nomachine.com/licensing.html for applicability. */
-+/* */
-+/* NX and NoMachine are trademarks of Medialogic S.p.A. */
-+/* */
-+/* All rights reserved. */
-+/* */
-+/**************************************************************************/
-+
- #include "randrstr.h"
- #include "swaprep.h"
-+#ifndef NXAGENT_SERVER
- #include <X11/extensions/panoramiXproto.h>
-+#else
-+#include "panoramiXproto.h"
-+#endif
-
- #define RR_XINERAMA_MAJOR_VERSION 1
- #define RR_XINERAMA_MINOR_VERSION 1
-@@ -122,7 +143,12 @@
- Bool active = FALSE;
-
- REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-+ #ifndef NXAGENT_SERVER
- rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+ #else
-+ pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
-+ rc = pWin ? Success : BadWindow;
-+ #endif
- if(rc != Success)
- return rc;
-
-@@ -185,7 +211,12 @@
- register int n, rc;
-
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-+ #ifndef NXAGENT_SERVER
- rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+ #else
-+ pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
-+ rc = pWin ? Success : BadWindow;
-+ #endif
- if (rc != Success)
- return rc;
-
-@@ -213,7 +244,12 @@
- register int n, rc;
-
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-+ #ifndef NXAGENT_SERVER
- rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+ #else
-+ pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
-+ rc = pWin ? Success : BadWindow;
-+ #endif
- if (rc != Success)
- return rc;
-