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 3503 by niro, Thu Apr 19 12:17:20 2012 UTC
    # Line 78  generate_ica_session_file() Line 78  generate_ica_session_file()
    78   addconfig "DesiredColor=${ses_colors}"   addconfig "DesiredColor=${ses_colors}"
    79   addconfig 'TransportDriver=TCP/IP'   addconfig 'TransportDriver=TCP/IP'
    80   addconfig 'WinStationDriver=ICA 3.0'   addconfig 'WinStationDriver=ICA 3.0'
    81   addconfig "ClearPassword=${ses__password}"   addconfig "ClearPassword=${ses_password}"
    82   addconfig "Username=${ses_username}"   addconfig "Username=${ses_username}"
    83   addconfig "Domain=${ses_domain}"   addconfig "Domain=${ses_domain}"
    84   addconfig 'UseFullScreen=Yes'   addconfig 'UseFullScreen=Yes'
    # 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 212  generate_all_desktop_icons() Line 195  generate_all_desktop_icons()
    195  {  {
    196   local session_list="$1"   local session_list="$1"
    197   local other_menuitem_list="$2"   local other_menuitem_list="$2"
    198     local plugin_list="$3"
    199   local res   local res
    200   local xres   local xres
    201   local yres   local yres
    # Line 224  generate_all_desktop_icons() Line 208  generate_all_desktop_icons()
    208   local dest   local dest
    209   local rc   local rc
    210    
    211   # which utility are we using idesk|xtdesk ?   dest="${ALX_UNPRIV_HOME}/.idesktop"
    212   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  
       
    213    
    214   # progsh path   # progsh path
    215   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    # Line 257  generate_all_desktop_icons() Line 231  generate_all_desktop_icons()
    231   [ -f ${rc} ] && rm -f ${rc}   [ -f ${rc} ] && rm -f ${rc}
    232   install -d ${dest}   install -d ${dest}
    233    
     if [[ ${utility} = xtdesk ]]  
     then  
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc  
     fi  
       
    234   # default settings   # default settings
    235   declare -i x=30   declare -i x=50
    236   declare -i y=30   declare -i y=50
    237    
    238   # ica icons   # ica icons
    239   for i in ${session_list}   for i in ${session_list}
    # Line 279  fi Line 247  fi
    247   # new line if x > xres   # new line if x > xres
    248   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    249   then   then
    250   x=30   x=50
    251   y=$((${y} + 80))   y=$((${y} + 80))
    252   fi   fi
    253    
    # Line 287  fi Line 255  fi
    255   if [ ${y} -ge ${yres} ]   if [ ${y} -ge ${yres} ]
    256   then   then
    257   x=$((${x} + 120))   x=$((${x} + 120))
    258   y=30   y=50
    259    
    260   # re-check x   # re-check x
    261   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
    262   fi   fi
    263    
    264   generate_icon \   generate_icon \
    # Line 315  fi Line 283  fi
    283   # new line if x > xres   # new line if x > xres
    284   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    285   then   then
    286   x=30   x=50
    287   y=$((${y} + 80))   y=$((${y} + 80))
    288   fi   fi
    289    
    # Line 323  fi Line 291  fi
    291   if [ ${y} -ge ${yres} ]   if [ ${y} -ge ${yres} ]
    292   then   then
    293   x=$((${x} + 120))   x=$((${x} + 120))
    294   y=30   y=50
    295    
    296   # re-check x   # re-check x
    297   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
    298   fi   fi
    299    
    300   generate_icon \   generate_icon \
    # Line 340  fi Line 308  fi
    308    
    309   y=$((${y} + 80))   y=$((${y} + 80))
    310   done   done
    311    
    312     for i in ${plugin_list}
    313     do
    314     # abort if empty
    315     [[ -z ${i} ]] && continue
    316    
    317     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
    318     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
    319     then
    320     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
    321    
    322     # abort if name or exec is empty
    323     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
    324     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
    325    
    326     # new line if x > xres
    327     if [ ${x} -ge ${xres} ]
    328     then
    329     x=50
    330     y=$((${y} + 80))
    331     fi
    332    
    333     # new row if y > yres
    334     if [ ${y} -ge ${yres} ]
    335     then
    336     x=$((${x} + 120))
    337     y=50
    338    
    339     # re-check x
    340     [ ${x} -ge ${xres} ] && x=50
    341     fi
    342    
    343     generate_icon \
    344     --name "${PLUGIN_MENUITEM_NAME}" \
    345     --command "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
    346     --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).png" \
    347     --dest "${dest}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).lnk" \
    348     --xres "${x}" \
    349     --yres "${y}" \
    350     --default-icon "default_item.png"
    351    
    352     y=$((${y} + 80))
    353     fi
    354    
    355     # unset all variables
    356     unset PLUGIN_MENUITEM_NAME
    357     unset PLUGIN_MENUITEM_EXEC
    358     unset PLUGIN_MENUITEM_PARAM
    359     unset PLUGIN_MENUITEM_WORKDIR
    360     unset PLUGIN_MENUITEM_ICON
    361     done
    362    
    363     # add shutdown, reboot icons
    364     for i in shutdown reboot
    365     do
    366     # new line if x > xres
    367     if [ ${x} -ge ${xres} ]
    368     then
    369     x=50
    370     y=$((${y} + 80))
    371     fi
    372    
    373     # new row if y > yres
    374     if [ ${y} -ge ${yres} ]
    375     then
    376     x=$((${x} + 120))
    377     y=50
    378    
    379     # re-check x
    380     [ ${x} -ge ${xres} ] && x=50
    381     fi
    382    
    383     case ${i} in
    384     shutdown) name="Herunterfahren" ;;
    385     reboot) name="Neustarten" ;;
    386     esac
    387    
    388     generate_icon \
    389     --name "${name}" \
    390     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    391     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    392     --dest "${dest}/${i}.lnk" \
    393     --xres "${x}" \
    394     --yres "${y}" \
    395     --icon-width "40" \
    396     --icon-height "40"
    397    
    398     y=$((${y} + 80))
    399     done
    400    
    401   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    402   local sysinfo   local sysinfo
    # Line 377  config_sessions() Line 434  config_sessions()
    434   local all_other_ids   local all_other_ids
    435   local CONFIG   local CONFIG
    436   local screensaver_passwd_cmd   local screensaver_passwd_cmd
    437     local fbinit
    438     local fbkeys
    439     local progsh_path
    440    
    441     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    442    
    443   # get all session ids from database   # get all session ids from database
    444   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}'")
    445   # get all other_menutiem ids from database   # get all other_menuitem ids from database
    446   all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")   all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
    447     # get all plugin ids from database
    448     all_plugin_ids=$(mysqldo "select id from cfg_plugins where serial='${ALX_SERIAL}'")
    449    
    450   # get screensaver settings   # get screensaver settings
    451   evaluate_table cfg_screensaver   evaluate_table cfg_screensaver
    # Line 399  config_sessions() Line 463  config_sessions()
    463   # now generate fluxbox config files   # now generate fluxbox config files
    464    
    465   # fluxbox main config   # fluxbox main config
    466   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    467     then
    468     fbinit="${ALX_SKELETONS}/fluxbox/init"
    469     else
    470     fbinit="/usr/share/fluxbox/init"
    471     fi
    472     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    473    
    474   # fluxbox autostart   # fluxbox autostart
    475   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    476     # do not show decorations on messages generated with xmessage
    477     if [ -x /usr/bin/xmessage ]
    478     then
    479     addconfig '[app] (xmessage)'
    480     addconfig ' [Deco] {NONE}'
    481     addconfig '[end]'
    482     fi
    483   # add icon utility   # add icon utility
    484   [ -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 &}'  
    485   # add numlock utility   # add numlock utility
    486   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'   [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    487    
    488   # add screensaver   # add screensaver
    489   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    # Line 422  config_sessions() Line 498  config_sessions()
    498   addconfig "[startup] {nohup xautolock -time ${cfg_screensaver_timeout} -locker 'xlock -mode ${cfg_screensaver_screensaver} ${screensaver_passwd_cmd}' > /dev/null &}"   addconfig "[startup] {nohup xautolock -time ${cfg_screensaver_timeout} -locker 'xlock -mode ${cfg_screensaver_screensaver} ${screensaver_passwd_cmd}' > /dev/null &}"
    499   fi   fi
    500    
    501     # add plugins autostart
    502     for i in ${all_plugin_ids}
    503     do
    504     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
    505     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
    506     then
    507     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh autostart)
    508    
    509     if [[ ${PLUGIN_AUTOSTART} = 1 ]]
    510     then
    511     addconfig "[startup] {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}) &}"
    512     fi
    513     fi
    514     done
    515    
    516   # add autostart session   # add autostart session
    517   if [[ ! -z ${cfg_autostart_session} ]]   if [[ ! -z ${cfg_autostart_session} ]]
    518   then   then
    # Line 430  config_sessions() Line 521  config_sessions()
    521   fi   fi
    522    
    523   # fluxbox hotkeys   # fluxbox hotkeys
    524   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    525     then
    526     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    527     else
    528     fbkeys="/usr/share/fluxbox/keys"
    529     fi
    530     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    531    
    532   # generate a fluxbox menu   # generate a fluxbox menu
    533   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    # Line 462  config_sessions() Line 559  config_sessions()
    559   done   done
    560    
    561   # delete all progs   # delete all progs
      progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"  
    562   [ -d ${progsh_path} ] && rm -rf ${progsh_path}   [ -d ${progsh_path} ] && rm -rf ${progsh_path}
    563   install -d ${progsh_path}   install -d ${progsh_path}
    564    
    # Line 493  config_sessions() Line 589  config_sessions()
    589   addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"   addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
    590   done   done
    591    
    592     # add plugins
    593     for i in ${all_plugin_ids}
    594     do
    595     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
    596     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
    597     then
    598     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
    599    
    600     # abort if name or exec is empty
    601     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
    602     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
    603    
    604     # now echo config line for fluxbox-menu
    605     # make it "configureable" :p
    606     if [[ -n ${PLUGIN_MENUITEM_WORKDIR} ]]
    607     then
    608     workdir="--workdir ${PLUGIN_MENUITEM_WORKDIR}"
    609     fi
    610     if [[ -n ${PLUGIN_MENUITEM_ICON} ]]
    611     then
    612     PLUGIN_MENUITEM_ICON="<${PLUGIN_MENUITEM_ICON}>"
    613     fi
    614    
    615     # gen prog startup wrapper
    616     generate_program_sh \
    617     --name "${PLUGIN_MENUITEM_NAME}" \
    618     --exec "${PLUGIN_MENUITEM_EXEC}" \
    619     --param "${PLUGIN_MENUITEM_PARAM}" \
    620     --dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
    621     "${workdir}"
    622    
    623     addconfig "[exec] (${PLUGIN_MENUITEM_NAME}) {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})} ${PLUGIN_MENUITEM_ICON}"
    624     fi
    625    
    626     # unset all variables
    627     unset PLUGIN_MENUITEM_NAME
    628     unset PLUGIN_MENUITEM_EXEC
    629     unset PLUGIN_MENUITEM_PARAM
    630     unset PLUGIN_MENUITEM_WORKDIR
    631     unset PLUGIN_MENUITEM_ICON
    632     done
    633    
    634   # fluxbox menu footer   # fluxbox menu footer
    635   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    636   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    637   addconfig   addconfig
    638    
    639   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
    640   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}" "${all_plugin_ids}"
    641    
    642   # fix permissions   # fix permissions
    643   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    644   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    645   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    646   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
      chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc  
    647  }  }
    Legend:
    Removed from v.2435  
    changed lines
      Added in v.3503