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 1582 by niro, Tue Nov 23 12:24:14 2010 UTC revision 1620 by niro, Wed Dec 8 11:39:17 2010 UTC
    # Line 39  config_x11() Line 39  config_x11()
    39   local xfconfig   local xfconfig
    40   local HAS_VNC   local HAS_VNC
    41   local HAS_REALVNC   local HAS_REALVNC
    42     local HAS_TIGERVNC
    43    
    44   # xfree or xorg ?   # xfree or xorg ?
    45   xserver="$(readlink /usr/X11R6/bin/X)"   xserver="$(readlink /usr/X11R6/bin/X)"
    # Line 64  config_x11() Line 65  config_x11()
    65   HAS_REALVNC="no"   HAS_REALVNC="no"
    66   fi   fi
    67    
    68     if [ -f /usr/X11R6/lib/xorg/modules/extensions/libvnc.so ]
    69     then
    70     HAS_TIGERVNC="yes"
    71     else
    72     HAS_TIGERVNC="no"
    73     fi
    74    
    75   # show which server we use   # show which server we use
    76   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "
    77    
    # Line 74  config_x11() Line 82  config_x11()
    82   elif [[ ${HAS_REALVNC} = yes ]]   elif [[ ${HAS_REALVNC} = yes ]]
    83   then   then
    84   echo "with realvnc enabled ..."   echo "with realvnc enabled ..."
    85     elif [[ ${HAS_TIGERVNC} = yes ]]
    86     then
    87     echo "with tigervnc enabled ..."
    88   else   else
    89   echo "..."   echo "..."
    90   fi   fi
    # Line 95  config_x11() Line 106  config_x11()
    106    
    107   [[ ${HAS_VNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}   [[ ${HAS_VNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    108   [[ ${HAS_REALVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}   [[ ${HAS_REALVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    109     [[ ${HAS_TIGERVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    110    
    111   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    112    
    # Line 104  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 209  config_x11() Line 222  config_x11()
    222   echo '' >> ${xfconfig}   echo '' >> ${xfconfig}
    223   echo 'Section "Device"' >> ${xfconfig}   echo 'Section "Device"' >> ${xfconfig}
    224   echo '    Identifier  "vga0"' >> ${xfconfig}   echo '    Identifier  "vga0"' >> ${xfconfig}
    225     # check for openchrome and use it if available
    226     if [[ ${ALX_MODULE} = via ]] && [ -f /usr/X11R6/lib/xorg/modules/drivers/openchrome_drv.so ]
    227     then
    228     ALX_MODULE="openchrome"
    229     fi
    230   echo "    Driver      \"${ALX_MODULE}\"" >> ${xfconfig}   echo "    Driver      \"${ALX_MODULE}\"" >> ${xfconfig}
    231    
    232   # vnc server options   # vnc server options
    # Line 247  config_x11() Line 265  config_x11()
    265   echo '        ViewPort    0 0' >> ${xfconfig}   echo '        ViewPort    0 0' >> ${xfconfig}
    266   echo '    EndSubsection' >> ${xfconfig}   echo '    EndSubsection' >> ${xfconfig}
    267    
    268   if [[ ${HAS_REALVNC} = yes ]]   if [[ ${HAS_REALVNC} = yes ]] || [[ ${HAS_TIGERVNC} = yes ]]
    269   then   then
    270   echo '    Option "SecurityTypes" "VncAuth"' >> ${xfconfig}   echo '    Option "SecurityTypes" "VncAuth"' >> ${xfconfig}
    271   echo '    Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}   echo '    Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}
    Legend:
    Removed from v.1582  
    changed lines
      Added in v.1620