--- alx-src/trunk/alxconfig-ng/functions/config_sessions.sh 2007/06/27 09:28:34 376 +++ alx-src/trunk/alxconfig-ng/functions/config_sessions.sh 2007/06/28 12:49:32 377 @@ -1,4 +1,4 @@ -# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.18 2006-01-26 19:55:53 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.19 2007-06-28 12:49:32 niro Exp $ # configures ica-sessions on the host via mysql db settings get_sessions_settings() @@ -64,6 +64,9 @@ local ses_password local ses_browseradrs local ses_colors + local ses_display_mode + local ses_display_x + local ses_display_y # get settings from database all_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'") @@ -78,6 +81,9 @@ ses_password=$(mysqldo "select password from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'") ses_browseradrs=$(mysqldo "select browseradrs from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'") + # get the session display mode seamless|fullscreen|or an resolution + ses_display_mode=$(mysqldo "select displaymode from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'") + # get the right colors ses_colors=$(mysqldo "select depth from cfg_graphic where serial='${ALX_SERIAL}'") # convert to ica session file values @@ -102,12 +108,12 @@ IFS="${OLD_IFS}" unset x unset OLD_IFS - + echo 'ScreenPercent=0' >> ${ALX_ICA_SESSIONS}/${ses_filename} echo '[ApplicationServers]' >> ${ALX_ICA_SESSIONS}/${ses_filename} echo "${ses_session}=" >> ${ALX_ICA_SESSIONS}/${ses_filename} - + echo "[${ses_session}]" >> ${ALX_ICA_SESSIONS}/${ses_filename} echo "Address=${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename} echo "InitialProgram=#${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename} @@ -117,8 +123,32 @@ echo "ClearPassword=${ses_password}" >> ${ALX_ICA_SESSIONS}/${ses_filename} echo "Username=${ses_username}" >> ${ALX_ICA_SESSIONS}/${ses_filename} echo "Domain=${ses_domain}" >> ${ALX_ICA_SESSIONS}/${ses_filename} - echo 'UseFullScreen=Yes' >> ${ALX_ICA_SESSIONS}/${ses_filename} - echo 'NoWindowManager=True' >> ${ALX_ICA_SESSIONS}/${ses_filename} + + # use the right display settings + case ${ses_display_mode} in + # fullscreen mode + fullscreen) + echo 'UseFullScreen=Yes' >> ${ALX_ICA_SESSIONS}/${ses_filename} + echo 'NoWindowManager=True' >> ${ALX_ICA_SESSIONS}/${ses_filename} + ;; + # seamless window mode + seamless) + echo 'TWIMode=On' >> ${ALX_ICA_SESSIONS}/${ses_filename} + ;; + # a desired resolution + *x*) + # split the resolutions + ses_display_x=$(echo ${ses_display_mode} | cut -dx -f1) + ses_display_y=$(echo ${ses_display_mode} | cut -dx -f2) + echo "DesiredHRES=${ses_display_x}" >> ${ALX_ICA_SESSIONS}/${ses_filename} + echo "DesiredVRES=${ses_display_x}" >> ${ALX_ICA_SESSIONS}/${ses_filename} + ;; + # but default to fullscreen if nothing met + *) + echo 'UseFullScreen=Yes' >> ${ALX_ICA_SESSIONS}/${ses_filename} + echo 'NoWindowManager=True' >> ${ALX_ICA_SESSIONS}/${ses_filename} + ;; + esac done }