Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/functions/config_x11.sh

    Diff of /alx-src/branches/alxconf-060/functions/config_x11.sh

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    alx-src/trunk/alxconfig-ng/functions/config_x11.sh revision 218 by niro, Tue Mar 8 20:29:46 2005 UTC alx-src/branches/alxconf-060/functions/config_x11.sh revision 1800 by niro, Thu Apr 14 19:29:35 2011 UTC
    # Line 1  Line 1 
    1    # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.9 2005-10-09 21:31:54 niro Exp $
    2  # configures the x11 server on the host via mysql db settings  # configures the x11 server on the host via mysql db settings
    3    
     #delme settings  
     SQL_USER=alx_install  
     SQL_PASS=@lx  
     SQL_HOST=128.20.41.110  
     SQL_DB=alx_web  
     ALX_SERIAL=10  
       
    4  get_x11_settings()  get_x11_settings()
    5  {  {
    6   local x i all DB_X11SETTINGS   local x i all DB_X11SETTINGS
    7     # autodetect
    8   # autodetect or not ?   all=$(mysqldo "select module,
    9   if [ $(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   resolution,
    10   "select monitorid from cfg_graphic where serial='${ALX_SERIAL}") -gt 0 ]   depth,
    11   then   refresh_rate
    12   # settings from db   from cfg_graphic where serial='${ALX_SERIAL}'")
    13    
    14   all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   # split'em up and put 'em in an array
    15   "select cfg_graphic.module,   declare -i i=0
    16   cfg_graphic.resolution,   for x in ${all}
    17   cfg_graphic.depth,   do
    18   list_monitors.vendor,   DB_X11SETTINGS[${i}]="${x}"
    19   list_monitors.model,   ((i++))
    20   list_monitors.hsync,   done
    21   list_monitors.vrefresh  
    22   from list_monitors   # and now put them in usable var names and export them systemwide
    23   inner join cfg_graphic   export ALX_MODULE="${DB_X11SETTINGS[0]:=NULL}"
    24   on cfg_graphic.monitorid=list_monitors.id   export ALX_RESOLUTION="${DB_X11SETTINGS[1]:=NULL}"
    25   and cfg_graphic.serial='${ALX_SERIAL}';")   export ALX_DEPTH="${DB_X11SETTINGS[2]:=NULL}"
    26     export ALX_REFRESH_RATE="${DB_X11SETTINGS[3]:=NULL}"
    27   echo "DEBUG: ${all}"  
    28     # which input devices are we using ?
    29   #split'em up and put 'em in an array   ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")
    30   declare -i i=0   ALX_MOUSE_RESOLUTION=$(mysqldo "select mouse_resolution from cfg_input where serial='${ALX_SERIAL}'")
      for x in ${all}  
      do  
      DB_X11SETTINGS[${i}]="${x}"  
      ((i++))  
      done  
       
      # and now put them in usable var names and export them systemwide  
      export ALX_MODULE="${DB_X11SETTINGS[0]:=NULL}"  
      export ALX_RESOLUTION="${DB_X11SETTINGS[1]:=NULL}"  
      export ALX_DEPTH="${DB_X11SETTINGS[2]:=NULL}"  
      export ALX_VENDOR="${DB_X11SETTINGS[3]:=NULL}"  
      export ALX_MODEL="${DB_X11SETTINGS[4]:=NULL}"  
      export ALX_HSYNC="${DB_X11SETTINGS[5]:=NULL}"  
      export ALX_VREF="${DB_X11SETTINGS[6]:=NULL}"  
      else  
      # autodetect  
      all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
      "select module,  
      resolution,  
      depth  
      from cfg_graphic where serial='${ALX_SERIAL}'")  
       
      echo "DEBUG: ${all}"  
       
      #split'em up and put 'em in an array  
      declare -i i=0  
      for x in ${all}  
      do  
      DB_X11SETTINGS[${i}]="${x}"  
      ((i++))  
      done  
       
      # and now put them in usable var names and export them systemwide  
      export ALX_MODULE="${DB_X11SETTINGS[0]:=NULL}"  
      export ALX_RESOLUTION="${DB_X11SETTINGS[1]:=NULL}"  
      export ALX_DEPTH="${DB_X11SETTINGS[2]:=NULL}"  
      export ALX_VENDOR="Autodetected"  
      export ALX_MODEL="Monitor"  
      export ALX_HSYNC="auto"  
      export ALX_VREF="auto"  
      fi  
       
      #which input devices are we using ?  
      ALX_MOUSE=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
      "select mouse from cfg_input where serial='${ALX_SERIAL}'")  
    31   export ALX_MOUSE   export ALX_MOUSE
    32  }  }
    33    
    34  write_x11_config() {  config_display_manager()
    35    {
    36     # setup slim
    37     cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf
    38     sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf
    39    
    40     # setup xession
    41     sed -i "s:\(^GLOGIN=\).*:\1slim:" /etc/rc.config
    42    
    43     # windowmanager
    44     echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc
    45    }
    46    
    47    config_x11()
    48    {
    49   # get our settings from the db   # get our settings from the db
    50   get_x11_settings   get_x11_settings
    51    
    52   # DEBUG   # setup displaymanager
    53   echo "MODULE:     '${ALX_MODULE}'"   config_display_manager
    54   echo "RESOLUTION: '${ALX_RESOLUTION}'"  
      echo "DEPTH:      '${ALX_DEPTH=}'"  
      echo "VENDOR:     '${ALX_VENDOR}'"  
      echo "MODEL:      '${ALX_MODEL}'"  
      echo "HSYNC:      '${ALX_HSYNC}'"  
      echo "VREF:       '${ALX_VREF}'"  
      echo "MOUSE:      '${ALX_MOUSE}'"  
       
    55   local xserver   local xserver
    56   local xfconfig   local xfconfig
    57   local HAS_VNC   local HAS_VNC
    58     local HAS_REALVNC
    59     local HAS_TIGERVNC
    60    
    61   #xfree or xorg ?   # xfree or xorg ?
    62   xserver="$(readlink /usr/X11R6/bin/X)"   xserver="$(readlink /usr/X11R6/bin/X)"
    63    
    64   case ${xserver} in   case ${xserver} in
    65   Xorg)   Xorg) xfconfig=/etc/X11/xorg.conf ;;
    66   xfconfig=/etc/X11/xorg.conf   XFree86) xfconfig=/etc/X11/XF86Config ;;
    67   ;;   *) echo "    Unkown xserver. aborting."; exit 1 ;;
      XFree86)  
      xfconfig=/etc/X11/XF86Config  
      ;;  
      *)  
      echo "    Unkown xserver. aborting."  
      exit 1  
      ;;  
    68   esac   esac
    69    
    70   #got we vnc support ?   # got we vnc support ?
    71   if [ -f /usr/X11R6/lib/modules/vnc.so ]   if [ -f /usr/X11R6/lib/modules/vnc.so ]
    72   then   then
    73   HAS_VNC="yes"   HAS_VNC="yes"
    # Line 125  write_x11_config() { Line 75  write_x11_config() {
    75   HAS_VNC="no"   HAS_VNC="no"
    76   fi   fi
    77    
    78   #show which server we use   if [ -f /usr/X11R6/lib/modules/extensions/vnc.so ]
    79     then
    80     HAS_REALVNC="yes"
    81     else
    82     HAS_REALVNC="no"
    83     fi
    84    
    85     if [ -f /usr/X11R6/lib/xorg/modules/extensions/libvnc.so ]
    86     then
    87     HAS_TIGERVNC="yes"
    88     else
    89     HAS_TIGERVNC="no"
    90     fi
    91    
    92     # show which server we use
    93   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "
    94    
    95   #show if we have vnc   # show if we have vnc
    96   if [ "${HAS_VNC}" = "yes" ]   if [[ ${HAS_VNC} = yes ]]
    97   then   then
    98   echo "with vnc enabled ..."   echo "with vnc enabled ..."
    99     elif [[ ${HAS_REALVNC} = yes ]]
    100     then
    101     echo "with realvnc enabled ..."
    102     elif [[ ${HAS_TIGERVNC} = yes ]]
    103     then
    104     echo "with tigervnc enabled ..."
    105   else   else
    106   echo "..."   echo "..."
    107   fi   fi
    108    
    109   #create a new clear xfconfig file   # create a new clear xfconfig file
    110   echo '# Generated with hwdetect, part of Magellan-Linux initscripts.' > ${xfconfig}   echo '# Generated with alxconfig-ng.' > ${xfconfig}
    111   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    112    
    113   #write modules   # write modules
    114   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    115   echo 'Section "Module"' >> ${xfconfig}   echo 'Section "Module"' >> ${xfconfig}
    116   echo '    Load        "dbe"' >> ${xfconfig}   echo '    Load        "dbe"' >> ${xfconfig}
    117   echo '    SubSection  "extmod"' >> ${xfconfig}   echo '    SubSection  "extmod"' >> ${xfconfig}
    118   echo '      Option    "omit xfree86-dga"' >> ${xfconfig}   echo '      Option    "omit xfree86-dga"' >> ${xfconfig}
    119   echo '    EndSubSection' >> ${xfconfig}   echo '    EndSubSection' >> ${xfconfig}
      echo '    Load        "type1"' >> ${xfconfig}  
      echo '    Load        "speedo"' >> ${xfconfig}  
    120   echo '    Load        "freetype"' >> ${xfconfig}   echo '    Load        "freetype"' >> ${xfconfig}
      echo '#    Load        "xtt"' >> ${xfconfig}  
    121   echo '#    Load       "glx"' >> ${xfconfig}   echo '#    Load       "glx"' >> ${xfconfig}
    122   echo '    Load       "dri"' >> ${xfconfig}   echo '    Load       "dri"' >> ${xfconfig}
    123    
    124   [ "${HAS_VNC}" = "yes" ] && echo '    Load       "vnc"' >> ${xfconfig}   [[ ${HAS_VNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    125     [[ ${HAS_REALVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    126     [[ ${HAS_TIGERVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    127    
    128   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    129    
    130   #fonts   # fonts
    131   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    132   echo 'Section "Files"' >> ${xfconfig}   echo 'Section "Files"' >> ${xfconfig}
      echo '    RgbPath "/usr/X11R6/lib/X11/rgb"' >> ${xfconfig}  
    133    
    134   case ${xserver} in   case ${xserver} in
    135   Xorg)   Xorg)
    136   echo '    FontPath   "/usr/share/fonts/local/"' >> ${xfconfig}   # only add existing font pathes
    137   echo '    FontPath   "/usr/share/fonts/misc/"' >> ${xfconfig}   [[ -f /usr/share/fonts/local/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/local/"' >> ${xfconfig}
    138   echo '    FontPath   "/usr/share/fonts/75dpi/:unscaled"' >> ${xfconfig}   [[ -f /usr/share/fonts/misc/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/misc/"' >> ${xfconfig}
    139   echo '    FontPath   "/usr/share/fonts/100dpi/:unscaled"' >> ${xfconfig}   [[ -f /usr/share/fonts/75dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/75dpi/:unscaled"' >> ${xfconfig}
    140   echo '    #prevents slow startup when disabled -> speedo, type1' >> ${xfconfig}   [[ -f /usr/share/fonts/100dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/100dpi/:unscaled"' >> ${xfconfig}
    141   echo '    #FontPath   "/usr/share/fonts/Speedo/"' >> ${xfconfig}   [[ -f /usr/share/fonts/TrueType/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/TrueType/"' >> ${xfconfig}
    142   echo '    #FontPath   "/usr/share/fonts/Type1/"' >> ${xfconfig}   [[ -f /usr/share/fonts/freefont/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/freefont/"' >> ${xfconfig}
    143   echo '    FontPath   "/usr/share/fonts/TrueType/"' >> ${xfconfig}   [[ -f /usr/share/fonts/75dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/75dpi/"' >> ${xfconfig}
    144   echo '    FontPath   "/usr/share/fonts/freefont/"' >> ${xfconfig}   [[ -f /usr/share/fonts/100dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/100dpi/"' >> ${xfconfig}
      echo '    FontPath   "/usr/share/fonts/75dpi/"' >> ${xfconfig}  
      echo '    FontPath   "/usr/share/fonts/100dpi/"' >> ${xfconfig}  
    145   ;;   ;;
    146   XFree86)   XFree86)
    147   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/local/"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/local/"' >> ${xfconfig}
    148   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/misc/"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/misc/"' >> ${xfconfig}
    149   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"' >> ${xfconfig}
    150   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"' >> ${xfconfig}
      echo '    #prevents slow startup when disabled -> speedo, type1' >> ${xfconfig}  
      echo '    #FontPath   "/usr/X11R6/lib/X11/fonts/Speedo/"' >> ${xfconfig}  
      echo '    #FontPath   "/usr/X11R6/lib/X11/fonts/Type1/"' >> ${xfconfig}  
    151   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/TrueType/"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/TrueType/"' >> ${xfconfig}
    152   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/freefont/"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/freefont/"' >> ${xfconfig}
    153   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/"' >> ${xfconfig}
    # Line 192  write_x11_config() { Line 155  write_x11_config() {
    155   ;;   ;;
    156   esac   esac
    157    
      echo '#    ModulePath "/usr/X11R6/lib/modules"' >> ${xfconfig}  
    158   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    159    
    160   #server flags   # server flags
    161   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    162   echo 'Section "ServerFlags"' >> ${xfconfig}   echo 'Section "ServerFlags"' >> ${xfconfig}
    163   echo '#    Option "DontVTSwitch"' >> ${xfconfig}   echo '#    Option "DontVTSwitch"' >> ${xfconfig}
    # Line 203  write_x11_config() { Line 165  write_x11_config() {
    165   echo '#    Option "Dont Zoom"' >> ${xfconfig}   echo '#    Option "Dont Zoom"' >> ${xfconfig}
    166   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    167    
    168   #keyboard   # keyboard
    169   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    170   echo 'Section "InputDevice"' >> ${xfconfig}   echo 'Section "InputDevice"' >> ${xfconfig}
    171   echo '    Identifier "Keyboard1"' >> ${xfconfig}   echo '    Identifier "Keyboard1"' >> ${xfconfig}
    172    
    173   case ${xserver} in   case ${xserver} in
    174   Xorg)   Xorg) echo '    Driver "kbd"' >> ${xfconfig} ;;
    175   echo '    Driver "kbd"' >> ${xfconfig}   XFree86) echo '    Driver "Keyboard"' >> ${xfconfig} ;;
      ;;  
      XFree86)  
      echo '    Driver "Keyboard"' >> ${xfconfig}  
      ;;  
    176   esac   esac
    177    
    178   echo '    Option "AutoRepeat" "500 30"' >> ${xfconfig}   echo '    Option "AutoRepeat" "500 30"' >> ${xfconfig}
    179   echo '#    Option "Xleds"      "1 2 3"' >> ${xfconfig}   echo '#    Option "Xleds"      "1 2 3"' >> ${xfconfig}
    180    
    181   case ${xserver} in   case ${xserver} in
    182   Xorg)   Xorg) echo '    Option "XkbRules" "xorg"' >> ${xfconfig} ;;
    183   echo '    Option "XkbRules" "xorg"' >> ${xfconfig}   XFree86) echo '    Option "XkbRules" "xfree86"' >> ${xfconfig} ;;
      ;;  
      XFree86)  
      echo '    Option "XkbRules" "xfree86"' >> ${xfconfig}  
      ;;  
    184   esac   esac
    185    
    186   echo '    Option "XkbModel" "pc104"' >> ${xfconfig}   echo '    Option "XkbModel" "pc105"' >> ${xfconfig}
    187   echo '    Option "XkbLayout" "de"' >> ${xfconfig}   echo '    Option "XkbLayout" "de"' >> ${xfconfig}
    188   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    189    
    190   #mouse   # mouse
    191   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    192   echo 'Section "InputDevice"' >> ${xfconfig}   echo 'Section "InputDevice"' >> ${xfconfig}
    193   echo '    Identifier "Mouse1"' >> ${xfconfig}   echo '    Identifier "Mouse1"' >> ${xfconfig}
    # Line 246  write_x11_config() { Line 200  write_x11_config() {
    200   Auto) device=/dev/mouse;;   Auto) device=/dev/mouse;;
    201   *) device=/dev/mouse;;   *) device=/dev/mouse;;
    202   esac   esac
    203     echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}
    204    
    205   echo '    Option "Resolution" "1200"' >> ${xfconfig}   [[ -z ${ALX_MOUSE_RESOLUTION} ]] && ALX_MOUSE_RESOLUTION="1200"
    206     echo "    Option \"Resolution\" \"${ALX_MOUSE_RESOLUTION}\"" >> ${xfconfig}
    207    
    208   [ "${ALX_MOUSE}" = "IMPS/2" ] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}   [[ ${ALX_MOUSE} = IMPS/2 ]] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}
    209    
    210   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    211    
    212   #vnc keyboard && mouse   # vnc keyboard && mouse
    213   if [ "${HAS_VNC}" = "yes" ]   if [[ ${HAS_VNC} = yes ]]
    214   then   then
    215   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    216   echo 'Section "InputDevice"' >> ${xfconfig}   echo 'Section "InputDevice"' >> ${xfconfig}
    # Line 269  write_x11_config() { Line 225  write_x11_config() {
    225   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    226   fi   fi
    227    
    228     # monitor
    229     echo '' >> ${xfconfig}
    230     echo 'Section "Monitor"' >> ${xfconfig}
    231     echo '    Identifier  "Monitor0"' >> ${xfconfig}
    232     echo '    Option      "DPMS"' >> ${xfconfig}
    233    
    234   #monitor   # add hsync, vrefresh
    235   if [ -x "/sbin/ddcxinfo-knoppix" ] &&   if [[ -x /sbin/ddcxinfo-knoppix ]]
        [ "${ALX_HSYNC}" = "auto" ] ||  
        [ "${ALX_VREF}" = "auto" ]  
    236   then   then
    237   ddcxinfo-knoppix -monitor >> ${xfconfig}   local hsync="$(ddcxinfo-knoppix -hsync)"
    238   else   local vsync="$(ddcxinfo-knoppix -vsync)"
    239     # fallback
    240     [[ ${hsync} = 0-0 ]] && hsync="28-96"
    241     [[ ${vsync} = 0-0 ]] && vsync="50-60"
    242    
    243   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    244   echo "# Monitor: ${ALX_VENDOR} ${ALX_MODEL}" >> ${xfconfig}   echo "    HorizSync ${hsync}"  >> ${xfconfig}
    245   echo 'Section "Monitor"' >> ${xfconfig}   echo "    VertRefresh ${vsync}"  >> ${xfconfig}
      echo '    Identifier  "Monitor0"' >> ${xfconfig}  
      echo "    HorizSync   ${ALX_HSYNC}" >> ${xfconfig}  
      echo "    VertRefresh ${ALX_VREF}" >> ${xfconfig}  
      echo '    Option      "DPMS"' >> ${xfconfig}  
      echo 'EndSection' >> ${xfconfig}  
    246   fi   fi
    247    
    248   #vga   # add cvt modelines
    249     echo '' >> ${xfconfig}
    250     local cvt="/usr/X11R6/bin/cvt"
    251     local modeline
    252     modeline=$("${cvt}" "${ALX_RESOLUTION%x*}" "${ALX_RESOLUTION#*x}" "${ALX_REFRESH_RATE}" | sed -e 's:^:\t:g' -e 's:_.*\":\":')
    253     echo "${modeline}" >> ${xfconfig}
    254     # add ddcxinfo-knoppix modelines (fallback)
    255     if [[ -x /sbin/ddcxinfo-knoppix ]]
    256     then
    257     echo '' >> ${xfconfig}
    258     ddcxinfo-knoppix -modelines >> ${xfconfig}
    259     fi
    260     echo 'EndSection' >> ${xfconfig}
    261    
    262     # vga
    263   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    264   echo 'Section "Device"' >> ${xfconfig}   echo 'Section "Device"' >> ${xfconfig}
    265   echo '    Identifier  "vga0"' >> ${xfconfig}   echo '    Identifier  "vga0"' >> ${xfconfig}
    266     # check for openchrome and use it if available
    267     if [[ ${ALX_MODULE} = via ]] && [ -f /usr/X11R6/lib/xorg/modules/drivers/openchrome_drv.so ]
    268     then
    269     ALX_MODULE="openchrome"
    270     fi
    271   echo "    Driver      \"${ALX_MODULE}\"" >> ${xfconfig}   echo "    Driver      \"${ALX_MODULE}\"" >> ${xfconfig}
    272    
    273   #vnc server options   # vnc server options
    274   if [ "${HAS_VNC}" = "yes" ]   if [[ ${HAS_VNC} = yes ]]
    275   then   then
    276   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    277   echo '    # rfb options' >> ${xfconfig}   echo '    # rfb options' >> ${xfconfig}
    # Line 316  write_x11_config() { Line 293  write_x11_config() {
    293    
    294   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    295    
    296   #screens   # screens
    297   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    298   echo 'Section "Screen"' >> ${xfconfig}   echo 'Section "Screen"' >> ${xfconfig}
    299   echo '    Identifier  "Screen 1"' >> ${xfconfig}   echo '    Identifier  "Screen 1"' >> ${xfconfig}
    # Line 328  write_x11_config() { Line 305  write_x11_config() {
    305   echo "        Modes       \"${ALX_RESOLUTION}\"" >> ${xfconfig}   echo "        Modes       \"${ALX_RESOLUTION}\"" >> ${xfconfig}
    306   echo '        ViewPort    0 0' >> ${xfconfig}   echo '        ViewPort    0 0' >> ${xfconfig}
    307   echo '    EndSubsection' >> ${xfconfig}   echo '    EndSubsection' >> ${xfconfig}
    308    
    309     if [[ ${HAS_REALVNC} = yes ]] || [[ ${HAS_TIGERVNC} = yes ]]
    310     then
    311     echo '    Option "SecurityTypes" "VncAuth"' >> ${xfconfig}
    312     echo '    Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}
    313     echo '    Option "PasswordFile" "/root/.vnc/passwd"' >> ${xfconfig}
    314     fi
    315   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    316    
    317   #server layout   # server layout
    318   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    319   echo 'Section "ServerLayout"' >> ${xfconfig}   echo 'Section "ServerLayout"' >> ${xfconfig}
    320   echo '    Identifier  "Simple Layout"' >> ${xfconfig}   echo '    Identifier  "Simple Layout"' >> ${xfconfig}
    # Line 338  write_x11_config() { Line 322  write_x11_config() {
    322   echo '    InputDevice "Mouse1" "CorePointer"' >> ${xfconfig}   echo '    InputDevice "Mouse1" "CorePointer"' >> ${xfconfig}
    323   echo '    InputDevice "Keyboard1" "CoreKeyboard"' >> ${xfconfig}   echo '    InputDevice "Keyboard1" "CoreKeyboard"' >> ${xfconfig}
    324    
    325   #load vnc keyboard && mouse   # load vnc keyboard && mouse
    326   if [ "${HAS_VNC}" = "yes" ]   if [[ ${HAS_VNC} = yes ]]
    327   then   then
    328   echo '    InputDevice "vncMouse"    "ExtraPointer"' >> ${xfconfig}   echo '    InputDevice "vncMouse"    "ExtraPointer"' >> ${xfconfig}
    329   echo '    InputDevice "vncKeyboard" "ExtraKeyboard"' >> ${xfconfig}   echo '    InputDevice "vncKeyboard" "ExtraKeyboard"' >> ${xfconfig}
    # Line 347  write_x11_config() { Line 331  write_x11_config() {
    331    
    332   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    333    
    334   #dri (here disabled, use default of xserver)   # dri
    335   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    336   echo '# Section "DRI"' >> ${xfconfig}   echo 'Section "DRI"' >> ${xfconfig}
    337   echo '#    Mode 0666' >> ${xfconfig}   echo '    Mode 0666' >> ${xfconfig}
    338   echo '# EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    339  }  }
    340    
    Legend:
    Removed from v.218  
    changed lines
      Added in v.1800