we moved the auto-disconnect feature to an own timer so there's no
need for a special treatment in screen saver stuff anymore.

  commit 424dbde891486ad6a6c00c61a334031ff18f5556
  Author: Alan Coopersmith <alan.coopersmith@oracle.com>
  Date:   Fri Dec 9 10:08:55 2011 -0800

    CheckForEmptyMask does not need to declare int n twice

    Just use the existing n variable again in the ARGB_CURSOR loop
    instead of creating another one.

    Fixes gcc -Wshadow warning:
    cursor.c: In function 'CheckForEmptyMask':
    cursor.c:155:6: warning: declaration of 'n' shadows a previous local
    cursor.c:146:9: warning: shadowed declaration is here
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

Backport of this xorg-xserver commit:

  commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5
  Author: Adam Jackson <ajax@redhat.com>
  Date:   Wed Jul 16 14:19:04 2008 -0400

    Remove the numVideoScreens xprintism.

    This was to account for cases where you had video and print screens in
    the same server.  Lunacy.  Leave the slot in ScreenInfo, but rename it,
    and stop looking at it.

reqeuestingClient was dropped with the XPRINT drop. Unfortunetely we
are usign it in Image.c. So let's introduce nxagentRequestingClient as
replacement for now.

Backport from xorg-xserver:

  commit 641ce9c706ce3cbf726fb3fc9623161bb96ba127
  Author: George Sapountzis <gsap7@yahoo.gr>
  Date:   Thu Jan 3 17:28:04 2008 +0200

    drop xprint remnants: xpstubs

DeleteWindow() is calling FreeWindowResources() which is calling
DisposeWindowOptional() which sets pWin->optional to NULL. So the now
removed code was never called. After removal DeleteWindow() is
identical to the dix version, so we use that one.

The only difference to the dix version was a fprintf if compiled with
-D TEST.

by calling the upstream function from dix/dispatch.c

remove ~80 duplicate lines

by calling upstream version from dispatch.c

instead of including it and creating NXextension.o we can simply use
the dix version. There are no NX specials anymore.

add a callback to determine the starting window.

Our version only adds some commented code, so it is not really
necessary. But it is cleaner to handle it that way.

Fixes ArcticaProject/nx-libs#825

  commit 312910b4e34215aaa50fc0c6092684d5878dc32f
  Author: Chase Douglas <chase.douglas@canonical.com>
  Date:   Wed Apr 18 11:15:40 2012 -0700

    Update currentTime in dispatch loop

    A request, like input device grabs, may check a request timestamp
    against currentTime. It is possible for currentTime to lag a previously
    sent event timestamp. If the client makes a request based on such an
    event timestamp, the request may fail the validity check against
    currentTime unless we always update the time before processing the
    request.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

We either use a solid black or a white background and no backround
pixmap. So nxagentRootTileWindow is always empty and we can drop all
stuff around it.

remove nxagentSplashCount, too, since it is no longer checked anywhere.

We either use a solid black or a white background and no backround
pixmap. So nxagentRootTileWindow is always empty and we can drop all
stuff around it.

remove nxagentSplashCount, too, since it is no longer checked anywhere.

We can only free the xkbDevicePrivate because we do not know the
details of any other (possible) extension. So let's limit to that one
private for now and call the new xkbFreePrivates from dix (where such
a function is completely missing).

This patch is not necessary at the current code level. But when xkb
code introduced the dev->key check Xorg upstream missed that. So we
backport it now to skip that trap when updating xkb code.

  Author: Alan Coopersmith <alan.coopersmith@sun.com>
  Date:   Mon Jan 4 18:21:54 2010 -0800

    CloseDevice: call XkbRemoveResourceClient before freeing key class struct

    XkbRemoveResourceClient() returns immediately if dev->key is NULL.
    CloseDevice calls XkbRemoveResourceClient until it removes all resources.

    If we free dev->key and NULL it before XkbRemoveResourceClient, then
    infinite loop ensues, and the server appears to hang on exit or crash.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

We are not using any alloc function that respects that variable, so
lets drop it. Backport of this commit:

  commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f
  Author: Adam Jackson <ajax@redhat.com>
  Date:   Fri Oct 3 16:05:19 2008 -0400

    Remove the Must_have_memory hack.

    Also remove an astonishing amount of misunderstanding of how casts work.

CheckMotion() had been commented in
add88193 as it looked identical to the
version from dix/events.c except for some commented code. But this
based (probably) on a thinko - code that had been disabled by NX
became active again this way. Fix this by removing the comments and
by adding #ifdef/else to emphasize the difference.

As done in these commits:

  commit 6583477035234e23ead2fad9db7a07e5862447a4
  Author: Nicolai Hähnle <nhaehnle@gmail.com>
  Date:   Sat May 23 13:35:24 2009 +0200

    Remove reference to non-existing requestLog and requestLogIndex

    These fields were removed in 252ec504817e05b185e4896a2d899e9c00b8aeef.
Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

  commit 252ec504817e05b185e4896a2d899e9c00b8aeef
  Author: Adam Jackson <ajax@redhat.com>
  Date:   Mon Mar 30 15:18:30 2009 -0400

    Document which bits of ClientRec are currently unused

Fixes this valgrind finding

==16977== Warning: invalid file descriptor -1 in syscall close()
==16977== Conditional jump or move depends on uninitialised value(s)
==16977==    at 0x544B6B: XkbSendNewKeyboardNotify (xkbEvents.c:62)
==16977==    by 0x540481: ProcXkbGetKbdByName (xkb.c:5330)
==16977==    by 0x4341C5: Dispatch (NXdispatch.c:482)
==16977==    by 0x40EB02: main (main.c:353)
==16977==  Uninitialised value was created by a heap allocation
==16977==    at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==16977==    by 0x431BD7: NextAvailableClient (dispatch.c:3719)
==16977==    by 0x47B297: AllocNewConnection (connection.c:821)
==16977==    by 0x47B297: EstablishNewConnections (connection.c:910)
==16977==    by 0x463DFE: ProcessWorkQueue (dixutils.c:541)
==16977==    by 0x47635E: WaitForSomething (WaitFor.c:213)
==16977==    by 0x434089: Dispatch (NXdispatch.c:360)
==16977==    by 0x40EB02: main (main.c:353)

    ... to keep dix/dixfonts and hw/nxagnet/NXdixfonts.c in sync.

so let's remove some superflous tests

Backport of this xorg upstream commit (with omitting the mentioned
d792ac125a0462a04a930af543cbc732f8cdab7d).

  commit 34cf559bcf99dad550527b5ff53f247f0e8e73ee
  Author: Keith Packard <keithp@keithp.com>
  Date:   Tue Jul 10 15:58:48 2012 -0700

    ProcGetPointerMapping uses rep.nElts before it is initialized

    In:

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

                Use C99 designated initializers in dix Replies

    the initializer for the .length element of the xGetPointerMappingReply
    structure uses the value of rep.nElts, but that won't be set until
    after this initializer runs, so we get garbage in the length element
    and clients using it will generally wedge.

    Easy to verify:

            $ xmodmap -pp

    Fixed by creating a local nElts variable and using that.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Some of them have not been seen in the wild yet.

Partly fixes ArcticaProject/nx-libs#711

 Backported from X.org's Xserver:

    commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066
    Author: Richard Hughes <richard@hughsie.com>
    Date:   Mon Aug 17 09:15:32 2009 +0100

        Do not reset lastDeviceEventTime when we do dixSaveScreens

        When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
        event time else session clients using IDLETIME will be reset.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>