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>

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>

Because of validateString being a macro NameForAtom was called twice most of the time.

Fix that by making validateString a function.

Fixes ArticaProject/nx-libs#357

Attributes GH PR #318: https://github.com/ArcticaProject/nx-libs/pull/318

 Fixes ArcticaProject/nx-libs#237.

Xserver/Xext/shmint.h: Provide header file exporting ShmRegisterFunc and ShmRegisterFbFuncs (plus ShmSetPixmapFormat as a by-product).

 commit 9ceffb6b92e55f0d74d71489900d43940f14dfd9
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Wed Dec 28 10:37:17 2005 +0000

    Merge from xserver a header for shm's server internal functions, which are
        called by DDXes. Desired by XGL, and should be used in other locations,
        probably.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Attributes GH PR #310: https://github.com/ArcticaProject/nx-libs/pull/310

Fixes: ArcticaProject/nx-libs#265.

 - Support for i18n in libNX_X11 is static only, has ever been.
 - Thus, the files XlcSL.[co], XlcDL.[co], XDefaultIMIF.[co],
   XDefaultOMIF.[co] and lcDynamic.[co] become obsolete.

doc/libNX_X11/lcUniConv: Move over the rather-documentary files 8bit_tab_to_h.c and cjk_tab_to_h.c to nx-libs's doc/ folder.

doc/libNX_X11/lcUniConv: Pull over README from X.org's libX11 to document the origin and purpose of 8bit_tab_to_h.c and cjk_tab_to_h.c.

Attributes GH PR #374: https://github.com/ArcticaProject/nx-libs/pull/374

 Fixes ArcticaProject/nx-libs#324.

misc nx-X11/programs/Xserver/{composite,dix,randr}/: switch to using reallocarray, since it has been ported now.

nx-X11/{config/cf/{{Imake,X11}.tmpl,linux.cf},programs/Xserver/{include/os.h,os/{Imakefile,reallocarray.c}}: backport reallocarray() implementation.

misc nx-X11/programs/Xserver/{hw/nxagent,miext,render}/: move code around so that we can drop nx-X11/programs/Xserver/render/miglyph.c (and by extension nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.)

This is essentially a bastardized cross/backport of these X.Org commits - based
on our current architecture:

commit 4b14c9a9cd2033d3839c4ba364d41ab4c4b198ab
Author: Eric Anholt <eric@anholt.net>
Date:   Fri Oct 19 16:34:54 2007 -0700

    Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.

    Not all of the DDX/miext Glyphs hook implementations have been removed, but
    they should be.

and

commit 2251572062b2c25643671b8d5070de1c3f7ae976
Author: Aaron Plattner <aplattner@nvidia.com>
Date:   Fri Oct 26 15:13:50 2007 -0700

    Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs.

Conflicts:
	nx-X11/programs/Xserver/render/miglyph.c
	nx-X11/programs/Xserver/render/mipict.h
	nx-X11/programs/Xserver/render/picture.c

nx-X11/programs/Xserver/mi/{Imakefile,mibank.{c,h}}: backport ffaae7c0c69a51a53a76146c79f3630ae197a443.

 Down with mibank!

 Fixes ArcticaProject/nx-libs#366.

Attributes GH PR #375: https://github.com/ArcticaProject/nx-libs/pull/375

Reviewed-by: Ulrich Sibiller <uli42@gmx.de>  -- Fri, 03 Mar 2017 02:20:38 -0800

 Fixes ArcticaProject/nx-libs#328.

 Fixes ArcticaProject/nx-libs#325.
 Fixes ArcticaProject/nx-libs#326.

Attribute GH PR #360: https://github.com/ArcticaProject/nx-libs/pull/360

Attributes GH PR #314: https://github.com/ArcticaProject/nx-libs/pull/314

Fixes: ArcticaProject/nx-libs#51.

nxcomp/Loop.cpp: Ignore, options= nx/nx parameter, if file options path starts with /dev/, /proc/, or /sys/.

 Partially resolved ArcticaProject/nx-libs#51.

Attributes GH PR #363: https://github.com/ArcticaProject/nx-libs/pull/363

 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>

Attributes GH PR #311: https://github.com/ArcticaProject/nx-libs/pull/311

 In NXAGENT_SERVER we can also fully rely on libXfont
 for handling fpe internals.

 Backported from X.org:

 commit 75536ee80595c79bba95a1fb6844126ee08486d4
 Author: Tiago Vignatti <tiago.vignatti@nokia.com>
 Date:   Wed Jun 23 15:18:03 2010 +0300

    dix: use one single function to register fpe fonts

    X server doesn't need to understand fpe internals, so use
    register_fpe_functions from libXfont.

    It's required to get new version of libXfont, therefore adjust it to be passed
    to autoconf.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts symlink into nxagent bin:pkg. This change probably needs more fine-tuning for the various other RPM distros and versions out there.

 Thanks to Orion Poplawski for providing a code
 snippet with a general approach of handling this.

For consistency, apply patch from previous commit (630a7c3) to the original Xserver/dix/dixfonts.c file, although the code is undef'ed when NXAGENT_SERVER is defined.

{dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes dependency on X11's misc fonts package obsolete.

 This backports a mixture of these X.org commits (only focusing
 on SetDefaultFontPath() function):

 commit 03e8bfa1d122f7dea905d48c93cfd54afd991dfd
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Nov 27 20:09:04 2010 -0800

    Convert existing Xprintf style calls to asprintf style
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>

 commit 12e46e83733b47d2704e1509960192365102af46
 Author: Tiago Vignatti <tiago.vignatti@nokia.com>
 Date:   Fri Mar 25 22:07:31 2011 +0200

    dix: fix memory leak in SetDefaultFontPath
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

 commit 6592db6bb526f0c43b4c7b55859c629709e039b4
 Author: Mikhail Gusarov <dottedmag@dottedmag.net>
 Date:   Fri Jun 4 16:58:58 2010 +0700

    Get rid of xstrdup when argument is definitely non-NULL

    Replace xstrdup with strdup when either constant string is
    being duplicated or argument is guarded by conditionals and
    obviously can't be NULL
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

 commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52
 Author: Rémi Cardona <remi@gentoo.org>
 Date:   Mon Sep 14 17:09:59 2009 +0200

    dix: append "built-ins" to the font path in SetDefaultFontPath

    49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on
    a "fixed" font go away but only Xorg could use the built-ins fonts by
    default.

    With this commit, all DDXs get "built-ins" appended to their FontPath, not
    just Xorg.

    Tested with Xorg, Xvfb and Xnest.
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

 commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Wed Jan 7 19:37:03 2009 -0200

    Default to use standard bitmap fonts, with builtins as fallback

      The builtin-fonts configure option was removed, as it at best should
    have been a runtime option. Instead, now it always register all "font
    path element" backends, and adds built-ins fonts at the end of the
    default font path.
      This should be a more reasonable solution, to "correct" the most
    common Xorg FAQ (could not open default font 'fixed'), and also don't
    break by default applications that use only the standard/historical
    X Font rendering.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Fixes ArcticaProject/nx-libs#84.
 Fixes ArcticaProject/nx-libs#285.

debian/nx-x11-common.{links,dirs}: Make sure /usr/share/fonts/X11 are reachable for nxagent (via placing a symlink to /usr/share/nx/fonts).