X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=cb4c1fc474eca6b17b653a2a60a2c6ec74bb938a;hb=4e55cf7818d565fcb832e5a61dc035cc84944c7e;hp=d5a8f998c667f1b5a2f2f0305813c97ccc30eb76;hpb=9c0d3212e7240bd4cd79f95e2df46a5fe804e25e;p=grml-x.git diff --git a/grml-x b/grml-x index d5a8f99..cb4c1fc 100755 --- a/grml-x +++ b/grml-x @@ -4,9 +4,16 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Don Jul 12 01:20:47 CEST 2007 [mika] +# Latest change: Die Sep 04 01:44:19 CEST 2007 [mika] ################################################################################ +# make sure /tmp is writeable {{{ + if ! [ -w /tmp ] ; then + echo 'Fatal: /tmp is not writeable. Can not resume therefore, sorry.' >&2 + exit 1 + fi +# }}} + # debugging {{{ # usage: DEBUG=1 grml-x ..... 2>/tmp/grml-x-debug.log if [[ $DEBUG -gt 0 ]]; then @@ -120,17 +127,18 @@ usage() Usage: $PROGRAMNAME $PROGRAMNAME [-options] windowmanager -Examples: +Usage examples: $PROGRAMNAME wmii - $PROGRAMNAME pekwm $PROGRAMNAME fluxbox + $PROGRAMNAME openbox $PROGRAMNAME -force -nostart fluxbox $PROGRAMNAME -nosynaptics fluxbox $PROGRAMNAME -nosync fluxbox $PROGRAMNAME -noddc wmii - $PROGRAMNAME -module radeon -mode 1024x768 -vsync 60 wmi - XINITRC=~/.xinitrc $PROGRAMNAME ion - $PROGRAMNAME -display 8 wmii + $PROGRAMNAME -xinerama -composite wmii + $PROGRAMNAME -module radeon -mode 1024x768 -vsync 60 openbox + XINITRC=~/.xinitrc $PROGRAMNAME openbox + $PROGRAMNAME -display 8 openbox More information on grml-x can be found in the manual page: man grml-x @@ -174,23 +182,6 @@ sort -nur | perl -ne 's/\s+/ /; s/(\d+x\d+)/"$1"/; print') Option for $fg[yellow]Xinerama$fg[green] found, please use xrandr inside X.org for your further configuration! Trying to identify monitors now..." - # Currently we only know that it works with current intel driver, - # so inform user about that: - if [[ "$MODULE" != "intel" ]] ; then - print "$fg[red] - -Warning: using a non-intel driver - trying Xinerama setup anyway. -If it worked please contact grml developers providing information -about your setup so we can adjust grml-x according! - - -> http://grml.org/contact/ - -Sleeping for 10 seconds now... Will continue then... -Just press Ctrl-C to cancel operation. -" -# sleep 10 # FIXME - fi - # make sure we have information from 2 monitors: # - first one from 'hwinfo --monitor' => $MONITORINFO # - second one from 'hwinfo --framebuffer' => $FRAMEBUFFER @@ -200,9 +191,10 @@ Just press Ctrl-C to cancel operation. Fatal: could not identify two monitors - no chance to set up multihead using Xinerama - sorry. :-( -Please run grml-x without the -xinerama option and contact -grml developers if you have any further useful information. - => http://grml.org/bugs/ +Please run grml-x without the -xinerama option to start +X anyway (dropping support for Xinerama of course) and +contact grml developers if you have any further useful +information. => http://grml.org/bugs/ " bailout 10 fi @@ -215,15 +207,40 @@ Fatal: could not identify monitor - no chance to " bailout 11 else + # Currently we only know that it works with current intel driver, + # so inform user about that: + if [[ "$MODULE" != "intel" ]] ; then + print "$fg[red] + +Warning: using a non-intel driver - trying Xinerama setup anyway. +If it worked please contact grml developers providing information +about your setup so we can adjust grml-x according! + + -> http://grml.org/contact/ + +Sleeping for 10 seconds now... Will continue then... +Just press Ctrl-C to cancel operation. +" + sleep 10 + fi + # now calculate Virtual size for use with Xinerama HORIZ_RES1="$(grep 'Max. Resolution:' $MONITORINFO | sed 's/ Max\. Resolution: \(.*\)x\(.*\)/\1/')" VERIZ_RES1="$(grep 'Max. Resolution:' $MONITORINFO | sed 's/ Max\. Resolution: \(.*\)x\(.*\)/\2/')" + # it might happen that we don't have a Max Resolution in hwinfo output :-/ + # fall back to a generic value then... + # TODO: check out how to get resolution of external monitor from console + if [ -z "$HORIZ_RES1" ] ; then + HORIZ_RES1="1024" + VERIZ_RES1="768" + fi - HORIZ_RES2="$(echo $FRAMEBUFFER | sed 's/ Mode 0x.*: \(.*\)x.*/\1/')" - VERIZ_RES2="$(echo $FRAMEBUFFER | sed 's/ Mode 0x.*x\(.*\) (.*/\1/')" + # get maximum of output + HORIZ_RES2="$(echo $FRAMEBUFFER | grep 'Mode 0x' | sed 's/ Mode 0x.*: \(.*\)x.*/\1/'| sort -u | head -1)" + VERIZ_RES2="$(echo $FRAMEBUFFER | grep 'Mode 0x' | sed 's/ Mode 0x.*x\(.*\) (.*/\1/' | sort -u | head -1)" - if [ -n "$HORIZ_RES1" -a -n "$VERIZ_RES1" -a -n "$HORIZ_RES2" ] ; then - if [ $(echo $VERIZ_RES1 - $VERIZ_RES2 | bc -l) -eq 0 ] ; then + if [ -n "$HORIZ_RES1" -a -n "$VERIZ_RES1" -a -n "$HORIZ_RES2" -a -n "$VERIZ_RES2" ] ; then + if [ "$(echo $VERIZ_RES1" - "$VERIZ_RES2 | bc -l)" -eq 0 ] ; then VERIZ_RESULT="$VERIZ_RES1" elif [ "$VERIZ_RES1" -gt "$VERIZ_RES2" ] ; then VERIZ_RESULT="$VERIZ_RES1" @@ -236,7 +253,7 @@ Fatal: could not identify monitor - no chance to # important: keep newline for appropriate placing below $MODES! if [ -n "$HORIZ_RESULT" ] ; then VIRTUAL=" - Virtual $HORIZ_RESULT $VERIZ_RES1" + Virtual $HORIZ_RESULT $VERIZ_RES1" fi fi fi @@ -256,6 +273,7 @@ Fatal: could not identify monitor - no chance to 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 @@ -276,7 +294,7 @@ mouse() 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\" @@ -311,7 +329,7 @@ EndSection 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\" @@ -334,7 +352,7 @@ Section \"InputDevice\" Option \"MaxSpeed\" \"2.00\" Option \"AccelFactor\" \"0.030\" Option \"UpDownScrolling\" \"1\" - Option \"EmulateMiddleButtonTime\" \"75\" + Option \"EmulateMidButtonTime\" \"75\" Option \"CircularScrolling\" \"1\" Option \"CircScrollDelta\" \"0.1\" Option \"CircScrollTrigger\" \"8\" @@ -374,7 +392,8 @@ EndSection if grep -q 'Device:.*Serial' "$MOUSEINFO" ; then SERIAL='yes' SERMOUSE='InputDevice "Serial Mouse" "CorePointer"' - SERMOUSEDETAIL="Section \"InputDevice\" + SERMOUSEDETAIL=" +Section \"InputDevice\" Identifier \"Serial Mouse\" Driver \"mouse\" Option \"Device\" \"/dev/ttyS0\" @@ -394,7 +413,8 @@ EndSection if [ -n "$USE_PS2" ] ; then PS2='yes' PS2MOUSE='InputDevice "PS/2 Mouse" "CorePointer"' - PS2MOUSEDETAIL="Section \"InputDevice\" + PS2MOUSEDETAIL=" +Section \"InputDevice\" Identifier \"PS/2 Mouse\" Driver \"mouse\" Option \"Device\" \"/dev/input/mice\" @@ -410,7 +430,8 @@ EndSection PS2MOUSEDETAIL='' fi - EVDEV_MOUSE="# Section \"InputDevice\" + EVDEV_MOUSE=" +# Section \"InputDevice\" # Identifier \"Generic Mouse\" # Driver \"evdev\" # Option \"Device\" \"/dev/input/mice\" @@ -570,6 +591,7 @@ EndSection" writehwinfo # monitor stuff + [ -r "$HWINFO_TMP" ] || bailout 1 MONITOR=$(awk '/monitor.1:/{print $3}' $HWINFO_TMP) [[ $MONITOR != 'ddc' ]] && NODDC=yes @@ -630,7 +652,7 @@ requirements() { if ! [ -x $(which hwinfo) ] ; then print "$bg[black]$fg[red]${bold_color}Error: hwinfo not found in path.${reset_color} -Note: run 'apt-get install hwinfo' on systems running debian. +Note: run 'aptitude install hwinfo' on systems running debian. Exiting.${reset_color}" exit -1 fi @@ -660,10 +682,14 @@ cat << EOX # /usr/share/doc/xserver-xorg/ and # http://wiki.x.org/wiki/Home and # http://ftp.x.org/pub/X11R7.0/doc/html/index.html for information on Xorg +# # Refer to the xorg.conf man page and to # http://ftp.x.org/pub/X11R7.0/doc/html/xorg.conf.5.html # for details about the format of this file. # +# See http://wiki.debian.org/XStrikeForce/FAQ for information +# regarding Xorg packages within Debian. +# # If you would like this file to be automatically reconfigured by debian, # run the following command: # sudo dpkg-reconfigure -phigh xserver-xorg @@ -694,7 +720,7 @@ $XFONTS 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 @@ -704,6 +730,7 @@ Section "Module" 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 @@ -733,11 +760,7 @@ EndSection # EndSection # More information: http://ftp.x.org/pub/X11R7.0/doc/html/mouse.html -$USBMOUSEDETAIL -$PS2MOUSEDETAIL -$SERMOUSEDETAIL -$SYNMOUSEDETAIL -$EVDEV_MOUSE +${USBMOUSEDETAIL}${PS2MOUSEDETAIL}${SERMOUSEDETAIL}${SYNMOUSEDETAIL}${EVDEV_MOUSE} Section "Monitor" Identifier "Monitor0" # ModelName "Old Monitor (no DDC)" @@ -912,8 +935,8 @@ Please exit screen and try to run $PROGRAMNAME again." get-edid | parse-edid Do you want to go the debian way of life? Run: - apt-get install x-window-system-core read-edid mdetect hwinfo xdebconfigurator - dpkg-reconfigure x-window-system-core (or xserver-xorg depending on your system) + aptitude install xorg read-edid mdetect hwinfo xdebconfigurator + dpkg-reconfigure -phigh xserver-xorg Problems with the module used for X? Try to load another one or fall back to module vesa: @@ -968,7 +991,7 @@ cleanup # 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