From abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 26 Feb 2016 08:14:28 +0100 Subject: rename original NX patches, so that we can see the patched file's name in the patch file name. --- doc/nx-X11_vs_XOrg69_patches/randr.c.NX.patch | 72 --------------------------- 1 file changed, 72 deletions(-) delete mode 100644 doc/nx-X11_vs_XOrg69_patches/randr.c.NX.patch (limited to 'doc/nx-X11_vs_XOrg69_patches/randr.c.NX.patch') diff --git a/doc/nx-X11_vs_XOrg69_patches/randr.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/randr.c.NX.patch deleted file mode 100644 index d19f82022..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/randr.c.NX.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- ./nx-X11/programs/Xserver/randr/randr.c.X.original 2015-02-13 14:03:44.792440567 +0100 -+++ ./nx-X11/programs/Xserver/randr/randr.c 2015-02-10 19:13:13.616692925 +0100 -@@ -25,6 +25,23 @@ - * Keith Packard, Intel Corporation - */ - -+/**************************************************************************/ -+/* */ -+/* 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. */ -+/* */ -+/**************************************************************************/ -+ - #define NEED_REPLIES - #define NEED_EVENTS - #ifdef HAVE_DIX_CONFIG_H -@@ -56,9 +73,14 @@ - int RREventBase; - int RRErrorBase; - RESTYPE RRClientType, RREventType; /* resource types for event masks */ --DevPrivateKey RRClientPrivateKey = &RRClientPrivateKey; - -+#ifndef NXAGENT_SERVER -+DevPrivateKey RRClientPrivateKey = &RRClientPrivateKey; - DevPrivateKey rrPrivKey = &rrPrivKey; -+#else -+int RRClientPrivateIndex; -+int rrPrivIndex = -1; -+#endif - - static void - RRClientCallback (CallbackListPtr *list, -@@ -203,6 +225,10 @@ - { - if (RRGeneration != serverGeneration) - { -+ #ifdef NXAGENT_SERVER -+ if ((rrPrivIndex = AllocateScreenPrivateIndex()) < 0) -+ return FALSE; -+ #endif - if (!RRModeInit ()) - return FALSE; - if (!RRCrtcInit ()) -@@ -324,10 +350,18 @@ - - if (RRNScreens == 0) return; - -+ #ifndef NXAGENT_SERVER - if (!dixRequestPrivate(RRClientPrivateKey, - sizeof (RRClientRec) + - screenInfo.numScreens * sizeof (RRTimesRec))) - return; -+ #else -+ RRClientPrivateIndex = AllocateClientPrivateIndex (); -+ if (!AllocateClientPrivate (RRClientPrivateIndex, -+ sizeof (RRClientRec) + -+ screenInfo.numScreens * sizeof (RRTimesRec))) -+ return; -+ #endif - if (!AddCallback (&ClientStateCallback, RRClientCallback, 0)) - return; - -- cgit v1.2.3