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 1582 by niro, Tue Nov 23 12:24:14 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
    58   local HAS_REALVNC   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)"
    # Line 64  config_x11() Line 82  config_x11()
    82   HAS_REALVNC="no"   HAS_REALVNC="no"
    83   fi   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   # show which server we use
    93   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "   echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "
    94    
    # Line 74  config_x11() Line 99  config_x11()
    99   elif [[ ${HAS_REALVNC} = yes ]]   elif [[ ${HAS_REALVNC} = yes ]]
    100   then   then
    101   echo "with realvnc enabled ..."   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
    # Line 95  config_x11() Line 123  config_x11()
    123    
    124   [[ ${HAS_VNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}   [[ ${HAS_VNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    125   [[ ${HAS_REALVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}   [[ ${HAS_REALVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    126     [[ ${HAS_TIGERVNC} = yes ]] && echo '    Load       "vnc"' >> ${xfconfig}
    127    
    128   echo 'EndSection' >> ${xfconfig}   echo 'EndSection' >> ${xfconfig}
    129    
    # Line 104  config_x11() Line 133  config_x11()
    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 '    FontPath   "/usr/share/fonts/TrueType/"' >> ${xfconfig}   [[ -f /usr/share/fonts/100dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/100dpi/:unscaled"' >> ${xfconfig}
    141   echo '    FontPath   "/usr/share/fonts/freefont/"' >> ${xfconfig}   [[ -f /usr/share/fonts/TrueType/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/TrueType/"' >> ${xfconfig}
    142   echo '    FontPath   "/usr/share/fonts/75dpi/"' >> ${xfconfig}   [[ -f /usr/share/fonts/freefont/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/freefont/"' >> ${xfconfig}
    143   echo '    FontPath   "/usr/share/fonts/100dpi/"' >> ${xfconfig}   [[ -f /usr/share/fonts/75dpi/fonts.dir ]] && echo '    FontPath   "/usr/share/fonts/75dpi/"' >> ${xfconfig}
    144     [[ -f /usr/share/fonts/100dpi/fonts.dir ]] && 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}
    # Line 171  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 194  config_x11() Line 226  config_x11()
    226   fi   fi
    227    
    228   # monitor   # monitor
    229     echo '' >> ${xfconfig}
    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)
    255     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
    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
    # Line 247  config_x11() Line 306  config_x11()
    306   echo '        ViewPort    0 0' >> ${xfconfig}   echo '        ViewPort    0 0' >> ${xfconfig}
    307   echo '    EndSubsection' >> ${xfconfig}   echo '    EndSubsection' >> ${xfconfig}
    308    
    309   if [[ ${HAS_REALVNC} = yes ]]   if [[ ${HAS_REALVNC} = yes ]] || [[ ${HAS_TIGERVNC} = yes ]]
    310   then   then
    311   echo '    Option "SecurityTypes" "VncAuth"' >> ${xfconfig}   echo '    Option "SecurityTypes" "VncAuth"' >> ${xfconfig}
    312   echo '    Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}   echo '    Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}
    Legend:
    Removed from v.1582  
    changed lines
      Added in v.1800