/[alx-svn]/alx-src/branches/alxconf-060/functions/config_sessions.sh

Diff of /alx-src/branches/alxconf-060/functions/config_sessions.sh

Parent Directory | Revision Log | View Patch Patch

-revision 2381 by niro,
Tue Jun 14 13:51:20 2011 UTC
+revision 2454 by niro,
Mon Jun 27 12:47:25 2011 UTC
 Line 19 
 generate_ica_session_file()
  	local ses_domain
  	local ses_password
  	local ses_browseradrs
+ 	local ses_colors
  	local CONFIG
  	# very basic getops
-Line 31 
 generate_ica_session_file()
+Line 32 
 generate_ica_session_file()
  			--password) shift; ses_password="$1" ;;
  			--domain) shift; ses_domain="$1" ;;
  			--server) shift; ses_browseradrs="$1" ;;
+ 			--colordepth) shift; ses_colors="$1" ;;
          	esac
  		shift
  	done
-Line 65 
 generate_ica_session_file()
+Line 67 
 generate_ica_session_file()
  	addconfig "[${ses_session}]"
  	addconfig "Address=${ses_session}"
  	addconfig "InitialProgram=#${ses_session}"
+ 	# convert to ica session file values
+ 	case ${ses_colors} in
+|32) ses_colors="8";;
+) ses_colors="4";;
+) ses_colors="2";;
+ 		*) ses_colors="4";; # default to 16bit
+ 	esac
+ 	addconfig "DesiredColor=${ses_colors}"
  	addconfig 'TransportDriver=TCP/IP'
  	addconfig 'WinStationDriver=ICA 3.0'
  	addconfig "ClearPassword=${ses__password}"
-Line 123 
 generate_icon()
+Line 134 
 generate_icon()
  	local iheight
  	local deficon
  	local CONFIG
+ 	local utility
  	# very basic getops
  	for i in $*
-Line 142 
 generate_icon()
+Line 154 
 generate_icon()
  	done
  	# some sanity checks:
  	# abort if name or command not given
  	[[ -z ${name} ]] && return 1
  	[[ -z ${command} ]] && return 1
+ 	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
  	# use some defaults for icon, dest, {x,y}res
  	[[ -z ${xres} ]] && xres=30
  	[[ -z ${yres} ]] && xres=30
- 	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
  	if [[ -z ${icon} ]] || [ ! -f ${icon} ]
  	then
  		# if no default icon is given use default.png
-Line 162 
 generate_icon()
+Line 175 
 generate_icon()
  	clearconfig
  	addconfig 'table Icon'
- 	addconfig '  Type: Program'
  	addconfig "  Caption: ${name}"
  	addconfig "  Command: ${command}"
  	addconfig "  Icon: ${icon}"
-Line 172 
 generate_icon()
+Line 184 
 generate_icon()
  	# add these only if not zero
  	if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
  	then
- 		addconfig "  IconWidth: ${iwidth}"
+ 		addconfig "  Width: ${iwidth}"
- 		addconfig "  IconHeight: ${iheight}"
+ 		addconfig "  Height: ${iheight}"
  	fi
  	addconfig 'end'
-Line 191 
 generate_all_desktop_icons()
+Line 203 
 generate_all_desktop_icons()
  	local i
  	local name
  	local progsh_path
+ 	local utility
+ 	local dest
+ 	local rc
+ 	dest="${ALX_UNPRIV_HOME}/.idesktop"
+ 	rc="${ALX_UNPRIV_HOME}/.ideskrc"
  	# progsh path
  	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
-Line 208 
 generate_all_desktop_icons()
+Line 226 
 generate_all_desktop_icons()
  	yres="$(( ${yres} - 80 ))"
  	# clean desktop icon location
- 	[ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	[ -d ${dest} ] && rm -rf ${dest}
- 	install -d ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	[ -f ${rc} ] && rm -f ${rc}
+ 	install -d ${dest}
- 	# basic config
- 	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc
  	# default settings
  	declare -i x=30
-Line 248 
 generate_all_desktop_icons()
+Line 264 
 generate_all_desktop_icons()
  			--name "${cfg_sessions_session}" \
  			--command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
  			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
- 			--dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
+ 			--dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
  			--xres "${x}" \
  			--yres "${y}"
-Line 284 
 generate_all_desktop_icons()
+Line 300 
 generate_all_desktop_icons()
  			--name "${cfg_other_menuitems_name}" \
  			--command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
  			--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
- 			--dest "${ALX_UNPRIV_HOME}/.xtdesktop/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
+ 			--dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
  			--xres "${x}" \
  			--yres "${y}" \
  			--default-icon "default_item.png"
-Line 314 
 generate_all_desktop_icons()
+Line 330 
 generate_all_desktop_icons()
  		--name "${sysinfo}" \
  		--command "exit 0" \
  		--icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
- 		--dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \
+ 		--dest "${dest}/sysinfo.lnk" \
  		--xres "${xres}" \
  		--yres "${yres}" \
  		--icon-width "1" \
-Line 338 
 config_sessions()
+Line 354 
 config_sessions()
  	evaluate_table cfg_screensaver
  	# get autostart settings
  	evaluate_table cfg_autostart
+ 	# get current color depth
+ 	evaluate_table cfg_graphic
  	# now setup fluxbox for user station
-Line 351 
 config_sessions()
+Line 369 
 config_sessions()
  	cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
  	# fluxbox autostart
- 	cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
  	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
+ 	# do not show decorations on messages generated with xmessage
+ 	if [ -x /usr/bin/xmessage ]
+ 	then
+ 		addconfig '[app] (xmessage)'
+ 		addconfig '	[Deco] {NONE}'
+ 		addconfig '[end]'
+ 	fi
+ 	# add icon utility
+ 	[ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
+ 	# add numlock utility
+ 	[ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
  	# add screensaver
  	if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
  	then
-Line 399 
 config_sessions()
+Line 427 
 config_sessions()
  			--username "${cfg_sessions_username}" \
  			--password "${cfg_sessions_password}" \
  			--domain "${cfg_sessions_domain}" \
- 			--server "${cfg_sessions_browseradrs}"
+ 			--server "${cfg_sessions_browseradrs}" \
+ 			--colordepth "${cfg_graphic_depth}"
  		# fluxbox menusession
  		addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
-Line 449 
 config_sessions()
+Line 478 
 config_sessions()
  	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
  	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
  	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
- 	chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
- 	chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
+ 	chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
  }

 Legend:



Removed from v.2381
 


changed lines


 
Added in v.2454
 Legend:



Removed from v.2381
 


changed lines


 
Added in v.2454
-Removed from v.2381
+Added in v.2454