Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-start-daemon: set keyboard-layout only for the first set layout

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2020-03-17 11:35:53 +01:00
parent c58e5b8eb8
commit c13097d458
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qubesadmin/tools/qvm_start_daemon.py
View File

@ -117,19 +117,19 @@ def get_monitor_layout():
def set_keyboard_layout(vm): def set_keyboard_layout(vm):
"""Set layout configuration into features for Gui admin extension""" """Set layout configuration into features for Gui admin extension"""
try: try:
# Example of 'xprop -root _XKB_RULES_NAMES' output: # Examples of 'xprop -root _XKB_RULES_NAMES' output values:
# _XKB_RULES_NAMES(STRING) = "evdev", "pc105", "fr", "oss", "" # "evdev", "pc105", "fr", "oss", ""
# "evdev", "pc105", "pl,us", ",", "grp:win_switch,compose:caps"
# We use the first layout provided
xkb_re = r'_XKB_RULES_NAMES\(STRING\) = ' \
r'\"(.*)\", \"(.*)\", \"(.*)\", \"(.*)\", \"(.*)\"\n'
xkb_rules_names = subprocess.check_output( xkb_rules_names = subprocess.check_output(
['xprop', '-root', '_XKB_RULES_NAMES']).decode() ['xprop', '-root', '_XKB_RULES_NAMES']).decode()
xkb_rules_names = xkb_rules_names. \ xkb_parsed = re.match(xkb_re, xkb_rules_names)
replace('"', '').replace('\n', '') xkb_layout = [x.split(',')[0] for x in xkb_parsed.groups()[2:5]]
keyboard_layout = '+'.join(xkb_rules_names.split(', ')[2:]) keyboard_layout = '+'.join(xkb_layout)
vm.features['keyboard-layout'] = keyboard_layout vm.features['keyboard-layout'] = keyboard_layout
# Legacy
xkbmap = subprocess.check_output(['setxkbmap', '-print'])
vm.features['qubes-keyboard'] = xkbmap
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
vm.log.warning('Failed to set layout for %s: %s', vm, str(e)) vm.log.warning('Failed to set layout for %s: %s', vm, str(e))