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 2611 by niro, Wed Jul 6 21:34:49 2011 UTC revision 3504 by niro, Thu Apr 19 13:27:58 2012 UTC
    # 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 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 384  config_sessions() Line 436  config_sessions()
    436   local screensaver_passwd_cmd   local screensaver_passwd_cmd
    437   local fbinit   local fbinit
    438   local fbkeys   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 441  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     # unset all variables
    514     unset PLUGIN_AUTOSTART
    515     unset PLUGIN_MENUITEM_NAME
    516     fi
    517     done
    518    
    519   # add autostart session   # add autostart session
    520   if [[ ! -z ${cfg_autostart_session} ]]   if [[ ! -z ${cfg_autostart_session} ]]
    521   then   then
    # Line 487  config_sessions() Line 562  config_sessions()
    562   done   done
    563    
    564   # delete all progs   # delete all progs
      progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"  
    565   [ -d ${progsh_path} ] && rm -rf ${progsh_path}   [ -d ${progsh_path} ] && rm -rf ${progsh_path}
    566   install -d ${progsh_path}   install -d ${progsh_path}
    567    
    # Line 518  config_sessions() Line 592  config_sessions()
    592   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}"
    593   done   done
    594    
    595     # add plugins
    596     for i in ${all_plugin_ids}
    597     do
    598     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
    599     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
    600     then
    601     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
    602    
    603     # abort if name or exec is empty
    604     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
    605     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
    606    
    607     # now echo config line for fluxbox-menu
    608     # make it "configureable" :p
    609     if [[ -n ${PLUGIN_MENUITEM_WORKDIR} ]]
    610     then
    611     workdir="--workdir ${PLUGIN_MENUITEM_WORKDIR}"
    612     fi
    613     if [[ -n ${PLUGIN_MENUITEM_ICON} ]]
    614     then
    615     PLUGIN_MENUITEM_ICON="<${PLUGIN_MENUITEM_ICON}>"
    616     fi
    617    
    618     # gen prog startup wrapper
    619     generate_program_sh \
    620     --name "${PLUGIN_MENUITEM_NAME}" \
    621     --exec "${PLUGIN_MENUITEM_EXEC}" \
    622     --param "${PLUGIN_MENUITEM_PARAM}" \
    623     --dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
    624     "${workdir}"
    625    
    626     addconfig "[exec] (${PLUGIN_MENUITEM_NAME}) {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})} ${PLUGIN_MENUITEM_ICON}"
    627     fi
    628    
    629     # unset all variables
    630     unset PLUGIN_MENUITEM_NAME
    631     unset PLUGIN_MENUITEM_EXEC
    632     unset PLUGIN_MENUITEM_PARAM
    633     unset PLUGIN_MENUITEM_WORKDIR
    634     unset PLUGIN_MENUITEM_ICON
    635     done
    636    
    637   # fluxbox menu footer   # fluxbox menu footer
    638   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    639   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    640   addconfig   addconfig
    641    
    642   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
    643   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}" "${all_plugin_ids}"
    644    
    645   # fix permissions   # fix permissions
    646   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    647   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    648   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    649   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
      chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc  
    650  }  }
    Legend:
    Removed from v.2611  
    changed lines
      Added in v.3504