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 2479 by niro, Mon Jun 27 15:20:33 2011 UTC revision 3490 by niro, Mon Apr 16 10:07:49 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 162  generate_icon() Line 162  generate_icon()
    162   [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"   [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
    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 195  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 231  generate_all_desktop_icons() Line 232  generate_all_desktop_icons()
    232   install -d ${dest}   install -d ${dest}
    233    
    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 246  generate_all_desktop_icons() Line 247  generate_all_desktop_icons()
    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 254  generate_all_desktop_icons() Line 255  generate_all_desktop_icons()
    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 282  generate_all_desktop_icons() Line 283  generate_all_desktop_icons()
    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 290  generate_all_desktop_icons() Line 291  generate_all_desktop_icons()
    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 307  generate_all_desktop_icons() Line 308  generate_all_desktop_icons()
    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   # add shutdown, reboot icons
    364   for i in shutdown reboot   for i in shutdown reboot
    # Line 314  generate_all_desktop_icons() Line 366  generate_all_desktop_icons()
    366   # new line if x > xres   # new line if x > xres
    367   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    368   then   then
    369   x=30   x=50
    370   y=$((${y} + 80))   y=$((${y} + 80))
    371   fi   fi
    372    
    # Line 322  generate_all_desktop_icons() Line 374  generate_all_desktop_icons()
    374   if [ ${y} -ge ${yres} ]   if [ ${y} -ge ${yres} ]
    375   then   then
    376   x=$((${x} + 120))   x=$((${x} + 120))
    377   y=30   y=50
    378    
    379   # re-check x   # re-check x
    380   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
    381   fi   fi
    382    
    383   case ${i} in   case ${i} in
    # Line 339  generate_all_desktop_icons() Line 391  generate_all_desktop_icons()
    391   --icon "${ALX_SESSIONS_ICONS}/${i}.png" \   --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    392   --dest "${dest}/${i}.lnk" \   --dest "${dest}/${i}.lnk" \
    393   --xres "${x}" \   --xres "${x}" \
    394   --yres "${y}"   --yres "${y}" \
    395     --icon-width "40" \
    396     --icon-height "40"
    397    
    398   y=$((${y} + 80))   y=$((${y} + 80))
    399   done   done
    # Line 385  config_sessions() Line 439  config_sessions()
    439    
    440   # get all session ids from database   # get all session ids from database
    441   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}'")
    442   # get all other_menutiem ids from database   # get all other_menuitem ids from database
    443   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}'")
    444     # get all plugin ids from database
    445     all_plugin_ids=$(mysqldo "select id from cfg_plugins where serial='${ALX_SERIAL}'")
    446    
    447   # get screensaver settings   # get screensaver settings
    448   evaluate_table cfg_screensaver   evaluate_table cfg_screensaver
    # Line 516  config_sessions() Line 572  config_sessions()
    572   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}"
    573   done   done
    574    
    575     # add plugins
    576     for i in ${all_plugin_ids}
    577     do
    578     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
    579     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
    580     then
    581     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
    582    
    583     # abort if name or exec is empty
    584     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
    585     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
    586    
    587     # now echo config line for fluxbox-menu
    588     # make it "configureable" :p
    589     if [[ -n ${PLUGIN_MENUITEM_WORKDIR} ]]
    590     then
    591     workdir="--workdir ${PLUGIN_MENUITEM_WORKDIR}"
    592     fi
    593     if [[ -n ${PLUGIN_MENUITEM_ICON} ]]
    594     then
    595     PLUGIN_MENUITEM_ICON="<${PLUGIN_MENUITEM_ICON}>"
    596     fi
    597    
    598     # gen prog startup wrapper
    599     generate_program_sh \
    600     --name "${PLUGIN_MENUITEM_NAME}" \
    601     --exec "${PLUGIN_MENUITEM_EXEC}" \
    602     --param "${PLUGIN_MENUITEM_PARAM}" \
    603     --dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
    604     "${workdir}"
    605    
    606     addconfig "[exec] (${PLUGIN_MENUITEM_NAME}) {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})} ${PLUGIN_MENUITEM_ICON}"
    607     fi
    608    
    609     # unset all variables
    610     unset PLUGIN_MENUITEM_NAME
    611     unset PLUGIN_MENUITEM_EXEC
    612     unset PLUGIN_MENUITEM_PARAM
    613     unset PLUGIN_MENUITEM_WORKDIR
    614     unset PLUGIN_MENUITEM_ICON
    615     done
    616    
    617   # fluxbox menu footer   # fluxbox menu footer
    618   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    619   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    620   addconfig   addconfig
    621    
    622   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
    623   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}" "${all_plugin_ids}"
    624    
    625   # fix permissions   # fix permissions
    626   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    627   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    628   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    629   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
      chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc  
    630  }  }
    Legend:
    Removed from v.2479  
    changed lines
      Added in v.3490