Added dynamic resolution and scaling for UHD

This commit is contained in:
Fmstrat 2020-11-10 15:50:42 -05:00 committed by Oskar Manhart
parent 630f21a76a
commit d917f039c0
2 changed files with 12 additions and 4 deletions

View File

@ -54,9 +54,15 @@ RDP_USER="MyWindowsUser"
RDP_PASS="MyWindowsPassword" RDP_PASS="MyWindowsPassword"
#RDP_DOMAIN="MYDOMAIN" #RDP_DOMAIN="MYDOMAIN"
#RDP_IP="192.168.123.111" #RDP_IP="192.168.123.111"
#RDP_SCALE=100
#DEBUG="true" #DEBUG="true"
``` ```
If you are using Option 2 below with a pre-existing non-KVM RDP server, you can use the `RDP_IP` to specify it's location. If you are running a VM in KVM with NAT enabled, leave `RDP_IP` commented out and WinApps will auto-detect the right local IP. Also, if you are using a domain user, you can uncomment and change `RDP_DOMAIN`.
Options:
- When using Option 2 below with a pre-existing non-KVM RDP server, you can use the `RDP_IP` to specify it's location.
- If you are running a VM in KVM with NAT enabled, leave `RDP_IP` commented out and WinApps will auto-detect the right local IP.
- For domain users, you can uncomment and change `RDP_DOMAIN`.
- On high-resolution (UHD) displays, you can set `RDP_SCALE` to the scale you would like [100|140|160|180]
If you enable `DEBUG`, a log will be created on each application start in `~/.local/share/winapps/winapps.log`. If you enable `DEBUG`, a log will be created on each application start in `~/.local/share/winapps/winapps.log`.

View File

@ -12,6 +12,8 @@ if [ ! -d "${HOME}/.local/share/winapps" ]; then
mkdir -p "${HOME}/.local/share/winapps" mkdir -p "${HOME}/.local/share/winapps"
fi fi
RDP_SCALE=100
if [ -f "${HOME}/.config/winapps/winapps.conf" ]; then if [ -f "${HOME}/.config/winapps/winapps.conf" ]; then
. "${HOME}/.config/winapps/winapps.conf" . "${HOME}/.config/winapps/winapps.conf"
else else
@ -66,7 +68,7 @@ dprint "2:${2}"
dprint "@:${@}" dprint "@:${@}"
if [ "${1}" = "windows" ]; then if [ "${1}" = "windows" ]; then
xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} /dynamic-resolution +auto-reconnect +home-drive /wm-class:"Microsoft Windows" 1> /dev/null 2>&1 & xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} /scale:${RDP_SCALE} /dynamic-resolution +auto-reconnect +home-drive /wm-class:"Microsoft Windows" 1> /dev/null 2>&1 &
elif [ "${1}" != "install" ]; then elif [ "${1}" != "install" ]; then
dprint "DIR:${DIR}" dprint "DIR:${DIR}"
. "${DIR}/../apps/${1}/info" . "${DIR}/../apps/${1}/info"
@ -74,9 +76,9 @@ elif [ "${1}" != "install" ]; then
dprint "HOME:${HOME}" dprint "HOME:${HOME}"
FILE=$(echo "${2}" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g') FILE=$(echo "${2}" | sed 's|'"${HOME}"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g')
dprint "FILE:${HOME}" dprint "FILE:${HOME}"
xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /span /wm-class:"${FULL_NAME}" /app:"${WIN_EXECUTABLE}" /app-icon:"${DIR}/../apps/${1}/icon.svg" /app-cmd:"\"${FILE}\"" 1> /dev/null 2>&1 & xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /scale:${RDP_SCALE} /dynamic-resolution /span /wm-class:"${FULL_NAME}" /app:"${WIN_EXECUTABLE}" /app-icon:"${DIR}/../apps/${1}/icon.svg" /app-cmd:"\"${FILE}\"" 1> /dev/null 2>&1 &
else else
xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /span /wm-class:"${FULL_NAME}" /app:"${WIN_EXECUTABLE}" /app-icon:"${DIR}/../apps/${1}/icon.svg" 1> /dev/null 2>&1 & xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /scale:${RDP_SCALE} /dynamic-resolution /span /wm-class:"${FULL_NAME}" /app:"${WIN_EXECUTABLE}" /app-icon:"${DIR}/../apps/${1}/icon.svg" 1> /dev/null 2>&1 &
fi fi
fi fi