This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 1b9745d80018d4b7c025e1776c3e9082c85cf4ef Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Aug 19 16:16:13 2021 +0200 pyhoca-cli: Add cmdline parameter --dpi. --- man/man1/pyhoca-cli.1 | 3 +++ pyhoca-cli | 8 ++++++++ pyhoca/cli/frontend.py | 1 + 3 files changed, 12 insertions(+) diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 03d382dc..aeba44cf 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -200,6 +200,9 @@ NOT IMPLEMENTED YET: For SSH based X2Go Session Brokers. Full path to a valid SS \*(T<\fB\-g, \-\-geometry\fR \fI{<WIDTH>x<HEIGHT>|fullscreen|maximize}\fR\*(T> Screen geometry (default: '800x600'). .TP +\*(T<\fB\-\-dpi\fR \fI<DPI>\fR\*(T> +Launch X2Go session's Xserver with resolution <DPI> (in dots per inch). +.TP \*(T<\fB\-\-xinerama\fR\*(T> Enable Xinerama support for multi-head setups. Requires X2Go Server 4.1.0.0 (or newer). .TP diff --git a/pyhoca-cli b/pyhoca-cli index 8f9a0610..1d5b0726 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -159,6 +159,7 @@ x2go_options = [ {'args':['-l', '-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', }, {'args':['--password'], 'default': None, 'help': 'user password for session authentication', }, {'args':['--force-password'], 'default': False, 'action': 'store_true', 'help': 'enforce username/password authentication', }, + {'args':['--dpi'], 'default': None, 'help': 'resolution (in dots per inch) to be used by the X2Go session\'s Xserver', }, {'args':['-p','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', }, {'args':['-i', '-k','--ssh-privkey'], 'default': None, 'help': 'use file \'SSH_PRIVKEY\' as private key for the SSH connection (e.g. ~/.ssh/id_rsa)', }, {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'add RSA host key fingerprint to ~/.ssh/known_hosts if authenticity of server can\'t be established (default: not set)', }, @@ -424,6 +425,13 @@ Possible values for the --pack NX option are: if a.link not in ('modem', 'isdn', 'adsl', 'wan','lan'): runtime_error ("value for cmd line argument --link is not any of 'modem', 'isdn', 'adsl', 'wan' or 'lan'", parser=p, exitcode=1) + # input check for --dpi + try: + if int(a.dpi) < 20 or int(a.dpi) > 400: + runtime_error ("value for cmd line argument --dpi must be between 20 and 400", parser=p, exitcode=1) + except ValueError: + runtime_error ("value for cmd line argument --dpi must be an positive integer value between 20 and 400", parser=p, exitcode=1) + # input check for --clipboard-mode a.clipboard_mode = a.clipboard_mode.lower() if a.clipboard_mode not in ('none', 'both', 'client', 'server'): diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 26091738..4cb59623 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -458,6 +458,7 @@ class PyHocaCLI(x2go.X2GoClient): profile_name = 'Pyhoca-Client_Session', session_type=self.args.session_type, link=self.args.link, + dpi=self.args.dpi, xinerama=self.args.xinerama, geometry=self.args.geometry, pack=self.args.pack, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git