NXxvdisp.c only exists to set/unset nxagentXvTrap before/after
dispatch. There's no need to duplicate the original code. We now
rename the original dispatch functions and call them in our dispatch
code.

Also drop check for sun and cygwin, as they never appeared in xorg
upstream code.

instead of having an identical copy in nxagent_miShmPutImage

instead of having an own (identical) copy

  commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d
  Author: Daniel Stone <daniel@fooishbar.org>
  Date:   Thu Jun 1 18:47:47 2006 +0000

    Die XTESTEXT1, die!

Citing an email from the xorg-modular mailing list:

On Tuesday 21 February 2006 23:04, Enrico Weigelt wrote:
> Hi folks,
>
> I'm wondering what's the difference between XTEST and XTESTEXT1
> (the second one can be configured w/ my current patch ...)
> Are they both the same ( -> XTest extension ) ?
> Can I put both symbols together ?

They're not the same extension.  XTest is the one you want, if you want
either.  The other hasn't been built by default in ages and I should probably
go ahead and nuke it from the tree.

- ajax

  commit cdf5bcd420e5bcf4a4a24a275d3133a4e16ce41e
  Author: Alan Coopersmith <alan.coopersmith@oracle.com>
  Date:   Mon Jul 9 19:12:42 2012 -0700

    Use calloc to zero fill buffers being allocated for replies & events

    Ensures padding bytes are zero-filled
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>

Attributes ArcticaProject/nx-libs#382

 Backported from X.org's Xserver:

    commit c1d901d723c3bee523736eacc15b44a7dff484fe
    Author: Richard Hughes <richard@hughsie.com>
    Date:   Fri Aug 14 11:44:35 2009 +0100

        Don't reset the lastDeviceEventTime when doing DPMS actions

        When we change the DPMS mode, don't play games with the last event time as
        this breaks applications using IDLETIME to turn the backlight off after a
        preset time.

        This patch fixes gnome-power-manager and xfce-power-manager
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 This resolves issues with non-starting mate-screensaver which
 relies on the IDLETIME API these days.

 This commit backports the following X.org Xserver commits:

    commit a2e67a6412386782cb8b644b86a5744591397d45
    Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
    Date:   Mon Dec 6 11:24:01 2010 +1100

        IDLETIME: Fix edge-case in IdleTimeBlockHandler

        Ensure that if we're called exactly on the threshold of a
        NegativeTransition trigger that we reshedule to pick up
        an idle time over the threshold.
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

    commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
    Author: Adam Jackson <ajax@redhat.com>
    Date:   Wed Dec 10 16:13:20 2008 -0500

        xsync: Fix wakeup storm in idletime counter.

        Wakeup scheduling only considered the threshold values, and not whether
        the trigger was edge or level.

        See also:
        https://bugzilla.redhat.com/show_bug.cgi?id=474586
        http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup

    commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7
    Author: Fredrik Höglund <fredrik@kde.org>
    Date:   Tue Aug 14 22:47:49 2007 +0200

        Fix the value comparisons in the IDLETIME wakeup handler.

        LessThan/GreaterThan comparisons were used in the wakeup handler,
        and LessOrEqual/GreaterOrEqual in the block handler.

        Change it to use LessOrEqual/GreaterOrEqual in both functions,
        since this is what XSyncNegativeComparison and
        XSyncPositiveComparison imply.

    commit 7e2c935920cafadbd87c351f1a3239932864fb90
    Author: Fredrik Höglund <fredrik@kde.org>
    Date:   Fri May 18 20:06:14 2007 +0200

        Add a new IDLETIME system sync counter.

        This counter exposes the time in milliseconds since the last
        input event. Clients such as screen savers and power managers
        can set an alarm on this counter to find out when the idle time
        reaches a certain value, without having to poll the server.
Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 commit cad5a1050b7184d828aef9c1dd151c3ab649d37e
 Author: Nathan Kidd <nkidd@opentext.com>
 Date:   Fri Jan 9 09:57:23 2015 -0500

    Unvalidated lengths

    v2: Add overflow check and remove unnecessary check (Julien Cristau)

    This addresses:
    CVE-2017-12184 in XINERAMA
    CVE-2017-12185 in MIT-SCREEN-SAVER
    CVE-2017-12186 in X-Resource
    CVE-2017-12187 in RENDER
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Fix XSERVER64 should be _XSERVER64

It also reintroduces a missed hack (undocumented commandline switch
-disablexineramaextension to fool clients into thinking that Xinerama
is disabled even though it is not).

