nx-X11 vs. X.Org 6.9 patches for further studying / documentation

  NoMachine kept all original X.Org 6.9 files in the nx-X11 source
  tree. These files have been removed in Feb 2015 during a major
  code cleanup.

  For later studying we provide all diffs of the changes that
  NoMachine employed on the original X.Org X11 code tree in the
  doc/nx-X11_vs_XOrg69_patches folder.

1 files changed, 144 insertions, 0 deletions

diff --git a/doc/nx-X11_vs_XOrg69_patches/randr.h.NX.patch b/doc/nx-X11_vs_XOrg69_patches/randr.h.NX.patch
new file mode 100644
index 000000000..a6f2d9c95
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/randr.h.NX.patch
@@ -0,0 +1,144 @@
+--- ./nx-X11/programs/Xserver/randr/randr.h.X.original	2015-02-13 14:03:44.792440567 +0100
++++ ./nx-X11/programs/Xserver/randr/randr.h	2015-02-10 19:13:13.628692476 +0100
+@@ -0,0 +1,141 @@
++/*
++ * Copyright © 2000 Compaq Computer Corporation
++ * Copyright © 2002 Hewlett Packard Company
++ * Copyright © 2006 Intel Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that copyright
++ * notice and this permission notice appear in supporting documentation, and
++ * that the name of the copyright holders not be used in advertising or
++ * publicity pertaining to distribution of the software without specific,
++ * written prior permission.  The copyright holders make no representations
++ * about the suitability of this software for any purpose.  It is provided "as
++ * is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++ * OF THIS SOFTWARE.
++ *
++ * Author:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.
++ *	    Keith Packard, Intel Corporation
++ */
++
++#ifndef _RANDR_H_
++#define _RANDR_H_
++
++typedef unsigned short	Rotation;
++typedef unsigned short	SizeID;
++typedef unsigned short	SubpixelOrder;
++typedef unsigned short	Connection;
++typedef unsigned short	XRandrRotation;
++typedef unsigned short	XRandrSizeID;
++typedef unsigned short	XRandrSubpixelOrder;
++typedef unsigned long	XRandrModeFlags;
++
++#define RANDR_NAME		"RANDR"
++#define RANDR_MAJOR		1
++#define RANDR_MINOR		2
++
++#define RRNumberErrors		3
++#define RRNumberEvents		2
++#define RRNumberRequests	25
++
++#define X_RRQueryVersion	0
++/* we skip 1 to make old clients fail pretty immediately */
++#define X_RROldGetScreenInfo	1
++#define X_RR1_0SetScreenConfig	2
++/* V1.0 apps share the same set screen config request id */
++#define X_RRSetScreenConfig	2
++#define X_RROldScreenChangeSelectInput	3
++/* 3 used to be ScreenChangeSelectInput; deprecated */
++#define X_RRSelectInput		4
++#define X_RRGetScreenInfo	5
++
++/* V1.2 additions */
++#define X_RRGetScreenSizeRange	    6
++#define X_RRSetScreenSize	    7
++#define X_RRGetScreenResources	    8
++#define X_RRGetOutputInfo	    9
++#define X_RRListOutputProperties    10
++#define X_RRQueryOutputProperty	    11
++#define X_RRConfigureOutputProperty 12
++#define X_RRChangeOutputProperty    13
++#define X_RRDeleteOutputProperty    14
++#define X_RRGetOutputProperty	    15
++#define X_RRCreateMode		    16
++#define X_RRDestroyMode		    17
++#define X_RRAddOutputMode	    18
++#define X_RRDeleteOutputMode	    19
++#define X_RRGetCrtcInfo		    20
++#define X_RRSetCrtcConfig	    21
++#define X_RRGetCrtcGammaSize	    22
++#define X_RRGetCrtcGamma	    23
++#define X_RRSetCrtcGamma	    24
++
++/* Event selection bits */
++#define RRScreenChangeNotifyMask  (1L << 0)
++/* V1.2 additions */
++#define RRCrtcChangeNotifyMask	    (1L << 1)
++#define RROutputChangeNotifyMask    (1L << 2)
++#define RROutputPropertyNotifyMask  (1L << 3)
++
++/* Event codes */
++#define RRScreenChangeNotify	0
++/* V1.2 additions */
++#define RRNotify		    1
++/* RRNotify Subcodes */
++#define  RRNotify_CrtcChange	    0
++#define  RRNotify_OutputChange	    1
++#define  RRNotify_OutputProperty    2
++
++/* used in the rotation field; rotation and reflection in 0.1 proto. */
++#define RR_Rotate_0		1
++#define RR_Rotate_90		2
++#define RR_Rotate_180		4
++#define RR_Rotate_270		8
++
++/* new in 1.0 protocol, to allow reflection of screen */
++
++#define RR_Reflect_X		16
++#define RR_Reflect_Y		32
++
++#define RRSetConfigSuccess		0
++#define RRSetConfigInvalidConfigTime	1
++#define RRSetConfigInvalidTime		2
++#define RRSetConfigFailed		3
++
++/* new in 1.2 protocol */
++
++#define RR_HSyncPositive	0x00000001
++#define RR_HSyncNegative	0x00000002
++#define RR_VSyncPositive	0x00000004
++#define RR_VSyncNegative	0x00000008
++#define RR_Interlace		0x00000010
++#define RR_DoubleScan		0x00000020
++#define RR_CSync		0x00000040
++#define RR_CSyncPositive	0x00000080
++#define RR_CSyncNegative	0x00000100
++#define RR_HSkewPresent		0x00000200
++#define RR_BCast		0x00000400
++#define RR_PixelMultiplex	0x00000800
++#define RR_DoubleClock		0x00001000
++#define RR_ClockDivideBy2	0x00002000
++
++#define RR_Connected		0
++#define RR_Disconnected		1
++#define RR_UnknownConnection	2
++
++#define BadRROutput		0
++#define BadRRCrtc		1
++#define BadRRMode		2
++
++/* Conventional RandR output properties */
++
++#define RR_PROPERTY_RANDR_EDID		"RANDR_EDID"
++
++#endif	/* _RANDR_H_ */