aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/xkbtext.c
Commit message (Collapse)AuthorAgeFilesLines
* xkb: fix shadow warningsUlrich Sibiller2020-01-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <yselkowitz@users.sourceforge.net> Date: Tue Oct 16 02:04:34 2012 -0500 xkb: fix shadow warnings Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Lift xkb to XORG-1.2.0 stateUlrich Sibiller2018-11-091-0/+1325
|
* Lift xkb to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-281-1326/+0
| | | | | | | 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.Peter Hutterer2017-03-031-2/+2
| | | | | | | | | XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Xserver/dix/atom.c (et al.): Constify atom name strings.Mike Gabriel2017-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by X.org commits: commit 08093c25a91c07ab8af7cece9bba738b827cfd1b Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Oct 24 23:16:30 2011 -0700 Convert some malloc + strncpy pairs into strndup calls Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> commit 816b79dd061e9839cec94a4986a7820b70ca8a7f Author: Mikhail Gusarov <dottedmag@dottedmag.net> Date: Thu May 13 03:45:21 2010 +0700 Remove useless casts Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Keith Packard <keithp@keithp.com> This PR ships a tiny change in MakeAtom, that we adopted. We did not adopt the full commit. commit 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 Author: Alan Coopersmith <alan.coopersmith@sun.com> 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 <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.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-110/+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-2/+2
| | | | 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/+1437
Upstream does not use xkbfile but has own copies of the required files. It was not used elsewhere.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:46:21 +0000