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 2408 by niro, Wed Jun 15 12:54:42 2011 UTC revision 3455 by niro, Fri Apr 13 17:03:05 2012 UTC
    # Line 19  generate_ica_session_file() Line 19  generate_ica_session_file()
    19   local ses_domain   local ses_domain
    20   local ses_password   local ses_password
    21   local ses_browseradrs   local ses_browseradrs
    22     local ses_colors
    23   local CONFIG   local CONFIG
    24    
    25   # very basic getops   # very basic getops
    # Line 31  generate_ica_session_file() Line 32  generate_ica_session_file()
    32   --password) shift; ses_password="$1" ;;   --password) shift; ses_password="$1" ;;
    33   --domain) shift; ses_domain="$1" ;;   --domain) shift; ses_domain="$1" ;;
    34   --server) shift; ses_browseradrs="$1" ;;   --server) shift; ses_browseradrs="$1" ;;
    35     --colordepth) shift; ses_colors="$1" ;;
    36           esac           esac
    37   shift   shift
    38   done   done
    # Line 65  generate_ica_session_file() Line 67  generate_ica_session_file()
    67   addconfig "[${ses_session}]"   addconfig "[${ses_session}]"
    68   addconfig "Address=${ses_session}"   addconfig "Address=${ses_session}"
    69   addconfig "InitialProgram=#${ses_session}"   addconfig "InitialProgram=#${ses_session}"
    70    
    71     # convert to ica session file values
    72     case ${ses_colors} in
    73     24|32) ses_colors="8";;
    74     16) ses_colors="4";;
    75     8) ses_colors="2";;
    76     *) ses_colors="4";; # default to 16bit
    77     esac
    78     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 148  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 172  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 182  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 201  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 213  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 246  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 268  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 276  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 304  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 312  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 329  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 366  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    
    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
    449   # get autostart settings   # get autostart settings
    450   evaluate_table cfg_autostart   evaluate_table cfg_autostart
    451     # get current color depth
    452     evaluate_table cfg_graphic
    453    
    454   # now setup fluxbox for user station   # now setup fluxbox for user station
    455    
    # Line 386  config_sessions() Line 460  config_sessions()
    460   # now generate fluxbox config files   # now generate fluxbox config files
    461    
    462   # fluxbox main config   # fluxbox main config
    463   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    464     then
    465     fbinit="${ALX_SKELETONS}/fluxbox/init"
    466     else
    467     fbinit="/usr/share/fluxbox/init"
    468     fi
    469     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    470    
    471   # fluxbox autostart   # fluxbox autostart
      cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
       
    472   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    473     # do not show decorations on messages generated with xmessage
    474     if [ -x /usr/bin/xmessage ]
    475     then
    476     addconfig '[app] (xmessage)'
    477     addconfig ' [Deco] {NONE}'
    478     addconfig '[end]'
    479     fi
    480     # add icon utility
    481     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    482     # add numlock utility
    483     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    484    
    485   # add screensaver   # add screensaver
    486   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    487   then   then
    # Line 413  config_sessions() Line 503  config_sessions()
    503   fi   fi
    504    
    505   # fluxbox hotkeys   # fluxbox hotkeys
    506   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    507     then
    508     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    509     else
    510     fbkeys="/usr/share/fluxbox/keys"
    511     fi
    512     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    513    
    514   # generate a fluxbox menu   # generate a fluxbox menu
    515   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    # Line 437  config_sessions() Line 533  config_sessions()
    533   --username "${cfg_sessions_username}" \   --username "${cfg_sessions_username}" \
    534   --password "${cfg_sessions_password}" \   --password "${cfg_sessions_password}" \
    535   --domain "${cfg_sessions_domain}" \   --domain "${cfg_sessions_domain}" \
    536   --server "${cfg_sessions_browseradrs}"   --server "${cfg_sessions_browseradrs}" \
    537     --colordepth "${cfg_graphic_depth}"
    538    
    539   # fluxbox menusession   # fluxbox menusession
    540   addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"   addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
    # Line 475  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}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
      chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc  
    630  }  }
    Legend:
    Removed from v.2408  
    changed lines
      Added in v.3455