Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x

Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120

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/NXdixfonts.c: Shrink file, drop duplicate code that can identically be found in dix/dixfonts.c. Also remove NX'ish code from dix/dixfonts.c.

hw/nxagent/NXdispatch.c: Shrink file, drop duplicate code that can identically be found in dix/dispatch.c.

hw/nxagent/NXproperty.c: Shrink file, drop duplicate code that can identically be found in dix/property.c.

hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically be found in Xext/xvdisp.c.

hw/nxagent/NXevents.c: Shrink file, drop duplicate code that can identically be found in dix/events.c.

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

hw/nxagent/NXglyphcurs.c: Shrink file, drop duplicate code that can identically be found in dix/glyphcurs.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.

NXrenderint.h: Move into subfolder X11/include/ and rename to Xrender_nxagent.h. (Like we have done with all other non-public Xlib related header files that are required for building nxagent.

hw/nxagent/NXresource.c: Shrink file, drop duplicate code that can identically be found in dix/resource.c.

Xserver/dix/window.c: Don't reintroduce build warnings with previous commit due to now-unnecessary assignements of pScreen pointers.

hw/nxagent/NXwindow.c: Shrink file, drop duplicate code that can identically be found in dix/window.c.

hw/nxagent/NXglxext.c: Shrink file, drop duplicate code that can identically be found in GL/glx/glxext.c.

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

hw/nxagent/NXmiexpose.c: Shrink file, drop duplicate code that can identically be found in mi/miexpose.c.

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

Reasoning:

(1) The diff between this file and mi/miwindow.c is so minimal, we simply
apply the change to mi/miwindow.c.

(2) In recent X.org, the fixed code has gone, so this patch won't exist
after having rebased nx-libs against X.org.

hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically be found in miext/damage/damage.c.

NXcomposite.h: Move fake header file NXcomposite.h to hw/nxagent/X11/include/ and drop all symbols that are not explicitly used by nxagent.

Xserver/hw/nxagent: Drop NXcompositeext.h, it is a duplicate of nx-X11/include/extensions/composite.h.

hw/nxagent/NXextension.c: Shrink file, drop duplicate code that is indentically found in dix/extension.c.

Attributes GH PR #156: https://github.com/ArcticaProject/nx-libs/pull/156

To allow for suspend/resume NX has changed _XReadEvents() and
_XIOError(). _XIOError() does not simply exit but returns. And
_XReadEvents() returns after _XIOError(). But as the original
_XReadEvents() is supposed to block until at least one event is there
calling functions are not prepared for situations where no event is
available. These calling functions have to check that condition.,

Some of the calling functions already had that check but the
UnlockDisplay() call was missing.

Fixes https://github.com/ArcticaProject/nx-libs/issues/118

Attributes GH PR #154: https://github.com/ArcticaProject/nx-libs/pull/154

arting with '#' will be ignored, and an empty message aborts

To allow for suspend/resume NX has changed _XReadEvents() and
_XIOError(). _XIOError() does not simply exit but returns. And
_XReadEvents() returns after _XIOError(). But as the original
_XReadEvents() is supposed to block until at least one event is there
calling functions are not prepared for situations where no event is
available. These calling functions have to check that condition.,

Some of the calling functions already had that check but the
UnlockDisplay() call was missing.

Fixes https://github.com/ArcticaProject/nx-libs/issues/118

Attributes GH PR #137: https://github.com/ArcticaProject/nx-libs/pull/137
Reviewed by: Ulrich Sibiller <uli42@gmx.de>  -- Mon, 20 Jun 2016 12:40:52 -0700