bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Identify current desktop resolution for x11vnc service

Browse Source
This commit is contained in:
Bryan Roessler
2020-04-25 09:37:13 -04:00
parent 4a797d68d5
commit 295aa4dcbe
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
installJRMC
View File

@@ -1060,6 +1060,7 @@ EOF"
_runDebug "${FUNCNAME[0]}" _runDebug "${FUNCNAME[0]}"
# Set the display to use
[[ -z $_display ]] && _display="${DISPLAY:-":0"}" [[ -z $_display ]] && _display="${DISPLAY:-":0"}"
_bash_cmd "cat <<-EOF > $_service_fname _bash_cmd "cat <<-EOF > $_service_fname
@@ -1099,6 +1100,7 @@ EOF"
_exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -rfbauth $HOME/.vnc/jrmc_passwd -xstartup /usr/bin/mediacenter$_mversion" _exec_start_cmd="/usr/bin/vncserver $_display -geometry 1440x900 -alwaysshared -fg -rfbauth $HOME/.vnc/jrmc_passwd -xstartup /usr/bin/mediacenter$_mversion"
fi fi
# Set the display to use
if [[ -z $_display ]]; then if [[ -z $_display ]]; then
# If we are running on existing X server then increment DISPLAY by one # If we are running on existing X server then increment DISPLAY by one
if [[ -n $DISPLAY ]]; then if [[ -n $DISPLAY ]]; then
@@ -1109,6 +1111,7 @@ EOF"
fi fi
fi fi
# Alert user to the likely vnc port
local _port=$(( ${_display#:} + 5900 )) local _port=$(( ${_display#:} + 5900 ))
_bash_cmd "cat <<-EOF > $_service_fname _bash_cmd "cat <<-EOF > $_service_fname
@@ -1140,10 +1143,15 @@ EOF"
_setX11VNCPass _setX11VNCPass
# Get current desktop resolution
# TODO: may need to break this out into its own function and get smarter at identifying multi-monitors
local _res
_res=$(xdpyinfo | grep dimensions | awk '{print $2}')
if [[ -n $_novncauth ]]; then if [[ -n $_novncauth ]]; then
_exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry 1920x1080 -auth guess -forever -bg -nopw" _exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry $_res -auth guess -forever -bg -nopw"
else else
_exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry 1920x1080 -auth guess -forever -bg -rfbauth $HOME/.vnc/jrmc_passwd" _exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry $_res -auth guess -forever -bg -rfbauth $HOME/.vnc/jrmc_passwd"
fi fi
_bash_cmd "cat <<-EOF > $_service_fname _bash_cmd "cat <<-EOF > $_service_fname