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 2371 by niro, Tue Jun 14 10:42:58 2011 UTC revision 2435 by niro, Thu Jun 16 16:21:11 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     # which utility are we using idesk|xtdesk ?
    163     if [ -x /usr/bin/idesk ]
    164     then
    165     utility="idesk"
    166     [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
    167     else
    168     utility="xtdesk"
    169     [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
    170     fi
    171    
    172   # use some defaults for icon, dest, {x,y}res   # use some defaults for icon, dest, {x,y}res
    173   [[ -z ${xres} ]] && xres=30   [[ -z ${xres} ]] && xres=30
    174   [[ -z ${yres} ]] && xres=30   [[ -z ${yres} ]] && xres=30
      [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"  
    175   if [[ -z ${icon} ]] || [ ! -f ${icon} ]   if [[ -z ${icon} ]] || [ ! -f ${icon} ]
    176   then   then
    177   # if no default icon is given use default.png   # if no default icon is given use default.png
    # Line 162  generate_icon() Line 183  generate_icon()
    183   clearconfig   clearconfig
    184    
    185   addconfig 'table Icon'   addconfig 'table Icon'
    186   addconfig '  Type: Program'   [[ ${utility} = xtdesk ]] && addconfig '  Type: Program'
    187   addconfig "  Caption: ${name}"   addconfig "  Caption: ${name}"
    188   addconfig "  Command: ${command}"   addconfig "  Command: ${command}"
    189   addconfig "  Icon: ${icon}"   addconfig "  Icon: ${icon}"
    # Line 172  generate_icon() Line 193  generate_icon()
    193   # add these only if not zero   # add these only if not zero
    194   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
    195   then   then
    196   addconfig "  IconWidth: ${iwidth}"   if [[ ${utility} = xtdesk ]]
    197   addconfig "  IconHeight: ${iheight}"   then
    198     addconfig "  IconWidth: ${iwidth}"
    199     addconfig "  IconHeight: ${iheight}"
    200     fi
    201     if [[ ${utility} = idesk ]]
    202     then
    203     addconfig "  Width: ${iwidth}"
    204     addconfig "  Height: ${iheight}"
    205     fi
    206   fi   fi
    207    
    208   addconfig 'end'   addconfig 'end'
    # Line 191  generate_all_desktop_icons() Line 220  generate_all_desktop_icons()
    220   local i   local i
    221   local name   local name
    222   local progsh_path   local progsh_path
    223     local utility
    224     local dest
    225     local rc
    226    
    227     # which utility are we using idesk|xtdesk ?
    228     if [ -x /usr/bin/idesk ]
    229     then
    230     utility="idesk"
    231     dest="${ALX_UNPRIV_HOME}/.idesktop"
    232     rc="${ALX_UNPRIV_HOME}/.ideskrc"
    233     else
    234     utility="xtdesk"
    235     dest="${ALX_UNPRIV_HOME}/.xtdesktop"
    236     rc="${ALX_UNPRIV_HOME}/.xtdeskrc"
    237     fi
    238    
    239    
    240   # progsh path   # progsh path
    241   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    # Line 207  generate_all_desktop_icons() Line 252  generate_all_desktop_icons()
    252   xres="$(( ${xres} - 120 ))"   xres="$(( ${xres} - 120 ))"
    253   yres="$(( ${yres} - 80 ))"   yres="$(( ${yres} - 80 ))"
    254    
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    255   # clean desktop icon location   # clean desktop icon location
    256   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${dest} ] && rm -rf ${dest}
    257   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   [ -f ${rc} ] && rm -f ${rc}
    258     install -d ${dest}
    259    
    260    if [[ ${utility} = xtdesk ]]
    261    then
    262     # basic config
    263     cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc
    264    fi
    265    
    266   # default settings   # default settings
    267   declare -i x=30   declare -i x=30
    # Line 248  generate_all_desktop_icons() Line 297  generate_all_desktop_icons()
    297   --name "${cfg_sessions_session}" \   --name "${cfg_sessions_session}" \
    298   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
    299   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
    300   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_sessions_session}).lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
    301   --xres "${x}" \   --xres "${x}" \
    302   --yres "${y}"   --yres "${y}"
    303    
    # Line 282  generate_all_desktop_icons() Line 331  generate_all_desktop_icons()
    331    
    332   generate_icon \   generate_icon \
    333   --name "${cfg_other_menuitems_name}" \   --name "${cfg_other_menuitems_name}" \
    334   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_exec})" \   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    335   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
    336   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
    337   --xres "${x}" \   --xres "${x}" \
    338   --yres "${y}" \   --yres "${y}" \
    339   --default-icon "default_item.png"   --default-icon "default_item.png"
    # Line 314  generate_all_desktop_icons() Line 363  generate_all_desktop_icons()
    363   --name "${sysinfo}" \   --name "${sysinfo}" \
    364   --command "exit 0" \   --command "exit 0" \
    365   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    366   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${dest}/sysinfo.lnk" \
    367   --xres "${xres}" \   --xres "${xres}" \
    368   --yres "${yres}" \   --yres "${yres}" \
    369   --icon-width "1" \   --icon-width "1" \
    # Line 338  config_sessions() Line 387  config_sessions()
    387   evaluate_table cfg_screensaver   evaluate_table cfg_screensaver
    388   # get autostart settings   # get autostart settings
    389   evaluate_table cfg_autostart   evaluate_table cfg_autostart
    390     # get current color depth
    391     evaluate_table cfg_graphic
    392    
    393   # now setup fluxbox for user station   # now setup fluxbox for user station
    394    
    # Line 351  config_sessions() Line 402  config_sessions()
    402   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
    403    
    404   # fluxbox autostart   # fluxbox autostart
      cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
       
    405   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    406     # add icon utility
    407     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    408     [ -x /usr/bin/xtdesk ] && addconfig '[startup] {nohup xtdesk > /dev/null &}'
    409     # add numlock utility
    410     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    411    
    412   # add screensaver   # add screensaver
    413   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    414   then   then
    # Line 399  config_sessions() Line 454  config_sessions()
    454   --username "${cfg_sessions_username}" \   --username "${cfg_sessions_username}" \
    455   --password "${cfg_sessions_password}" \   --password "${cfg_sessions_password}" \
    456   --domain "${cfg_sessions_domain}" \   --domain "${cfg_sessions_domain}" \
    457   --server "${cfg_sessions_browseradrs}"   --server "${cfg_sessions_browseradrs}" \
    458     --colordepth "${cfg_graphic_depth}"
    459    
    460   # fluxbox menusession   # fluxbox menusession
    461   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})}"
    Legend:
    Removed from v.2371  
    changed lines
      Added in v.2435