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/branches/alxconf_20060908/functions/config_x11.sh revision 1641 by niro, Tue Dec 28 12:45:46 2010 UTC alx-src/branches/alxconf-060/functions/config_x11.sh revision 1800 by niro, Thu Apr 14 19:29:35 2011 UTC
    # Line 27  get_x11_settings() Line 27  get_x11_settings()
    27    
    28   # which input devices are we using ?   # which input devices are we using ?
    29   ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")   ALX_MOUSE=$(mysqldo "select mouse from cfg_input where serial='${ALX_SERIAL}'")
    30     ALX_MOUSE_RESOLUTION=$(mysqldo "select mouse_resolution from cfg_input where serial='${ALX_SERIAL}'")
    31   export ALX_MOUSE   export ALX_MOUSE
    32  }  }
    33    
    34    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()  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     # setup displaymanager
    53     config_display_manager
    54    
    55   local xserver   local xserver
    56   local xfconfig   local xfconfig
    57   local HAS_VNC   local HAS_VNC
    # Line 184  config_x11() Line 201  config_x11()
    201   *) device=/dev/mouse;;   *) device=/dev/mouse;;
    202   esac   esac
    203   echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}   echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}
    204   echo '    Option "Resolution" "1200"' >> ${xfconfig}  
    205     [[ -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    
    # Line 211  config_x11() Line 230  config_x11()
    230   echo 'Section "Monitor"' >> ${xfconfig}   echo 'Section "Monitor"' >> ${xfconfig}
    231   echo '    Identifier  "Monitor0"' >> ${xfconfig}   echo '    Identifier  "Monitor0"' >> ${xfconfig}
    232   echo '    Option      "DPMS"' >> ${xfconfig}   echo '    Option      "DPMS"' >> ${xfconfig}
    233   echo '' >> ${xfconfig}  
    234     # add hsync, vrefresh
    235     if [[ -x /sbin/ddcxinfo-knoppix ]]
    236     then
    237     local hsync="$(ddcxinfo-knoppix -hsync)"
    238     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}
    244     echo "    HorizSync ${hsync}"  >> ${xfconfig}
    245     echo "    VertRefresh ${vsync}"  >> ${xfconfig}
    246     fi
    247    
    248   # add cvt modelines   # add cvt modelines
    249     echo '' >> ${xfconfig}
    250   local cvt="/usr/X11R6/bin/cvt"   local cvt="/usr/X11R6/bin/cvt"
    251   local modeline   local modeline
    252   modeline=$("${cvt}" "${ALX_RESOLUTION%x*}" "${ALX_RESOLUTION#*x}" "${ALX_REFRESH_RATE}" | sed -e 's:^:\t:g' -e 's:_.*\":\":')   modeline=$("${cvt}" "${ALX_RESOLUTION%x*}" "${ALX_RESOLUTION#*x}" "${ALX_REFRESH_RATE}" | sed -e 's:^:\t:g' -e 's:_.*\":\":')
    253   echo "${modeline}" >> ${xfconfig}   echo "${modeline}" >> ${xfconfig}
    254   # add ddcxinfo-knoppix modelines (fallback)   # add ddcxinfo-knoppix modelines (fallback)
    255   [[ -x /sbin/ddcxinfo-knoppix ]] && ddcxinfo-knoppix -modelines >> ${xfconfig}   if [[ -x /sbin/ddcxinfo-knoppix ]]
    256     then
    257     echo '' >> ${xfconfig}
    258     ddcxinfo-knoppix -modelines >> ${xfconfig}
    259     fi
    260   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    261    
    262   # vga   # vga
    Legend:
    Removed from v.1641  
    changed lines
      Added in v.1800