nx-libs/nx-X11/programs/Xserver/xkb/xkbtext.c, branch update-workflows

xkb: fix shadow warnings

2020-01-09T23:25:46+00:00

xkb.c: In function ‘ProcXkbSetCompatMap’: xkb.c:2601:20: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] register unsigned i,bit; ^ xkb.c:2529:23: note: shadowed declaration is here register unsigned i,bit; ^ xkb.c:2601:22: warning: declaration of ‘bit’ shadows a previous local [-Wshadow=compatible-local] register unsigned i,bit; ^~~ xkb.c:2529:25: note: shadowed declaration is here register unsigned i,bit; ^~~ Backport of this xorg upstream commit: commit 344eea237fc07dedfd733d14f95ed0ad26bb5f81 Author: Yaakov Selkowitz Date: Tue Oct 16 02:04:34 2012 -0500 xkb: fix shadow warnings Signed-off-by: Yaakov Selkowitz Reviewed-by: Peter Hutterer

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

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: 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

Xserver/dix/atom.c (et al.): Constify atom name strings.

2017-03-02T09:49:15+00:00

Inspired by X.org commits: commit 08093c25a91c07ab8af7cece9bba738b827cfd1b Author: Alan Coopersmith Date: Mon Oct 24 23:16:30 2011 -0700 Convert some malloc + strncpy pairs into strndup calls Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston commit 816b79dd061e9839cec94a4986a7820b70ca8a7f Author: Mikhail Gusarov Date: Thu May 13 03:45:21 2010 +0700 Remove useless casts Signed-off-by: Mikhail Gusarov Reviewed-by: Keith Packard This PR ships a tiny change in MakeAtom, that we adopted. We did not adopt the full commit. commit 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 Author: Alan Coopersmith Date: Mon Feb 2 19:25:14 2009 -0800 Constify atom name strings Changes MakeAtom to take a const char * and NameForAtom to return them, since many callers pass pointers to constant strings stored in read-only ELF sections. Updates in-tree callers as necessary to clear const mismatch warnings introduced by this change. Signed-off-by: Alan Coopersmith Acked-by: Peter Hutterer Backported-to-NX-by: Mike Gabriel

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

xserver: use own copy of XKBsrv.h header

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

just like upstream does