Backported from X.org:

 commit f2e310132fbe1520c1b5f3da4faa2d2d47835e72
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Wed Oct 31 14:15:35 2007 -0700

    Add CreatePixmap allocation hints.

    These hints allow an acceleration architecture to optimize allocation of certain
    types of pixmaps, such as pixmaps that will serve as backing pixmaps for
    redirected windows.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

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

Makefile: Tell Xserver build which Xfont API to use (v2 or v1) depending on what's available in the build env.

 Fixes ArcticaProject/nx-libs#296.

 Inspired by the following X.org commit. Other than X.org, we will continue
 support for building nx-libs against libXfont1 for a while.

 commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7
 Author: Keith Packard <keithp@keithp.com>
 Date:   Tue Sep 1 18:50:55 2015 -0700

    dix: Switch to the libXfont2 API (v2)

    This new libXfont API eliminates exposing internal X server symbols to
    the font library, replacing those with a struct full of the entire API
    needed to use that library.

    v2: Use libXfont2 instead of libXfont_2
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>

 Backported from X.org:

 commit 21ceae9002c6364deb3d074cf2da7d3864cf6879
 Author: Jamey Sharp <jamey@minilop.net>
 Date:   Tue May 11 10:24:00 2010 -0700

    SetFontPath: set client->errorValue on failure.

    Previously the callers were only setting errorValue on Success, when
    it's ignored, and leaving it alone on failure, when it's sent to the
    client.

    Since SetFontPath takes the ClientPtr, let it set client->errorValue
    instead of letting the callers continue to get it wrong.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org:

 commit 7e9e01a4a34fa45521067d43c5bbff942dd5d51a
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Wed Oct 10 17:40:22 2007 -0400

    dix: pass a valid ClientPtr to SetFontPath in all cases.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

hw/nxagent/BitmapUtils.c: Derive from utilbitmap.c in deprecated libXfont1 and ship as copy-of-code with nxagent.

 Backport from X.org:

 commit 91ea0965dd4dfeba0a914c47ad4a64768e983b1b
 Author: Keith Packard <keithp@keithp.com>
 Date:   Wed Nov 11 22:02:04 2015 -0800

    dix: Move InitFonts up above screen initialization

    Font initialization was split into two stages, the first was to set up
    font privates with a call to ResetFontPrivateIndex, then much later
    the call to InitFonts to set up all of the FPEs. Doing the full font
    initialization before initializing the video drivers means that we can
    move the call to ResetFontPrivateIndex inside InitFonts.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Xserver/Imakefile: Improve readability by introducing the NULL variable and adding more line-breaks.

Revert "regression fix for 52872a0d: Keep index parameter in AddScreen() for now. Requires proper ABI backport. (was: copy+paste error)."

This reverts commit 34275825.

 Other than stated in the original commit msg, both regressions are
 related to inproper rebasing of two pull requests touch the same code
 portion.

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

 Extracted from X.org bulk commit:

 commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue Jun 5 13:22:18 2012 +0100

    api: rework the X server driver API to avoid global arrays.

    This is a squash merge containing all the API changes, as
    well as the video ABI bump.

    Its been squashed to make bisection easier.

    Full patch log below:

    [...]

    commit 06729dbbc804a20242e6499f446acb5d94023c3c
    Author: Dave Airlie <airlied@gmail.com>
    Date:   Tue Apr 10 14:04:59 2012 +0100

        xserver: remove index from CloseScreen (API/ABI breakage)

        This drops the index from the CloseScreen callback,
        its always been useless really, since the pScreen contains it.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

 Fixes ArcticaProject/nx-libs#98.

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

Reviewed by: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  -- Fri, 07 Apr 2017 10:24:05 +0200

Backported from X.Org:

commit 0801afbd7c2c644c672b37f8463f1a0cbadebd2e
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date:   Thu Feb 10 15:35:14 2011 +0200

    record: avoid crash when calling RecordFlushReplyBuffer recursively

    RecordFlushReplyBuffer can call itself recursively through
    WriteClient->CallCallbacks->_CallCallbacks->RecordFlushAllContexts
    when the recording client's buffer cannot be completely emptied in one
    WriteClient. When a such a recursion occurs, it will not be broken out
    of which results in segmentation fault when the stack is exhausted.

    This patch adds a counter (a flag, really) that guards against this
    situation, to break out of the recursion.

    One alternative to this change would be to change _CallCallbacks to
    check the corresponding counter before the callback loop, but that
    might affect existing behavior, which may be relied upon.
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>

Fixes: ArcticaProject/nx-libs#417.

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

roll-tarball.sh: Fix ChangeLog creation, always create ChangeLog for the CHECKOUT, not the currently checked out branch.

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

The are now called reflecting their purpose:
viewport_scroll_left/up/right/down. This also regroups all the
keystrokes referring to viewport stuff.

Normal builds will not contain support for some keystrokes but warn
about unknown keystroke actions:

Info: ignoring unknown keystroke action 'debug_tree'.
Info: ignoring unknown keystroke action 'regions_on_screen'.
Info: ignoring unknown keystroke action 'test_input'.
Info: ignoring unknown keystroke action 'deactivate_input_devices_grab'.

So we remove those from the default keystrokes config.

no more late initialization

Some of the keystroke checks have used them before. This commit
unifies those checks.

Print out more/better messages.

there's no need to define the values ourselves

We cannot check if an action is defined twice because the viewport
stuff is controlled by multiple keystrokes (arrow keys and keypad) in
the default configuration.

instead of KEYSTROKE_END_MARKER. This is cleaner since
KEYSTROKE_END_MARKER really marks the end of the list.