nx-libs/nx-X11/programs/Xserver/xkb/xkbfmisc.c, branch 3.6.x

Lift xkb to XORG-1.2.0 state

2018-11-09T14:31:57+00:00

Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes only

2018-02-27T23:52:10+00:00

Lift xkb to xorg-xserver-7.1/1.1.0 state

2018-02-27T23:40:45+00:00

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.

xkb: add missing const

2017-03-03T20:45:26+00:00

this was missing from the backport of 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 (Constify atom name strings)

xkb: remove XkbAtomGetString, replace with NameForAtom.

2017-03-03T20:33:34+00:00

XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything. Signed-off-by: Peter Hutterer Reviewed-by: Fernando Carrijo Signed-off-by: Keith Packard Backported-to-NX-by: Ulrich Sibiller

Replace _XkbDupString with Xstrdup

2017-03-03T20:33:34+00:00

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 Signed-off-by: Peter Hutterer Reviewed-by: Daniel Stone Backported-to-NX-by: Ulrich Sibiller

xserver: drop XKBSRV_NEED_FILE_FUNCS

2016-10-06T19:16:17+00:00

just as upstream did

xserver: remove define XKB_IN_SERVER

2016-10-06T19:16:17+00:00

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

just like upstream does

xserver: use own copy of XKBstr.h header

2016-10-06T19:16:16+00:00

just like upstream does