This has already been started while replacing copyright info in file
 headers and has now been completed with this commit.

Remove defines of NEED_EVENTS and NEED_REPLIES because they are never
used anywhere.

Basically these three commits, but as they are newer and to not match
the code structure the patches have not been applied but replaced by
sed + manual intervention:

   From cb95642dc8edebb2935dd471f8b339cb98aa8481 Mon Sep 17 00:00:00 2001
   From: Peter Hutterer <peter.hutterer@redhat.com>
   Date: Fri, 28 Nov 2008 22:28:32 +1000
   Subject: Remove #define NEED_EVENTS and NEED_REPLIES

   A grep on xorg/* revealed there's no consumer of this define.

   Quote Alan Coopersmith:
   "The consumer was in past versions of the headers now located
   in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h,
   all the event definitions were only available if NEED_EVENTS were
   defined, and all the reply definitions required NEED_REPLIES.

   Looks like Xproto.h dropped them by X11R6.3, which didn't have
   the #ifdef's anymore, so these are truly ancient now."
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>

--

   From 6de368c9aa7ccd2fcd62fca5a2b278913db4d03d Mon Sep 17 00:00:00 2001
   From: Fernando Carrijo <fcarrijo@yahoo.com.br>
   Date: Thu, 1 Jul 2010 06:50:47 -0300
   Subject: Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

--

   From 57c03e52e6b4e3ed54df5fdd778865467d08e119 Mon Sep 17 00:00:00 2001
   From: Fernando Carrijo <fcarrijo@yahoo.com.br>
   Date: Thu, 1 Jul 2010 06:59:48 -0300
   Subject: Purge macro NEED_EVENTS
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

 Casting return to (void) was used to tell lint that you intended
 to ignore the return value, so it didn't warn you about it.

 Casting the third argument to (char *) was used as the most generic
 pointer type in the days before compilers supported C89 (void *)
 (except for a couple places it's used for byte-sized pointer math).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Use internal temp variable for swap macros. Make swaps/swapl type safe (introducing wrong_size check at build time).

 While working on this changeset, various spots got discovered where
 swapl or swaps was used on a wrong type, where byte swapping calls had
 been forgotten or done on the wrong variable.

 This backport at least includes changes from the following X.org
 commits, listed in non-chronological order:

 commit 2c7c520cfe0df30f4bc3adba59d9c62582823bf8
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Thu Aug 4 15:35:41 2011 -0400

    Use internal temp variable for swap macros

    Also, fix whitespace, mainly around
        swaps(&rep.sequenceNumber)
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>

 commit 9edcae78c46286baff42e74bfe26f6ae4d00fe01
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Wed Sep 21 17:14:16 2011 -0400

    Use correct swap{l,s} (or none at all for CARD8)

    Swapping the wrong size was never caught because swap{l,s} are macros.

    It's clear in the case of Xext/xres.c, that the author believed
    client_major/minor to be CARD16 from looking at the code in the first
    hunk.

    v2: dmx.c fixes from Keith.
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>

 commit dab064fa5e0b1f5c67222562ad5367005832cba1
 Author: Andrea Canciani <ranma42@gmail.com>
 Date:   Tue Nov 2 20:10:32 2010 +0100

    render: Fix byteswapping of gradient stops

    The function swapStops repeatedly swaps the color components as
    CARD16, but incorrectly steps over them as if they were CARD32.

    This causes half of the stops not to be swapped at all and some
    unrelated data be swapped instead.
Signed-off-by: Andrea Canciani <ranma42@gmail.com>
Reviewed-by: Soren Sandmann <sandmann@daimi.au.dk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>

 commit 54770c980cd2b91a8377f975a58ed69def5cfa42
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Tue Aug 16 16:59:07 2011 -0400

    Cast char* buffers to swap functions
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>

 commit 6844bd2e63490870bab3c469eec6030354ef2865
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Jan 9 19:52:00 2008 -0800

    More Xv extension byte swapping fixes

 commit e46f6ddeccd082b2d507a1e8b57ea30e6b0a2c83
 Author: Michel Dänzer <michel@tungstengraphics.com>
 Date:   Wed Jan 16 14:24:22 2008 +0100

    Yet another Xv extension byte swapping fix.

Fixes ArcticaProject/nx-libs#105

Xserver/include/protocol-versions.h: Switch to having an Xserver-specific header file containing all use protocol versions.

hw/nxagent/NX*.c: Amend re-introduced nxagent warnings by fixing the corresponding code section in files included from "somewhere" in nx-X11/programs/Xserver/.

 (1)
 In file included from NXrender.c:44:0:
 ../../mi/../render/render.c: In function ‘swapStops’:
 ../../mi/../render/render.c:2541:13: warning: variable ‘colors’ set but not used [-Wunused-but-set-variable]
      CARD16 *colors;
              ^

 (2)
 In file included from NXevents.c:133:0:
 ../../dix/events.c: In function ‘ReinitializeRootWindow’:
 ../../dix/events.c:2046:15: warning: unused variable ‘pScreen’ [-Wunused-variable]
      ScreenPtr pScreen = win->drawable.pScreen;
                ^
 ../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’:
 ../../dix/events.c:2177:15: warning: variable ‘pScreen’ set but not used [-Wunused-but-set-variable]
      ScreenPtr pScreen = pWin->drawable.pScreen;
                ^
 In file included from NXevents.c:133:0:
 ../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’:
 ../../dix/events.c:2191:2: error: ‘pScreen’ undeclared (first use in this function)
   pScreen = pWin->drawable.pScreen;
   ^

 (3)
 In file included from NXdixfonts.c:77:0:
 ../../dix/dixfonts.c: In function ‘GetFontPath’:
 ../../dix/dixfonts.c:1890:2: warning: return makes pointer from integer without a cast
   return BadAlloc;
   ^

hw/nxagent/NXglyph.c: Shrink file, drop duplicate code that can identically be found in render/glyph.c.

hw/nxagent/NXrender.c: Shrink file, drop duplicate code that can identically be found in render/render.c.

Fixes ArcticaProject/nx-libs#37

hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files in nxagent's code base. Rather replace structures we need modified only.

hw/nxagent/NXpicture.c: Shrink file, drop duplicate code that can identically be found in render/picture.c.

hw/nxagent/NXmitrap.c: Shrink file, drop duplicate code that can identically be found in render/mitrap.c.

Move matrix operations from X server to pixman 0.13.2, handle RandR transform matrices in floating point.

 Backported from X.org, inspired by:

 commit 9ffc6719390df8fdd0a5295a7a7a0eaea792be45
 Author: Keith Packard <keithp@keithp.com>
 Date:   Mon Nov 24 13:08:48 2008 -0800

    Move matrix operations from X server to pixman 0.13.2

    pixman 0.13.2 now holds all of the matrix operations. This leaves
    the protocol conversion routines and some ABI stubs in place
Signed-off-by: Keith Packard <keithp@keithp.com>

 commit c4b9ab6bf56139fdd8c7c584a6f523c6766cddd6
 Author: Keith Packard <keithp@keithp.com>
 Date:   Tue Apr 29 08:29:42 2008 -0700

    Handle transform failure when computing shadow damage area.

    PictureTransformBounds can fail, when this happens, damage the entire screen
    so that the shadow gets repainted correctly.

 commit fa6a1df209bd74da1d545982cca437afc2198cc1
 Author: Keith Packard <keithp@keithp.com>
 Date:   Fri Mar 21 02:35:28 2008 -0700

    Avoid overflow in PictureTransformPoint. Fix PictureTransformIsIdentity.

    PictureTransformPoint computes homogeneous coordinates internally, but fails
    to handle intermediate values larger than 16.16. Use 64 bit intermediate
    values while computing the final result at 16.16 and only complain if that
    result is too large.

    PictureTransformIsIdentity was completely wrong -- it was not checking for
    identity transforms at all.

 commit 49db14e4ac26070ed86088419483888dda18b603
 Author: Keith Packard <keithp@keithp.com>
 Date:   Wed Mar 19 00:46:35 2008 -0700

    Handle RandR transform matrices in floating point.

    RandR matrix computations lose too much precision in fixed point;
    computations using the inverted matrix can be as much as 10 pixels off.
    Convert them to double precision values and pass those around. These API
    changes are fairly heavyweight; the official Render interface remains fixed
    point, so the fixed point matrix comes along for the ride everywhere.

 commit 97ab0c6eff870b52c0383b63a78cec49059b2545
 Author: Keith Packard <keithp@keithp.com>
 Date:   Tue Mar 18 15:15:40 2008 -0700

    When converting from double to fixed, round carefully.

    This reduces the matrix representation error after inverting a
    transformation matrix (although it doesn't eliminate it entirely).

    Perhaps we should extend Render to include 64-bit floating point transforms...

 commit 160252d94f04acc95f0a4e0f884ff565a5aa0744
 Author: Keith Packard <keithp@keithp.com>
 Date:   Mon Mar 17 23:03:56 2008 -0700

    Add matrix inversion function (uses doubles)

    The obvious matrix inversion function, coded using doubles to avoid fiddling
    with fixed point precision adventures.

 commit ff9d1cd843a9b0aba69a3d788b21d5f6af702590
 Author: Keith Packard <keithp@keithp.com>
 Date:   Thu Mar 13 21:30:18 2008 -0700

    Add funcs to convert between protocol and pixman matrices

 commit f547650328287545a7a4d96df8d6a6c606dd95a9
 Author: Keith Packard <keithp@keithp.com>
 Date:   Thu Mar 13 14:50:13 2008 -0700

    Export a bunch of matrix operations from render.

    The render extension uses many matrix operations internally, this change
    exposes those functions to other parts of the server, drivers and
    extensions. The change is motivated by the 'transform' additions to the
    RandR extension but will likely be useful elsewhere.

 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org:

 commit acda790e430b2a18c7c35379f6e538f3d01ff221
 Author: Keith Packard <keithp@keithp.com>
 Date:   Fri Mar 14 13:46:30 2008 -0700

    [render] Split out filter finding from filter setting.

    To prepare for RandR using filters in transforms, split out
    code paths so that the RandR code can validate the filter name and
    parameters during the transform set operation so that use of the filter
    later will not have unreportable errors.

 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org:

 commit e7fae9ecc42ab5e73b89117722dbf4117d928f9a
 Author: Jamey Sharp <jamey@minilop.net>
 Date:   Sat May 22 00:26:28 2010 -0700

    Move each screen's root-window pointer into ScreenRec.

    Many references to the WindowTable array already had the corresponding
    screen pointer handy, which meant they usually looked like
    "WindowTable[pScreen->myNum]". Adding a field to ScreenRec instead of
    keeping this information in a parallel array simplifies those
    expressions, and eliminates a MAXSCREENS-sized array.

    Since dix uses this data, a screen private entry isn't appropriate.

    xf86-video-dummy currently uses WindowTable, so it needs to be updated
    to reflect this change.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
    Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)

 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

nx-X11/programs/Xserver/{hw/nxagent/NX,render/}picture.c: add and use new function ReduceCompositeOp().

More or less just an optimization for more "trivial" composite operations
requiring less work, but syncs up the newer X.Org Server and nx-libs a bit
more.

nx-X11/programs/Xserver/{hw/nxagent/NX,render/}picture.c: add and use new function ReduceCompositeOp().

More or less just an optimization for more "trivial" composite operations
requiring less work, but syncs up the newer X.Org Server and nx-libs a bit
more.

 We don't define HAVE_STDINT_H anywhere and it should be more safe using
 the system's definition of UINT32_MAX.

This is a huge mechanical patch and a few small fixups required to finish
the job. They were reviewed separately, but because the server does not
build without both pieces, I've merged them together at this time.

The mechanical changes were performed by running the included
'fix-region' script over the whole nx-X11/programs/Xserver tree:

$ cd nx-X11/programs/Xserver && ( git ls-files | grep -v '^fix-' | xargs ./fix-region; )

And then, the white space errors in the resulting patch were fixed
using the provided fix-patch-whitespace script.

$ sh ./fix-patch-whitespace

Thanks to Jamey Sharp for the mighty fine sed-generating sed script.

v1: Keith Packard <keithp@keithp.com> (X.Org xserver commit: 2dc138922b7588515d5f2447e4b9dcdc0bef15e0)
v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (apply fix-region script to nx-libs)

 In the process of building nxagent against more and more system-wide installed
 X.org libraries, we come to the limit of including structs from this (bundled
 nx-X11) and that (system-wide X.Org) library.

 This commit introduces a clear namespace separation of headers provided by
 nx-X11 and headers provided by X.Org. This approach is only temporary as we
 want to drop all nx-X11 bundled libraries from nx-libs.

 However, for a while we need to make this separation clear and also ship
 some reduced fake X.Org headers that avoid pulling in libX* and libNX_X*
 symbols at the same time.

 This patch has been tested on Debian jessie and unstable and requires no
 overall testing on various distros and distro versions, as we finally will
 drop all libNX_X* libraries and build against X.org's client libs.

 For now, this hack eases our development / cleanup process.

 This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
 is used throughout the X server for other things, and having duplicate
 names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
 Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

library clean-up: Don't build and link libXfont.a anymore. Use system's libXfont shared library and link dynamically.

Cherry-picked from branch 3.5.0.x.

Cherry-picked from branch 3.5.0.x.

This is basically a merge of the most current xorg-server (1.17.1) code
into nx-X11.

It makes sure that for source pictures, which do not have a drawable
surface, a filter is selected that is supported on the "main" and all
other screens.  Alternatively, if the requested filter is not available
on all screens and the picture is a source picture, this function fails
gracefully.

Additionally, the ChangePictureFilter hook is now called for non-source
pictures.

This also needs an implementation in mipict.{c,h}. The default hook does
nothing and returns a success value.

v2: backport to nx-libs 3.6.x (Mike DePaulo)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

Conflicts:
	render/render.c

Otherwise we may be reading outside of the client request.

v2: backport to nx-libs 3.6.x (Mike DePaulo)
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Conflicts:
	render/render.c

Summary: Imported nx-X11-3.3.0-5.tar.gz
Keywords:

Imported nx-X11-3.3.0-5.tar.gz
into Git repository

Summary: Imported nx-X11-3.2.0-2.tar.gz
Keywords:

Imported nx-X11-3.2.0-2.tar.gz
into Git repository

Summary: Imported nx-X11-3.1.0-1.tar.gz
Keywords:

Imported nx-X11-3.1.0-1.tar.gz
into Git repository