aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/xkmread.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>
* xkmread.c: fix compiler warningUlrich Sibiller2019-06-221-0/+4
| | | | | | xkmread.c: In function ‘XkmReadFileSectionName’: xkmread.c:1181:25: warning: ‘tmpTOC.type’ may be used uninitialized in this function [-Wmaybe-uninitialized] XkbConfigText(tmpTOC.type,XkbMessage),0);
* XKB: Remove a bunch of mad ifdefsUlrich Sibiller2019-06-221-14/+2
| | | | | | | | | | | commit 534fc5140b039a8c98ab715d0a6740d513b41209 Author: Daniel Stone <daniel@fooishbar.org> Date: Sun Feb 3 23:30:22 2008 +1100 XKB: Remove a bunch of mad ifdefs We have SEEK_SET and size_t, seriously. Also use DebugF instead of ifdef DEBUG, and ditch a couple of random bits that were never used.
* Lift xkb to XORG-1.2.0 stateUlrich Sibiller2018-11-091-84/+10
|
* Removal of dead code in Xserver/xkb. Follow-up commit for 3739a9b.Mike Gabriel2018-07-031-12/+0
| | | | | | | | | | | | | | | | | | Spotted in and backported from X.org: commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d Author: Adam Jackson <ajax@benzedrine.nwnk.net> Date: Sun Mar 18 16:31:19 2007 -0400 Static markup and dead code cull over xkb/. The former <X11/extensions/XKBsrv.h> has been pulled into the server now as include/xkbsrv.h, and the world updated to look for it in the new place, since it made no sense to define server API in an extension header. Any further work along this line will need to do similar things with XKBgeom.h and friends. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-281-2/+0
|
* Lift xkb to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-281-12/+84
| | | | | | | 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.
* Replace _XkbDupString with XstrdupAlan Coopersmith2017-03-031-18/+5
| | | | | | | | | | | | | 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>
* xkmread.c: use _X_UNUSED to avoid compiler warning when result is not neededUlrich Sibiller2016-10-201-4/+7
|
* xserver: adapt xkbsrc includes syntax to match upstreamUlrich Sibiller2016-10-061-1/+1
|
* xserver: drop XKBSRV_NEED_FILE_FUNCSUlrich Sibiller2016-10-061-1/+0
| | | | just as upstream did
* xserver: remove define XKB_IN_SERVERUlrich Sibiller2016-10-061-14/+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/+1312
Upstream does not use xkbfile but has own copies of the required files. It was not used elsewhere.