nx-libs/nx-X11/programs/Xserver/xkb, branch 3.5.99.7

Clearing comments from $XFree86$ (et al.) header lines.

2017-04-19T11:08:45+00:00

xkb: Allow NULL as rulesFile in XkbSetRulesDflts.

2017-03-07T22:50:38+00:00

If no rules file is given, simply re-use the previous one. If no RF is given the first time this function is called, use the built-in default. This includes fixing the built-in default to something that actually exists. Signed-off-by: Peter Hutterer Backported-to-NX-by: Ulrich Sibiller Fixes ArcticaProject/nx-libs#371

replace (DE)ALLOCATE_LOCAL by malloc/free

2017-03-03T21:44:44+00:00

This is basically a backport of the following commits + replacing xalloc/xfree by malloc/free. Fixes ArcticaProject/nx-libs#358. commit 2761c103311a1160bc483fd0367d654733df8598 Author: Daniel Stone Date: Mon Nov 5 14:03:26 2007 +0000 OS: Remove usage of alloca Replace with heap allocations. commit 5e363500c86042c394595e1a6633581eb8fcd1bb Author: Daniel Stone Date: Mon Nov 5 14:38:28 2007 +0000 OS: Remove ALLOCATE_LOCAL from os.h Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and remove the include of Xalloca.h as well.

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

drop platform support: unifdef sgi.

2017-02-08T21:40:47+00:00

Relates to ArcticaProject/nx-libs#275.

drop platform support: unifdef QNX.

2017-02-08T21:40:47+00:00

Relates to ArcticaProject/nx-libs#275.

drop platform support: unifdef osf.

2017-02-08T21:40:47+00:00

Fixes ArcticaProject/nx-libs#288.

nx-libs/nx-X11/programs/Xserver/xkb, branch 3.5.99.7

Clearing comments from $XFree86$ (et al.) header lines.

xkb: Allow NULL as rulesFile in XkbSetRulesDflts.

replace (DE)ALLOCATE_LOCAL by malloc/free

xkb: add missing const

xkb: remove XkbAtomGetString, replace with NameForAtom.

Replace _XkbDupString with Xstrdup

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

drop platform support: unifdef sgi.

drop platform support: unifdef QNX.

drop platform support: unifdef __osf__.

drop platform support: unifdef osf.