NXxvdisp.c: In function 'ProcXvDispatch':
 NXxvdisp.c:96:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
          else
          ^~~~
 NXxvdisp.c:99:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
              break;
              ^~~~~
 NXxvdisp.c:104:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
          else
          ^~~~
 NXxvdisp.c:107:10: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
           break;
           ^~~~~
 NXxvdisp.c:118:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
   else
   ^~~~
 NXxvdisp.c:121:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
              break;
              ^~~~~
 NXxvdisp.c:126:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
   else
   ^~~~
 NXxvdisp.c:129:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
              break;
              ^~~~~
 NXxvdisp.c:137:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
   else
   ^~~~
 NXxvdisp.c:140:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
              break;
              ^~~~~
 NXxvdisp.c:146:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
   else
   ^~~~
 NXxvdisp.c:149:6: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
       break;
       ^~~~~

 NXdispatch.c: In function 'Dispatch':
 NXdispatch.c:309:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
     if (!(dispatchException & DE_TERMINATE))
     ^~
 NXdispatch.c:312:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
       while (!dispatchException)
       ^~~~~

 chgfctl.c: In function 'ChangeKbdFeedback':
 chgfctl.c:359:6: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
       else
       ^~~~
 chgfctl.c:361:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
    kctrl.autoRepeats[inx] =
    ^~~~~

Fixes ArcticaProject/nx-libs#516.

debian/control: All Priority: extras packages are required to be changed to Priority: optional by recent Debian Policy.

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

nxagentInitKeyboardState -> nxagentInitXkbKeyboardState
nxagentHandleKeyboardEvent -> nxagentHandleXkbKeyboardStateEvent

If xorg upstream xkb gets extended one day the previous code would not
block new xkb calls even if they would change keyboard settings. So
only act on the currently known calls and throw an error for all
unknown calls.

Fixes ArcticaProject/nx-libs#257

This helps understanding the intention of the following code.

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

this ensures that randr updates its private structures

If -rrxinerama was specified xrandr handling was broken. Adding/using
a custom resolution via xrandr was not working anymore.

Fixes: ArcticaProject/nx-libs#596

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

Fixes ArcticaProject/nx-libs#530

Fixes this:

CXX      Loop.lo
Loop.cpp: In function 'void handleCheckResultInLoop(int&, int&, int&, fd_set&, fd_set&, timeval&, timeval&)':
Loop.cpp:14080:68: warning: declaration of 'startTs' shadows a global declaration [-Wshadow]
                                             struct timeval &startTs)
                                                                    ^
Loop.cpp:1020:13: note: shadowed declaration is here
T_timestamp startTs;

Fixes ArcticaProject/nx-libs#545

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

Code was here twice and could be simply merged.

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

Reviewed+approved by Mihai Moldovan (via IRC): 2017-12-11:

```
  09:38 < Ionic> okay
  09:38 < Ionic> in that case it's probably really best to drop it completely
```

Xserver/os/xprintf.c: Drop NoMachine's own implementation of Xvasprintf(). Use stock implementation instead.

 * Reason from NoMachine's NX CHANGELOG for having its own implementation
   of Xvasprintf() (from around nxagent 3.3.0):

    - Fixed TR06G02225. The implementation of Xvprintf() has been reviewed
      to work on more platforms. Previous implementation caused a failure
      in the build of keyboard map on some platform like Solaris 8 and 9.
    - Fixed TR03G02198. Reimplemented Xvprintf() in Xserver/os to handle
      the case in which vsnprintf returned -1.

 * Reason for removing it again:

    - Fixes segfaults in SetDefaultFontPath when launching nxagent.
    - All locations in Xserver/** using the code check for return value
      of -1.
    - Solaris 8 and 9 are beyond of our support scope.
    - Keep more in sync with X.org.
    - Good moment to drop more GPL-2 code from Xserver's code base.

nx-X11/programs/Xserver/os/xprintf.c: remove doubly-defined Xscnprintf function, add missing header includes.

Fix up for 1e3a9748, which has been
faulty in this regard.