revert a portion of the previous, which ends up failing with our
MK_COOKIE definition now being a variable instead of cpp expanded
directly into the script.

startx now starts up the X server again.

XXX.

merge xauth-1.1.4, xdm-1.1.17, xinit-1.4.3, and xtrans-1.6.0.

initial import of xinit-1.4.3

merge xinit 1.4.2, xprop 1.2.6, xrandr 1.5.2, xset 1.2.5, and xstdcmap 1.0.5

initial import of xinit-1.4.2

Expand and escape comments. One minor change to variable expansion
as requested by uwe.

Avoid exec'ing bc. Pointed out by uwe.

Explanations requested by uwe...

Only set dpi when necessary to avoid divide by zero on very small screens

More DPI magic... allow most modern GTK and Qt apps to automatically scale

In xterm, use TrueType fonts rather than Spleen at higher DPIs.

Requested by jmcneill.

Default X session: In xterm and xman at lower DPIs, use misc-fixed
instead of spleen for greater readability. Reasoning: misc-fixed
has native bold variants.

At higher DPIs, xterm can suitably 'enbolden' spleen without losing
significant aspects of the letter shape, so the text remains readable.

Requested by uwe and jmcneill.

Make the xterm font size selection menu work in a reasonably expected way

want more default xorg font resource definitions,
and a clock on ctwm startup

Do not attempt to trap SIGKILL

xinitrc: delay preprocessing of COLOR in xrdb input

Revert previous and fix it properly. #ifdef COLOR is intended to be
processed by xrdb, but the script source itself is processed by the C
preprocessor at build time. Spell that # as XHASH to protect the
conditional.

COLOR is not a C preprocessor macro :|

Use a white on black terminal regardless of whether we're COLOR or not

Scale XTerm and other X11 apps using the same DPI detection as ctwm

more 'welcoming' default root window pointer

nice default xsetroot

Slightly nicer default colors for various X11 apps

turn off the ctwm "welcome" screen

while this is nice for Branding(tm), it adds a slight delay to startup,
which is slightly annoying, and a departure from how we've done things
previously.

make the default xinitrc a bit nicer

spawn only one xterm in unicode mode and use ctwm instead of twm

ctwm is a backwards compatible fork of twm that includes some extra
features like virtual desktops

remove reference to non existance sys.startxrc.

merge xditview 1.0.5, xinit 1.4.1, xlogo 1.0.5, and xmore 1.0.3.

initial import of xinit-1.4.1

merge xinit 1.4.0.

initial import of xinit-1.4.0

Use upstream version for expr fix.

use portable expr(1). fixes, eg:

7oclock ~> startx
expr: syntax error

merge xfsinfo 1.0.5, xinit 1.3.4, xinput 1.6.1 xkbcomp 1.3.0 and xkbevd 1.1.4.

initial import of xinit-1.3.4

Reduce unnecessary diffs to upstream.

merge xfindproxy 1.0.3, xfwp 1.0.3, xhost 1.0.6, xinit 1.3.3,
xload 1.1.2, xlsclients 1.1.3, and xman 1.1.3.

initial import of xinit-1.3.3

merge xcalc 1.0.5, xfd 1.1.1, xfontsel 1.0.5, xfsinfo 1.0.4, xgamma 1.0.5,
xgc 1.0.4, and xhost 1.0.5.

initial import of xinit-1.3.2

Instead of local patch, merge upstream git version:
commit 45cc81cd7abafe61bddb3ddce9f4fb8a9aa06c12
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 8 22:11:15 2011 +0200

Include <sys/time.h> and <sys/resource.h> unconditionally

Suggested by Mark Kettenis.

X.Org bug#40632 <https://bugs.freedesktop.org/show_bug.cgi?id=40632>

Signed-off-by: Julien Cristau <jcristau@debian.org>

Add -noretro as default server arg in configuration files where we are
sure the user will get a visible window "soon".
The sole reason we backed out the "retro" change from upstream
was to avoid an empty black screen after manualy starting just "X". With
these preconfigured startup mehtods, this confusion can not happen.

merge xinit 1.3.1

initial import of xinit-1.3.1

Use xinitrc.d/?*.sh as the matching pattern instead of needing a
fragile sed substitution XSLASHGLOB to produce xinitrc.d/*.sh. (If
that were used literally the slash-star would confuse cpp.)

Fixes PR 44619. Patch has been sent upstream.

include sys/resource.h on netbsd, too.

merge cornflakes

initial import of xinit-1.3.0

merge xinit 1.2.1

initial import of xinit-1.2.1

initial import of xinit-1.1.1

initial import of xinit-1.1.0