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 2565 by niro, Mon Jul 4 20:17: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=50
    166   [[ -z ${yres} ]] && xres=30   [[ -z ${yres} ]] && xres=50
    167   if [[ -z ${icon} ]] || [ ! -f ${icon} ]   if [[ -z ${icon} ]] || [ ! -f ${icon} ]
    168   then   then
    169   # if no default icon is given use default.png   # if no default icon is given use default.png
    # 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=50
    235   declare -i y=30   declare -i y=50
    236    
    237   # ica icons   # ica icons
    238   for i in ${session_list}   for i in ${session_list}
    # Line 279  fi Line 246  fi
    246   # new line if x > xres   # new line if x > xres
    247   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    248   then   then
    249   x=30   x=50
    250   y=$((${y} + 80))   y=$((${y} + 80))
    251   fi   fi
    252    
    # Line 287  fi Line 254  fi
    254   if [ ${y} -ge ${yres} ]   if [ ${y} -ge ${yres} ]
    255   then   then
    256   x=$((${x} + 120))   x=$((${x} + 120))
    257   y=30   y=50
    258    
    259   # re-check x   # re-check x
    260   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
    261   fi   fi
    262    
    263   generate_icon \   generate_icon \
    # Line 315  fi Line 282  fi
    282   # new line if x > xres   # new line if x > xres
    283   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    284   then   then
    285   x=30   x=50
    286   y=$((${y} + 80))   y=$((${y} + 80))
    287   fi   fi
    288    
    # Line 323  fi Line 290  fi
    290   if [ ${y} -ge ${yres} ]   if [ ${y} -ge ${yres} ]
    291   then   then
    292   x=$((${x} + 120))   x=$((${x} + 120))
    293   y=30   y=50
    294    
    295   # re-check x   # re-check x
    296   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
    297   fi   fi
    298    
    299   generate_icon \   generate_icon \
    # Line 341  fi Line 308  fi
    308   y=$((${y} + 80))   y=$((${y} + 80))
    309   done   done
    310    
    311     # add shutdown, reboot icons
    312     for i in shutdown reboot
    313     do
    314     # new line if x > xres
    315     if [ ${x} -ge ${xres} ]
    316     then
    317     x=50
    318     y=$((${y} + 80))
    319     fi
    320    
    321     # new row if y > yres
    322     if [ ${y} -ge ${yres} ]
    323     then
    324     x=$((${x} + 120))
    325     y=50
    326    
    327     # re-check x
    328     [ ${x} -ge ${xres} ] && x=50
    329     fi
    330    
    331     case ${i} in
    332     shutdown) name="Herunterfahren" ;;
    333     reboot) name="Neustarten" ;;
    334     esac
    335    
    336     generate_icon \
    337     --name "${name}" \
    338     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    339     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    340     --dest "${dest}/${i}.lnk" \
    341     --xres "${x}" \
    342     --yres "${y}" \
    343     --icon-width "40" \
    344     --icon-height "40"
    345    
    346     y=$((${y} + 80))
    347     done
    348    
    349   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    350   local sysinfo   local sysinfo
    351   local hostname   local hostname
    # Line 377  config_sessions() Line 382  config_sessions()
    382   local all_other_ids   local all_other_ids
    383   local CONFIG   local CONFIG
    384   local screensaver_passwd_cmd   local screensaver_passwd_cmd
    385     local fbinit
    386     local fbkeys
    387    
    388   # get all session ids from database   # get all session ids from database
    389   all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")   all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
    # Line 399  config_sessions() Line 406  config_sessions()
    406   # now generate fluxbox config files   # now generate fluxbox config files
    407    
    408   # fluxbox main config   # fluxbox main config
    409   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    410     then
    411     fbinit="${ALX_SKELETONS}/fluxbox/init"
    412     else
    413     fbinit="/usr/share/fluxbox/init"
    414     fi
    415     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    416    
    417   # fluxbox autostart   # fluxbox autostart
    418   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    419     # do not show decorations on messages generated with xmessage
    420     if [ -x /usr/bin/xmessage ]
    421     then
    422     addconfig '[app] (xmessage)'
    423     addconfig ' [Deco] {NONE}'
    424     addconfig '[end]'
    425     fi
    426   # add icon utility   # add icon utility
    427   [ -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 &}'  
    428   # add numlock utility   # add numlock utility
    429   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    430    
    431   # add screensaver   # add screensaver
    432   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    # Line 430  config_sessions() Line 449  config_sessions()
    449   fi   fi
    450    
    451   # fluxbox hotkeys   # fluxbox hotkeys
    452   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    453     then
    454     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    455     else
    456     fbkeys="/usr/share/fluxbox/keys"
    457     fi
    458     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    459    
    460   # generate a fluxbox menu   # generate a fluxbox menu
    461   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    # Line 505  config_sessions() Line 530  config_sessions()
    530   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    531   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    532   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    533   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    534   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
    535  }  }
    Legend:
    Removed from v.2435  
    changed lines
      Added in v.2565