Magellan Linux

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

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

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

    revision 2435 by niro, Thu Jun 16 16:21:11 2011 UTC revision 2454 by niro, Mon Jun 27 12:47:25 2011 UTC
    # Line 159  generate_icon() Line 159  generate_icon()
    159   [[ -z ${name} ]] && return 1   [[ -z ${name} ]] && return 1
    160   [[ -z ${command} ]] && return 1   [[ -z ${command} ]] && return 1
    161    
    162   # which utility are we using idesk|xtdesk ?   [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
      if [ -x /usr/bin/idesk ]  
      then  
      utility="idesk"  
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"  
      else  
      utility="xtdesk"  
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"  
      fi  
    163    
    164   # use some defaults for icon, dest, {x,y}res   # use some defaults for icon, dest, {x,y}res
    165   [[ -z ${xres} ]] && xres=30   [[ -z ${xres} ]] && xres=30
    # Line 183  generate_icon() Line 175  generate_icon()
    175   clearconfig   clearconfig
    176    
    177   addconfig 'table Icon'   addconfig 'table Icon'
      [[ ${utility} = xtdesk ]] && addconfig '  Type: Program'  
    178   addconfig "  Caption: ${name}"   addconfig "  Caption: ${name}"
    179   addconfig "  Command: ${command}"   addconfig "  Command: ${command}"
    180   addconfig "  Icon: ${icon}"   addconfig "  Icon: ${icon}"
    # Line 193  generate_icon() Line 184  generate_icon()
    184   # add these only if not zero   # add these only if not zero
    185   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
    186   then   then
    187   if [[ ${utility} = xtdesk ]]   addconfig "  Width: ${iwidth}"
    188   then   addconfig "  Height: ${iheight}"
      addconfig "  IconWidth: ${iwidth}"  
      addconfig "  IconHeight: ${iheight}"  
      fi  
      if [[ ${utility} = idesk ]]  
      then  
      addconfig "  Width: ${iwidth}"  
      addconfig "  Height: ${iheight}"  
      fi  
    189   fi   fi
    190    
    191   addconfig 'end'   addconfig 'end'
    # Line 224  generate_all_desktop_icons() Line 207  generate_all_desktop_icons()
    207   local dest   local dest
    208   local rc   local rc
    209    
    210   # which utility are we using idesk|xtdesk ?   dest="${ALX_UNPRIV_HOME}/.idesktop"
    211   if [ -x /usr/bin/idesk ]   rc="${ALX_UNPRIV_HOME}/.ideskrc"
      then  
      utility="idesk"  
      dest="${ALX_UNPRIV_HOME}/.idesktop"  
      rc="${ALX_UNPRIV_HOME}/.ideskrc"  
      else  
      utility="xtdesk"  
      dest="${ALX_UNPRIV_HOME}/.xtdesktop"  
      rc="${ALX_UNPRIV_HOME}/.xtdeskrc"  
      fi  
       
    212    
    213   # progsh path   # progsh path
    214   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    # Line 257  generate_all_desktop_icons() Line 230  generate_all_desktop_icons()
    230   [ -f ${rc} ] && rm -f ${rc}   [ -f ${rc} ] && rm -f ${rc}
    231   install -d ${dest}   install -d ${dest}
    232    
     if [[ ${utility} = xtdesk ]]  
     then  
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc  
     fi  
       
    233   # default settings   # default settings
    234   declare -i x=30   declare -i x=30
    235   declare -i y=30   declare -i y=30
    # Line 403  config_sessions() Line 370  config_sessions()
    370    
    371   # fluxbox autostart   # fluxbox autostart
    372   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    373     # do not show decorations on messages generated with xmessage
    374     if [ -x /usr/bin/xmessage ]
    375     then
    376     addconfig '[app] (xmessage)'
    377     addconfig ' [Deco] {NONE}'
    378     addconfig '[end]'
    379     fi
    380   # add icon utility   # add icon utility
    381   [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'   [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
      [ -x /usr/bin/xtdesk ] && addconfig '[startup] {nohup xtdesk > /dev/null &}'  
    382   # add numlock utility   # add numlock utility
    383   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    384    
    385   # add screensaver   # add screensaver
    386   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    # Line 505  config_sessions() Line 478  config_sessions()
    478   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    479   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    480   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    481   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    482   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
    483  }  }
    Legend:
    Removed from v.2435  
    changed lines
      Added in v.2454