Backported from X.org:

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

    os: Add NotifyFd interfaces

    This provides a callback-based interface to monitor file
    descriptors beyond the usual client and device interfaces.

    Modules within the server using file descriptors for reading and/or
    writing can call

        Bool SetNotifyFd(int fd, NotifyFdProcPtr notify_fd, int mask, void *data);

    mask can be any combination of X_NOTIFY_READ and X_NOTIFY_WRITE.

    When 'fd' becomes readable or writable, the notify_fd function will be
    called with the 'fd', the ready conditions and 'data' values as arguments,

    When the module no longer needs to monitor the fd, it will call

        void RemoveNotifyFd(int fd);

    RemoveNotifyFd may be called from the notify function.
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>

 Backported from X.org:

 commit db1089eafc1c5371fa0030202de588d2e2b4f8e5
 Author: Keith Packard <keithp@keithp.com>
 Date:   Mon Sep 21 07:16:17 2015 +0100

    os/xdmcp: Just send XDMCP keepalive packets once every three minutes

    There was a complicated scheme to increase the time between keepalives
    from 3 minutes up to as much as 24 hours in an attempt to reduce
    network traffic from idle X terminals. X terminals receiving X
    traffic, or receiving user input would use the 3 minute value; X
    terminals without any network traffic would use a longer value.

    However, this was actually broken -- any activity in the X server,
    either client requests or user input, would end up resetting the
    keepalive timeout, so a user mashing on the keyboard would never
    discover that the XDMCP master had disappeared and have the session
    terminated, which was precisely the design goal of the XDMCP keepalive
    mechanism.

    Instead of attempting to fix this, accept the cost of a pair of XDMCP
    packets once every three minutes and just perform keepalives
    regularly.

    This will also make reworking the block and wakeup handler APIs to
    eliminate select masks easier.
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>

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

Default is ctrl-alt-k

Do not use map before calling parse_keystroke_file() since it will malloc map.

Correctly use constant for unused structs instead of implicitly
setting it through calloc().

Unclear why they have been merged at all.

Code could not distinguish between ctrl-alt-shift and ctrl-alt.

Fixes ArcticaProject/nx-libs#395

Both use the same keystroke 'f' (with different modifiers) for a very
similar function.

We have defined them, so use them!

for better readability

code cleanup

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

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

cursor.c: In function ‘TestForCursorName’:
cursor.c:649:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
     return (pCursor->name == (Atom) closure);
                              ^
cursor.c: In function ‘ProcXFixesChangeCursorByName’:
cursor.c:665:45: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
  ReplaceCursor (pSource, TestForCursorName, (void *) name);
                                             ^

Backport of

   commit 019ad5acd20e34dc2aa3b89cc426138db5164c48
   Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
   Date:   Tue Feb 5 15:44:41 2008 -0500

       XFixes: squash a pointer/integer size mismatch warning.

cursor.c: In function ‘ProcXFixesGetCursorName’:
cursor.c:399:6: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
  str = NameForAtom (pCursor->name);
      ^
cursor.c: In function ‘ProcXFixesGetCursorImageAndName’:
cursor.c:453:10: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
     name = pCursor->name ? NameForAtom (pCursor->name) : "";
          ^

Fixes

filter.c: In function ‘SetPicturePictFilter’:
filter.c:363:5: warning: ‘return’ with no value, in function returning non-void [enabled by default]
     return ;
     ^

record.c: In function ‘RecordAReply’:
record.c:714:7: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default]
       pri->replyData, pri->dataLenBytes, /* continuation */ -1);
       ^
record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’
 RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient,
 ^
record.c:724:10: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default]
          pri->replyData, pri->dataLenBytes, pri->bytesRemaining);
          ^
record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’
 RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient,
 ^
record.c:746:5: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default]
     pri->dataLenBytes, pri->bytesRemaining);
     ^
record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’
 RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient,
 ^

fbtrap.c: In function ‘fbRasterizeTrapezoid’:
fbtrap.c:113:12: warning: variable ‘x_off_fixed’ set but not used [-Wunused-but-set-variable]
     xFixed x_off_fixed;

devices.c: In function ‘_AddInputDevice’:
devices.c:120:22: warning: assignment from incompatible pointer type [enabled by default]
     dev->devPrivates = dev->unwrapProc = NULL;