This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 4de65701b754dcd981fcc63c5514ac8fdbe2f5af Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 15 15:49:35 2018 +0200 keyboard handling: Switch to kbd-type auto and kbd-layout null. Should auto-detect the client-side keyboard in the X2Go session just fine. --- pyhoca-cli | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 4c43750..3438741 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -187,8 +187,8 @@ nx_options = [ {'args':['-q','--link'], 'default': 'adsl', 'choices': ('modem','isdn','adsl','wan','lan'), 'help': 'link quality (default: \'adsl\')',}, {'args':['-t','--session-type'], 'default': 'application', 'choices': ('desktop', 'application'), 'help': 'session type (default: \'application\')', }, {'args':['--pack'], 'default': '16m-jpeg-9', 'help': 'compression methods (see below for possible values)', }, - {'args':['--kbd-layout'], 'default': 'us', 'help': 'use keyboard layout (default: \'us\')',}, - {'args':['--kbd-type'], 'default': 'pc105/us', 'help': 'set Keyboard type (default: \'pc105/us\')',}, + {'args':['--kbd-type'], 'default': 'auto', 'help': 'set Keyboard type (default: \'auto\', other allowed options: \'pc105/us\', \'pc105/de\', etc.)',}, + {'args':['--kbd-layout'], 'default': 'null', 'help': 'use keyboard layout (default: \'null\', allowed options: \'de\', \'fr\', etc.)',}, ] compat_options = [ {'args':['--port'], 'default': None, 'help': 'compatibility option, synonymous to --remote-ssh-port PORT', }, @@ -395,6 +395,14 @@ Possible values for the --pack NX option are: if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_dsa' % current_home): a.ssh_privkey = '%s/.ssh/id_dsa' % current_home + # hang around the keyboard chaos... + a.kbd_type = a.kbd_type.lower() + a.kbd_layout = a.kbd_layout.lower() + if a.kbd_layout == 'auto': + a.kbd_type = 'auto' + if a.kbd_type == 'auto': + a.kbd_layout = 'null' + # lightdm remote login magic takes place here if a.from_stdin: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git