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

gui: handle legacy keymap setting /qubes-keyboard

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2020-02-10 14:42:30 +01:00
parent c332de9653
commit dbacd07b43
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/ext/gui.py
View File

@ -21,6 +21,8 @@
# License along with this library; if not, see <https://www.gnu.org/licenses/>. # License along with this library; if not, see <https://www.gnu.org/licenses/>.
# #
import subprocess
import qubes.config import qubes.config
import qubes.ext import qubes.ext
@ -79,6 +81,16 @@ class GUI(qubes.ext.Extension):
if kbd_layout: if kbd_layout:
vm.untrusted_qdb.write('/keyboard-layout', kbd_layout) vm.untrusted_qdb.write('/keyboard-layout', kbd_layout)
# Legacy value for setting keyboard layout
try:
xkb_keymap = subprocess.run(['/usr/bin/setxkbmap', '-print'],
stdout=subprocess.PIPE)
if xkb_keymap.stdout:
vm.untrusted_qdb.write('/qubes-keyboard', xkb_keymap.stdout)
except FileNotFoundError:
# Prevent any reason for 'setxkbmap' being not present
pass
# Set GuiVM prefix # Set GuiVM prefix
guivm_windows_prefix = vm.features.get('guivm-windows-prefix', 'GuiVM') guivm_windows_prefix = vm.features.get('guivm-windows-prefix', 'GuiVM')
if vm.features.get('service.guivm-gui-agent', None): if vm.features.get('service.guivm-gui-agent', None):