Merge branch 'sunweaver-pr/use-xgetkeyboardMapping-instead-of-deprecated-xkeycodetokeysym' into 3.6.x

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

Reviewed by: Ulrich Sibiller <uli42@gmx.de>  -- Fri, 17 Feb 2017 06:49:03 -0800