aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/maprules.c
Commit message (Collapse)AuthorAgeFilesLines
* Lift xkb to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-281-6/+10
| | | | | | | 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.Daniel Stone2017-12-071-7/+0
| | | | | | | | | | | | 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 XstrdupAlan Coopersmith2017-03-031-20/+20
| | | | | | | | | | | | | 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_FUNCSUlrich Sibiller2016-10-061-1/+0
| | | | just as upstream did
* xserver: remove define XKB_IN_SERVERUlrich Sibiller2016-10-061-144/+0
| | | | it is no longer needed because the code here is only used in the server.
* xserver: use own copy of XKBgeom.h headerUlrich Sibiller2016-10-061-1/+1
| | | | just like upstream does
* xserver: use own copy of XKBstr.h headerUlrich Sibiller2016-10-061-1/+1
| | | | just like upstream does
* xserver: use own copy of XKBsrv.h headerUlrich Sibiller2016-10-061-1/+1
| | | | just like upstream does
* move xkblib to xserverUlrich Sibiller2016-09-211-0/+1479
Upstream does not use xkbfile but has own copies of the required files. It was not used elsewhere.