nx-libs/nx-X11/programs/Xserver/xkb/maprules.c, branch 3.5.99.15 NXv3 (redistributed) https://openid.arctica-project.org/nx-libs/atom?h=3.5.99.15 2018-02-27T23:52:10+00:00 Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes only 2018-02-27T23:52:10+00:00 Ulrich Sibiller uli42@gmx.de 2018-02-27T23:52:10+00:00 urn:sha1:00e3e95e5f40de2aaf5bb920bc51a311404889fc Lift xkb to xorg-xserver-7.1/1.1.0 state 2018-02-27T23:40:45+00:00 Ulrich Sibiller uli42@gmx.de 2017-11-05T01:02:58+00:00 urn:sha1:9e6f87e20d8a9145be9faca0502b23de7809c5e4 In XORG-7_1 xkbconfig.c had been dropped. We must keep this file because it is used by hw/nxagent/Keyboard.c to load the xkb configuration file. Maybe we should move the relevant code to there or drop xkb configuration file support from nxagent. Allow options to appear with other components. 2017-12-07T06:20:55+00:00 Daniel Stone daniel@fooishbar.org 2017-12-05T21:22:55+00:00 urn:sha1:e05b90814984e65bac2dc602bc368b2046a7b92e Backported from X.Org: commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Feb 28 16:55:26 2006 +0000 Bug # 5216: Allow options to appear with other components. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de> Replace _XkbDupString with Xstrdup 2017-03-03T20:33:34+00:00 Alan Coopersmith alan.coopersmith@oracle.com 2011-02-14T05:36:03+00:00 urn:sha1:bdfb52193b5a2c5e44969b11d997ce19f0310af9 The two functions have identical semantics, including safely returning NULL when NULL is passed in (which POSIX strdup does not guarantee). Some callers could probably be adjusted to call libc strdup directly, when we know the input is non-NULL. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de> xserver: drop XKBSRV_NEED_FILE_FUNCS 2016-10-06T19:16:17+00:00 Ulrich Sibiller uli42@gmx.de 2016-09-26T20:20:45+00:00 urn:sha1:2a5364d5ff547e0a2447cbde4cd37da2fe69dece just as upstream did xserver: remove define XKB_IN_SERVER 2016-10-06T19:16:17+00:00 Ulrich Sibiller uli42@gmx.de 2016-09-26T19:32:05+00:00 urn:sha1:7c5d836c2d672a2eb84c3570d88a0d439140083d it is no longer needed because the code here is only used in the server. xserver: use own copy of XKBgeom.h header 2016-10-06T19:16:17+00:00 Ulrich Sibiller uli42@gmx.de 2016-09-26T19:12:23+00:00 urn:sha1:2fdb1add03d6e5cff06ee5d9eb4aa89b3736c66c just like upstream does xserver: use own copy of XKBstr.h header 2016-10-06T19:16:16+00:00 Ulrich Sibiller uli42@gmx.de 2016-09-26T19:03:02+00:00 urn:sha1:3b8819087e6dafa5ab537a9b8a6bce49ef0ae1a5 just like upstream does xserver: use own copy of XKBsrv.h header 2016-10-06T19:16:16+00:00 Ulrich Sibiller uli42@gmx.de 2016-09-26T18:43:23+00:00 urn:sha1:3739a9b3033ccaf139a296f8647f7c6cddc9db75 just like upstream does move xkblib to xserver 2016-09-21T16:28:22+00:00 Ulrich Sibiller uli42@gmx.de 2016-09-21T16:28:22+00:00 urn:sha1:8d4d2bc20e06ee255d2ca07b9e003b02276047c0 Upstream does not use xkbfile but has own copies of the required files. It was not used elsewhere.