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, 195 insertions, 0 deletions

diff --git a/doc/nx-X11_vs_XOrg69_patches/panoramiXproto.h.NX.patch b/doc/nx-X11_vs_XOrg69_patches/panoramiXproto.h.NX.patch
new file mode 100644
index 000000000..3424f2e4a
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/panoramiXproto.h.NX.patch
@@ -0,0 +1,195 @@
+--- ./nx-X11/programs/Xserver/randr/panoramiXproto.h.X.original	2015-02-13 14:03:44.792440567 +0100
++++ ./nx-X11/programs/Xserver/randr/panoramiXproto.h	2015-02-10 19:13:13.612693075 +0100
+@@ -0,0 +1,192 @@
++/* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */
++/*****************************************************************
++Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to deal
++in the Software without restriction, including without limitation the rights
++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++copies of the Software.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
++BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
++WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
++IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of Digital Equipment Corporation
++shall not be used in advertising or otherwise to promote the sale, use or other
++dealings in this Software without prior written authorization from Digital
++Equipment Corporation.
++******************************************************************/
++/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */
++
++/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
++
++#ifndef _PANORAMIXPROTO_H_
++#define _PANORAMIXPROTO_H_
++
++#define PANORAMIX_PROTOCOL_NAME "XINERAMA"
++
++#define X_PanoramiXQueryVersion		0
++#define X_PanoramiXGetState		1
++#define X_PanoramiXGetScreenCount	2
++#define X_PanoramiXGetScreenSize	3
++
++#define X_XineramaIsActive		4
++#define X_XineramaQueryScreens		5
++
++typedef struct _PanoramiXQueryVersion {
++	CARD8	reqType;		/* always PanoramiXReqCode */
++	CARD8	panoramiXReqType;	/* always X_PanoramiXQueryVersion */
++	CARD16	length B16;
++	CARD8	clientMajor;
++	CARD8	clientMinor;
++	CARD16	unused B16;           
++} xPanoramiXQueryVersionReq;
++
++#define sz_xPanoramiXQueryVersionReq	8
++
++typedef struct {
++	CARD8	type;			/* must be X_Reply */
++	CARD8	pad1;			/* unused	*/
++	CARD16	sequenceNumber  B16;	/* last sequence number */
++	CARD32	length  B32;		/* 0 */
++	CARD16	majorVersion  B16;	
++	CARD16	minorVersion  B16;	
++	CARD32	pad2	B32;		/* unused */
++	CARD32	pad3	B32;		/* unused */
++	CARD32	pad4	B32;		/* unused */
++	CARD32	pad5	B32;		/* unused */
++	CARD32	pad6	B32;		/* unused */
++} xPanoramiXQueryVersionReply;
++
++#define sz_xPanoramiXQueryVersionReply	32
++
++
++typedef	struct	_PanoramiXGetState {
++        CARD8   reqType;	        /* always PanoramiXReqCode */
++        CARD8   panoramiXReqType;    	/* always X_PanoramiXGetState */
++        CARD16  length B16;
++	CARD32  window B32;
++} xPanoramiXGetStateReq;
++#define sz_xPanoramiXGetStateReq	8	
++
++typedef struct {
++	BYTE	type;
++	BYTE	state;
++	CARD16	sequenceNumber B16;
++	CARD32	length	B32;
++	CARD32  window  B32;
++	CARD32	pad1	B32;		/* unused */
++	CARD32	pad2	B32;		/* unused */
++	CARD32	pad3	B32;		/* unused */
++	CARD32	pad4	B32;		/* unused */
++	CARD32	pad5	B32;		/* unused */
++} xPanoramiXGetStateReply;
++
++#define sz_panoramiXGetStateReply	32
++
++typedef	struct	_PanoramiXGetScreenCount {
++        CARD8   reqType;             /* always PanoramiXReqCode */
++        CARD8   panoramiXReqType;    /* always X_PanoramiXGetScreenCount */
++        CARD16  length B16;
++	CARD32  window B32;
++} xPanoramiXGetScreenCountReq;
++#define sz_xPanoramiXGetScreenCountReq	8
++
++typedef struct {
++	BYTE	type;
++	BYTE	ScreenCount;
++	CARD16	sequenceNumber B16;
++	CARD32	length B32;
++	CARD32  window  B32;
++	CARD32	pad1	B32;		/* unused */
++	CARD32	pad2	B32;		/* unused */
++	CARD32	pad3	B32;		/* unused */
++	CARD32	pad4	B32;		/* unused */
++	CARD32	pad5	B32;		/* unused */
++} xPanoramiXGetScreenCountReply;
++#define sz_panoramiXGetScreenCountReply	32
++
++typedef	struct	_PanoramiXGetScreenSize {
++        CARD8   reqType;                /* always PanoramiXReqCode */
++        CARD8   panoramiXReqType;	/* always X_PanoramiXGetState */
++        CARD16  length B16;
++	CARD32  window B32;
++	CARD32	screen B32;
++} xPanoramiXGetScreenSizeReq;
++#define sz_xPanoramiXGetScreenSizeReq	12	
++
++typedef struct {
++	BYTE	type;
++	CARD8	pad1;			
++	CARD16	sequenceNumber B16;
++	CARD32	length	B32;
++	CARD32	width	B32;
++	CARD32	height	B32;
++	CARD32  window  B32;
++	CARD32  screen  B32;
++	CARD32	pad2	B32;		/* unused */
++	CARD32	pad3	B32;		/* unused */
++} xPanoramiXGetScreenSizeReply;
++#define sz_panoramiXGetScreenSizeReply 32	
++
++/************  Alternate protocol  ******************/
++
++typedef struct {
++        CARD8   reqType;
++        CARD8   panoramiXReqType;
++        CARD16  length B16;
++} xXineramaIsActiveReq;
++#define sz_xXineramaIsActiveReq 4
++
++typedef struct {
++	BYTE	type;
++	CARD8	pad1;			
++	CARD16	sequenceNumber B16;
++	CARD32	length	B32;
++	CARD32	state	B32;
++	CARD32	pad2	B32;
++	CARD32  pad3  	B32;
++	CARD32  pad4  	B32;
++	CARD32	pad5	B32;
++	CARD32	pad6	B32;
++} xXineramaIsActiveReply;
++#define sz_XineramaIsActiveReply 32	
++
++
++typedef struct {
++        CARD8   reqType;
++        CARD8   panoramiXReqType;
++        CARD16  length B16;
++} xXineramaQueryScreensReq;
++#define sz_xXineramaQueryScreensReq 4
++
++typedef struct {
++	BYTE	type;
++	CARD8	pad1;			
++	CARD16	sequenceNumber B16;
++	CARD32	length	B32;
++	CARD32	number	B32;
++	CARD32	pad2	B32;
++	CARD32  pad3  	B32;
++	CARD32  pad4  	B32;
++	CARD32	pad5	B32;
++	CARD32	pad6	B32;
++} xXineramaQueryScreensReply;
++#define sz_XineramaQueryScreensReply 32	
++
++typedef struct {
++	INT16   x_org   B16;
++	INT16   y_org   B16;
++	CARD16  width   B16;
++	CARD16  height  B16;
++} xXineramaScreenInfo;
++#define sz_XineramaScreenInfo 8
++
++#endif