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 2161 by niro, Wed May 18 14:35:13 2011 UTC revision 2469 by niro, Mon Jun 27 15:07:00 2011 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}"
    # Line 123  generate_icon() Line 134  generate_icon()
    134   local iheight   local iheight
    135   local deficon   local deficon
    136   local CONFIG   local CONFIG
    137     local utility
    138    
    139   # very basic getops   # very basic getops
    140   for i in $*   for i in $*
    # Line 142  generate_icon() Line 154  generate_icon()
    154   done   done
    155    
    156   # some sanity checks:   # some sanity checks:
    157    
    158   # abort if name or command not given   # abort if name or command not given
    159   [[ -z ${name} ]] && return 1   [[ -z ${name} ]] && return 1
    160   [[ -z ${command} ]] && return 1   [[ -z ${command} ]] && return 1
    161    
    162     [[ -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=30
    166   [[ -z ${yres} ]] && xres=30   [[ -z ${yres} ]] && xres=30
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"  
    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 162  generate_icon() Line 175  generate_icon()
    175   clearconfig   clearconfig
    176    
    177   addconfig 'table Icon'   addconfig 'table Icon'
      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 172  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   addconfig "  IconWidth: ${iwidth}"   addconfig "  Width: ${iwidth}"
    188   addconfig "  IconHeight: ${iheight}"   addconfig "  Height: ${iheight}"
    189   fi   fi
    190    
    191   addconfig 'end'   addconfig 'end'
    # Line 191  generate_all_desktop_icons() Line 203  generate_all_desktop_icons()
    203   local i   local i
    204   local name   local name
    205   local progsh_path   local progsh_path
    206     local utility
    207     local dest
    208     local rc
    209    
    210     dest="${ALX_UNPRIV_HOME}/.idesktop"
    211     rc="${ALX_UNPRIV_HOME}/.ideskrc"
    212    
    213   # progsh path   # progsh path
    214   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    # Line 200  generate_all_desktop_icons() Line 218  generate_all_desktop_icons()
    218    
    219   # split res to x & y   # split res to x & y
    220   xres="${res%x*}"   xres="${res%x*}"
    221   xres="${res#*x}"   yres="${res#*x}"
    222    
    223   # top left edge of the icon is given in config file   # top left edge of the icon is given in config file
    224   # remove a little bit to simulate the bottom-right edge   # remove a little bit to simulate the bottom-right edge
    225   xres="$(( ${xres} - 120 ))"   xres="$(( ${xres} - 120 ))"
    226   yres="$(( ${yres} - 80 ))"   yres="$(( ${yres} - 80 ))"
    227    
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    228   # clean desktop icon location   # clean desktop icon location
    229   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${dest} ] && rm -rf ${dest}
    230   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   [ -f ${rc} ] && rm -f ${rc}
    231     install -d ${dest}
    232    
    233   # default settings   # default settings
    234   declare -i x=30   declare -i x=30
    # Line 245  generate_all_desktop_icons() Line 261  generate_all_desktop_icons()
    261   fi   fi
    262    
    263   generate_icon \   generate_icon \
    264   --name "${cfg_session_session}" \   --name "${cfg_sessions_session}" \
    265   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_session_filename})" \   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
    266   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_session_session}).png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
    267   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_session_session}).lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
    268   --xres "${x}" \   --xres "${x}" \
    269   --yres "${y}"   --yres "${y}"
    270    
    # Line 282  generate_all_desktop_icons() Line 298  generate_all_desktop_icons()
    298    
    299   generate_icon \   generate_icon \
    300   --name "${cfg_other_menuitems_name}" \   --name "${cfg_other_menuitems_name}" \
    301   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_exec})" \   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    302   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
    303   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
    304   --xres "${x}" \   --xres "${x}" \
    305   --yres "${y}" \   --yres "${y}" \
    306   --default-icon "default_item.png"   --default-icon "default_item.png"
    # Line 292  generate_all_desktop_icons() Line 308  generate_all_desktop_icons()
    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     # abort if empty
    315     [[ -z ${i} ]] && continue
    316    
    317     # new line if x > xres
    318     if [ ${x} -ge ${xres} ]
    319     then
    320     x=30
    321     y=$((${y} + 80))
    322     fi
    323    
    324     # new row if y > yres
    325     if [ ${y} -ge ${yres} ]
    326     then
    327     x=$((${x} + 120))
    328     y=30
    329    
    330     # re-check x
    331     [ ${x} -ge ${xres} ] && x=30
    332     fi
    333    
    334     case ${i} in
    335     shutdown) name="Herunterfahren"
    336     reboot) name="Neustarten"
    337     esac
    338    
    339     generate_icon \
    340     --name "${name}" \
    341     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    342     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    343     --dest "${dest}/${i}.lnk" \
    344     --xres "${x}" \
    345     --yres "${y}"
    346    
    347     y=$((${y} + 80))
    348     done
    349    
    350   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    351   local sysinfo   local sysinfo
    352   local hostname   local hostname
    # Line 314  generate_all_desktop_icons() Line 369  generate_all_desktop_icons()
    369   --name "${sysinfo}" \   --name "${sysinfo}" \
    370   --command "exit 0" \   --command "exit 0" \
    371   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    372   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${dest}/sysinfo.lnk" \
    373   --xres "${xres}" \   --xres "${xres}" \
    374   --yres "${yres}" \   --yres "${yres}" \
    375   --icon-width "1" \   --icon-width "1" \
    # Line 328  config_sessions() Line 383  config_sessions()
    383   local all_other_ids   local all_other_ids
    384   local CONFIG   local CONFIG
    385   local screensaver_passwd_cmd   local screensaver_passwd_cmd
    386     local fbinit
    387     local fbkeys
    388    
    389   # get all session ids from database   # get all session ids from database
    390   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 338  config_sessions() Line 395  config_sessions()
    395   evaluate_table cfg_screensaver   evaluate_table cfg_screensaver
    396   # get autostart settings   # get autostart settings
    397   evaluate_table cfg_autostart   evaluate_table cfg_autostart
    398     # get current color depth
    399     evaluate_table cfg_graphic
    400    
    401   # now setup fluxbox for user station   # now setup fluxbox for user station
    402    
    # Line 348  config_sessions() Line 407  config_sessions()
    407   # now generate fluxbox config files   # now generate fluxbox config files
    408    
    409   # fluxbox main config   # fluxbox main config
    410   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    411     then
    412     fbinit="${ALX_SKELETONS}/fluxbox/init"
    413     else
    414     fbinit="/usr/share/fluxbox/init"
    415     fi
    416     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    417    
    418   # fluxbox autostart   # fluxbox autostart
      cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
       
    419   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    420     # do not show decorations on messages generated with xmessage
    421     if [ -x /usr/bin/xmessage ]
    422     then
    423     addconfig '[app] (xmessage)'
    424     addconfig ' [Deco] {NONE}'
    425     addconfig '[end]'
    426     fi
    427     # add icon utility
    428     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    429     # add numlock utility
    430     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    431    
    432   # add screensaver   # add screensaver
    433   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    434   then   then
    # Line 370  config_sessions() Line 445  config_sessions()
    445   # add autostart session   # add autostart session
    446   if [[ ! -z ${cfg_autostart_session} ]]   if [[ ! -z ${cfg_autostart_session} ]]
    447   then   then
    448   addconfig "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"   # sleep one second to wait until busybox is fully initialized and the screen is really centered
    449     addconfig "[startup] {sleep 1 && nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
    450   fi   fi
    451    
    452   # fluxbox hotkeys   # fluxbox hotkeys
    453   cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    454     then
    455     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    456     else
    457     fbkeys="/usr/share/fluxbox/keys"
    458     fi
    459     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    460    
    461   # generate a fluxbox menu   # generate a fluxbox menu
    462   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    # Line 398  config_sessions() Line 480  config_sessions()
    480   --username "${cfg_sessions_username}" \   --username "${cfg_sessions_username}" \
    481   --password "${cfg_sessions_password}" \   --password "${cfg_sessions_password}" \
    482   --domain "${cfg_sessions_domain}" \   --domain "${cfg_sessions_domain}" \
    483   --server "${cfg_sessions_browseradrs}"   --server "${cfg_sessions_browseradrs}" \
    484     --colordepth "${cfg_graphic_depth}"
    485    
    486   # fluxbox menusession   # fluxbox menusession
    487   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 448  config_sessions() Line 531  config_sessions()
    531   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    532   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    533   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    534   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    535   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
    536  }  }
    Legend:
    Removed from v.2161  
    changed lines
      Added in v.2469