That hack had been dropped in d26930d5 intentionally.

Got dropped by accident in 9bc6ff26

Fixes ArcticaProject/nx-libs#589

as reported by valgrind

Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually header I was searching for.

nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode via the _SHAPE_SERVER_ macro.

nx-X11/programs/Xserver/Xext/shape.c: pull in shapestr.h for legacy Xext proto versions, since shape.h would pull in Xlib.

Legacy Xext proto versions are automatically detected by the main
Makefile.

 - Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to
   Imake.tmpl.
 - Add FONT_DEFINES to ALLDEFINES.
 - Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles
   again, FONT_DEFINES is now set "globally".
 - Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv
   to make gccmakedep happy.

 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>

 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>

 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>

 Backported from X.org

 commit ff8e3ad8074cd2c8bed49b39c40c2b4892118270
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Thu Sep 20 13:16:59 2012 -0400

    dix: Pull client-is-local flag up to the ClientRec
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org:

 commit 6178b1c91cfc9e860914acc6f0be2f2d2e07a124
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Tue Jun 7 15:52:11 2016 -0400

    dix: Use OsSignal() not signal()

    As the man page for the latter states:

        The effects of signal() in a multithreaded process are unspecified.

    We already have an interface to call sigaction() instead, use it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>

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

    Remove non-smart scheduler. Don't require setitimer.

    This allows the server to call GetTimeInMillis() after each request is
    processed to avoid needing setitimer. -dumbSched now turns off the
    setitimer.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

 commit 1f915e8b524dd02011158aa038935970684c7630
 Author: Daniel Drake <drake@endlessm.com>
 Date:   Wed May 20 13:16:12 2015 -0600

    Keep SIGALRM restart flag after Popen

    Commit 94ab7455 added SA_RESTART to the SIGALRM handler.  However, the
    Popen code tears down and recreates the SIGALRM handler via OsSignal(),
    and this flag is dropped at this time.

    Clean the code to use just a single codepath for creating this signal
    handler, always applying SA_RESTART.

    [ajax: Fixed commit id]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Drake <drake@endlessm.com>

 commit 94ab7455abc213fc96760e29ab2e943ec682fb22
 Author: Daniel Drake <drake@endlessm.com>
 Date:   Tue May 12 16:39:22 2015 -0600

    Allow system call restarts upon signal interruption

    The X server frequently deals with SIGIO and SIGALRM interruptions.
    If process execution is inside certain blocking system calls
    when these signals arrive, e.g. with the kernel blocked on
    a contended semaphore, the system calls will be interrupted.

    Some system calls are automatically restartable (the kernel re-executes
    them with the same parameters once the signal handler returns) but
    only if the signal handler allows it.

    Set SA_RESTART on the signal handlers to enable this convenient
    behaviour.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Drake <drake@endlessm.com>

 commit a6c71ce5d2d2fe89e07a2ef5041c915acc3dc686
 Author: Tiago Vignatti <tiago.vignatti@nokia.com>
 Date:   Mon Mar 28 19:21:28 2011 +0300

    os: fix memory and fd leaks in Popen
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>

 commit c9051b684b524549eab6d5b88ee3e195a6f6fbe8
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Nov 5 18:25:57 2008 -0800

    Use OsSignal in Popen/Pclose to avoid SysV signal() stupidity

 commit 0e9ef65fa583bf2393dd0fda82df6f092387b425
 Author: Keith Packard <keithp@koto.keithp.com>
 Date:   Wed Nov 7 16:33:10 2007 -0800

    Don't frob timers unless SmartSchedule is running

 commit 2338d5c9914e2a43c3a4f7ee0f4355ad0a1ad9e7
 Author: Arjan van de Ven <arjan@linux.intel.com>
 Date:   Sun Oct 28 09:37:52 2007 +0100

    reduce wakeups from smart scheduler

    The smart scheduler itimer currently always fires after each request
    (which in turn causes the CPU to wake out of idle, burning precious
    power). Rather than doing this, just stop the timer before going into
    the select() portion of the WaitFor loop. It's a cheap system call, and
    it will only get called if there's no more commands batched up from the
    active fd.

    This change also allows some of the functions to be simplified;
    setitimer() will only fail if it's passed invalid data, and we don't do
    that... so make it void and remove all the conditional code that deals
    with failure.

    The change also allows us to remove a few variables that were used for
    housekeeping between the signal handler and the main loop.
