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

    revision 1586 by niro, Fri Nov 26 09:32:30 2010 UTC revision 1647 by niro, Thu Dec 30 13:43:24 2010 UTC
    # Line 64  config_x11() Line 64  config_x11()
    64   else   else
    65   HAS_REALVNC="no"   HAS_REALVNC="no"
    66   fi   fi
    67    
    68   if [ -f /usr/X11R6/lib/modules/extensions/libvnc.so ]   if [ -f /usr/X11R6/lib/xorg/modules/extensions/libvnc.so ]
    69   then   then
    70   HAS_TIGERVNC="yes"   HAS_TIGERVNC="yes"
    71   else   else
    # Line 116  config_x11() Line 116  config_x11()
    116    
    117   case ${xserver} in   case ${xserver} in
    118   Xorg)   Xorg)
    119   echo '    FontPath   "/usr/share/fonts/local/"' >> ${xfconfig}   # only add existing font pathes
    120   echo '    FontPath   "/usr/share/fonts/misc/"' >> ${xfconfig}   [[ -f /usr/share/fonts/local/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/local/"' >> ${xfconfig}
    121   echo '    FontPath   "/usr/share/fonts/75dpi/:unscaled"' >> ${xfconfig}   [[ -f /usr/share/fonts/misc/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/misc/"' >> ${xfconfig}
    122   echo '    FontPath   "/usr/share/fonts/100dpi/:unscaled"' >> ${xfconfig}   [[ -f /usr/share/fonts/75dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/75dpi/:unscaled"' >> ${xfconfig}
    123   echo '    FontPath   "/usr/share/fonts/TrueType/"' >> ${xfconfig}   [[ -f /usr/share/fonts/100dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/100dpi/:unscaled"' >> ${xfconfig}
    124   echo '    FontPath   "/usr/share/fonts/freefont/"' >> ${xfconfig}   [[ -f /usr/share/fonts/TrueType/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/TrueType/"' >> ${xfconfig}
    125   echo '    FontPath   "/usr/share/fonts/75dpi/"' >> ${xfconfig}   [[ -f /usr/share/fonts/freefont/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/freefont/"' >> ${xfconfig}
    126   echo '    FontPath   "/usr/share/fonts/100dpi/"' >> ${xfconfig}   [[ -f /usr/share/fonts/75dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/75dpi/"' >> ${xfconfig}
    127     [[ -f /usr/share/fonts/100dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/100dpi/"' >> ${xfconfig}
    128   ;;   ;;
    129   XFree86)   XFree86)
    130   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/local/"' >> ${xfconfig}   echo '    FontPath   "/usr/X11R6/lib/X11/fonts/local/"' >> ${xfconfig}
    # Line 206  config_x11() Line 207  config_x11()
    207   fi   fi
    208    
    209   # monitor   # monitor
    210     echo '' >> ${xfconfig}
    211   echo 'Section "Monitor"' >> ${xfconfig}   echo 'Section "Monitor"' >> ${xfconfig}
    212   echo '    Identifier  "Monitor0"' >> ${xfconfig}   echo '    Identifier  "Monitor0"' >> ${xfconfig}
    213   echo '    Option      "DPMS"' >> ${xfconfig}   echo '    Option      "DPMS"' >> ${xfconfig}
    214   echo '' >> ${xfconfig}  
    215     # add hsync, vrefresh
    216     if [[ -x /sbin/ddcxinfo-knoppix ]]
    217     then
    218     echo '' >> ${xfconfig}
    219     echo "    HorizSync $(ddcxinfo-knoppix -hsync)"  >> ${xfconfig}
    220     echo "    VertRefresh $(ddcxinfo-knoppix -vsync)"  >> ${xfconfig}
    221     fi
    222    
    223   # add cvt modelines   # add cvt modelines
    224     echo '' >> ${xfconfig}
    225   local cvt="/usr/X11R6/bin/cvt"   local cvt="/usr/X11R6/bin/cvt"
    226   local modeline   local modeline
    227   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:_.*\":\":')
    228   echo "${modeline}" >> ${xfconfig}   echo "${modeline}" >> ${xfconfig}
    229     # add ddcxinfo-knoppix modelines (fallback)
    230     if [[ -x /sbin/ddcxinfo-knoppix ]]
    231     then
    232     echo '' >> ${xfconfig}
    233     ddcxinfo-knoppix -modelines >> ${xfconfig}
    234     fi
    235   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    236    
    237   # vga   # vga
    238   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    239   echo 'Section "Device"' >> ${xfconfig}   echo 'Section "Device"' >> ${xfconfig}
    240   echo '    Identifier  "vga0"' >> ${xfconfig}   echo '    Identifier  "vga0"' >> ${xfconfig}
    241     # check for openchrome and use it if available
    242     if [[ ${ALX_MODULE} = via ]] && [ -f /usr/X11R6/lib/xorg/modules/drivers/openchrome_drv.so ]
    243     then
    244     ALX_MODULE="openchrome"
    245     fi
    246   echo "    Driver      \"${ALX_MODULE}\"" >> ${xfconfig}   echo "    Driver      \"${ALX_MODULE}\"" >> ${xfconfig}
    247    
    248   # vnc server options   # vnc server options
    Legend:
    Removed from v.1586  
    changed lines
      Added in v.1647