sync()
{
[ -r "$MONITORINFO" ] || monitor # get monitor settings
+ [ -r "$MONITORINFO" ] || bailout 1
vsyncval=$(awk '/Vert. Sync Range:/{print $4}' $MONITORINFO | sed 's/-/.0 - / ; s/$/.0/' | head -1)
hsyncval=$(awk '/Hor. Sync Range:/{print $4}' $MONITORINFO | sed 's/-/.0 - / ; s/$/.0/' | head -1)
if [ -z $vsyncval ] ; then
if grep -q 'Device:.*Synaptics' "$MOUSEINFO" ; then
if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
MOUSEDRIVER='synaptics'
- SYNMOUSE='InputDevice "Synaptics" "AlwaysCore"'
+ SYNMOUSE='InputDevice "Synaptics" # "AlwaysCore"'
SYNMOUSEDETAIL="
Section \"InputDevice\"
Driver \"synaptics\"
if grep -q 'Device:.*ALPS' "$MOUSEINFO" ; then
if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
MOUSEDRIVER='synaptics'
- SYNMOUSE='InputDevice "Synaptics" "AlwaysCore"'
+ SYNMOUSE='InputDevice "Synaptics" # "AlwaysCore"'
SYNMOUSEDETAIL="
Section \"InputDevice\"
Driver \"synaptics\"
writehwinfo
# monitor stuff
+ [ -r "$HWINFO_TMP" ] || bailout 1
MONITOR=$(awk '/monitor.1:/{print $3}' $HWINFO_TMP)
[[ $MONITOR != 'ddc' ]] && NODDC=yes
FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
EndSection
-# Modules - see /usr/X11R6/lib/modules/fonts and /usr/X11R6/lib/modules/extensions
+# Modules - see /usr/lib/xorg/modules/fonts and /usr/lib/xorg/modules/extensions
Section "Module"
Load "dbe" # double buffer extension
Load "dri" # direct rendering
Load "extmod" # some commonly used server extensions (e.g. shape extension)
Load "record" # recording extension
Load "evdev" # generic input handling driver on Linux
+ Load "xtrap" # X Trap extension
# Load "vbe" # Vesa BIOS Extension
# Load "i2c" # I2C bus
# Load "int10" # initialize graphics cards via int10 call to the BIOS
function runit
{
writeconfig
+ if [ "$(readlink /etc/X11/X)" = /bin/true ] ; then
+ print "$bold_color$fg[red]Fatal: /etc/X11/X is a symlink to /bin/true."
+ print "Fix it via running 'ln -sf /usr/bin/Xorg /etc/X11/X'"
+ exit 10
+ fi
if [ -z "$NOSTART" ] ; then
print "$reset_color"
if [ -x /etc/init.d/xorg-common ] ; then
# xinitrc {{{
if ! [ -x "$(which $WINDOWMANAGER)" ] ; then
- print "$bg[black]$fg[red]${bold_color}Fatal: windowmanager $fg[blue]$WINDOWMANAGER$fg[red] not executable, startx won' work.${reset_color}">&2
+ print "$bg[black]$fg[red]${bold_color}Fatal: windowmanager $fg[blue]$WINDOWMANAGER$fg[red] not executable, startx will not work.${reset_color}">&2
bailout
fi
if [ -w "$XINITRC" ] ; then