Signed-off-by: Keith Packard <keithp@koto.keithp.com>

 **Note**: The above change also required ABI changes in hw/nxagent/.

 commit abe0a51f3f790f8c055289465e130177c4b647cc
 Author: Ben Byer <bbyer@bbyer.apple.com>
 Date:   Fri Sep 21 17:07:36 2007 -0700

    So, like, checking return codes of system calls (signal, etc) is good.
    Also, only restore an old signal handler if one was actually set
    (prevents the server from dying on OS X).

 commit 6da39c67905500ab2db00a45cda4a9f756cdde96
 Author: Eric Anholt <eric@anholt.net>
 Date:   Wed Sep 12 13:23:13 2007 +0000

    Fix build on FreeBSD after Popen changes.

 commit a5b8053606d6e786cdcf6734f271acc05f9cc588
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Tue Sep 11 11:37:06 2007 -0400

    Ignore - not just block - SIGALRM around Popen()/Pclose().

    Because our "popen" implementation uses stdio, and because nobody's stdio
    library is capable of surviving signals, we need to make absolutely sure
    that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
    open a menu in openoffice, and it recompiles XKB to deal with the
    accelerators, and you popen xkbcomp because we suck, then the scheduler
    will tell you you're taking forever doing something stupid, and the
    wait() code will get confused, and input will hang and your CPU usage
    slams to 100%.  Down, not across.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

xf86bigfont.c: In function ‘ProcXF86BigfontQueryFont’:
xf86bigfont.c:724:9: warning: ‘pDesc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
      if (!pDesc) free(pCI);

This is basically a backport of the following commits + replacing
xalloc/xfree by malloc/free. Fixes ArcticaProject/nx-libs#358.

   commit 2761c103311a1160bc483fd0367d654733df8598
   Author: Daniel Stone <daniel@fooishbar.org>
   Date:   Mon Nov 5 14:03:26 2007 +0000

       OS: Remove usage of alloca

       Replace with heap allocations.

   commit 5e363500c86042c394595e1a6633581eb8fcd1bb
   Author: Daniel Stone <daniel@fooishbar.org>
   Date:   Mon Nov 5 14:38:28 2007 +0000

       OS: Remove ALLOCATE_LOCAL from os.h

       Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and
       remove the include of Xalloca.h as well.

This is basically a backport of the following commits + replacing
xalloc/xfree by malloc/free. Fixes ArcticaProject/nx-libs#358.

   commit 2761c103311a1160bc483fd0367d654733df8598
   Author: Daniel Stone <daniel@fooishbar.org>
   Date:   Mon Nov 5 14:03:26 2007 +0000

       OS: Remove usage of alloca

       Replace with heap allocations.

   commit 5e363500c86042c394595e1a6633581eb8fcd1bb
   Author: Daniel Stone <daniel@fooishbar.org>
   Date:   Mon Nov 5 14:38:28 2007 +0000

       OS: Remove ALLOCATE_LOCAL from os.h

       Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and
       remove the include of Xalloca.h as well.

Xserver/Xext/shmint.h: Provide header file exporting ShmRegisterFunc and ShmRegisterFbFuncs (plus ShmSetPixmapFormat as a by-product).

 commit 9ceffb6b92e55f0d74d71489900d43940f14dfd9
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Wed Dec 28 10:37:17 2005 +0000

    Merge from xserver a header for shm's server internal functions, which are
        called by DDXes. Desired by XGL, and should be used in other locations,
        probably.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Inspired by X.org commits:

 commit 08093c25a91c07ab8af7cece9bba738b827cfd1b
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Oct 24 23:16:30 2011 -0700

    Convert some malloc + strncpy pairs into strndup calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>

 commit 816b79dd061e9839cec94a4986a7820b70ca8a7f
 Author: Mikhail Gusarov <dottedmag@dottedmag.net>
 Date:   Thu May 13 03:45:21 2010 +0700

    Remove useless casts
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Keith Packard <keithp@keithp.com>

 This PR ships a tiny change in MakeAtom, that we adopted.
 We did not adopt the full commit.

 commit 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Feb 2 19:25:14 2009 -0800

    Constify atom name strings

    Changes MakeAtom to take a const char * and NameForAtom to return them,
    since many callers pass pointers to constant strings stored in read-only
    ELF sections.   Updates in-tree callers as necessary to clear const
    mismatch warnings introduced by this change.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org:

 commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Dec 14 14:45:42 2006 -0500

    Naming change: Security*Access -> Dix*Access
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Fixes ArcticaProject/nx-libs#272.

 Fixes ArcticaProject/nx-libs#271.