Archives/input-remapper
2
0
Fork 0
mirror of https://github.com/sezanzeb/input-remapper synced 2024-11-18 03:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed tests

Browse Source
This commit is contained in:
sezanzeb 2020-11-03 00:48:57 +01:00
parent 7a86dfa179
commit 29ededc8f9
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
keymapper/X.py
View File

@ -50,6 +50,19 @@ def get_keycode(device, letter):
return '' return ''
def ensure_symlink():
"""Make sure the symlink exists.
It provides the configs in /home to X11 in /usr.
"""
if not os.path.exists(SYMBOLS_PATH):
# link from /usr/share/X11/xkb/symbols/key-mapper/user to
# /home/user/.config/key-mapper
logger.info('Linking "%s" to "%s"', SYMBOLS_PATH, CONFIG_PATH)
os.makedirs(os.path.dirname(SYMBOLS_PATH), exist_ok=True)
os.symlink(CONFIG_PATH, SYMBOLS_PATH, target_is_directory=True)
def create_preset(device, name=None): def create_preset(device, name=None):
"""Create an empty preset and return the name.""" """Create an empty preset and return the name."""
existing_names = get_presets(device) existing_names = get_presets(device)
@ -64,6 +77,7 @@ def create_preset(device, name=None):
name = f'{name} {i}' name = f'{name} {i}'
os.mknod(get_home_path(device, name)) os.mknod(get_home_path(device, name))
ensure_symlink()
return name return name
@ -95,12 +109,7 @@ def create_setxkbmap_config(device, preset, mappings):
logger.info('Creating directory "%s"', home_device_path) logger.info('Creating directory "%s"', home_device_path)
os.makedirs(home_device_path, exist_ok=True) os.makedirs(home_device_path, exist_ok=True)
if not os.path.exists(SYMBOLS_PATH): ensure_symlink()
# link from /usr/share/X11/xkb/symbols/key-mapper/user to
# /home/user/.config/key-mapper
logger.info('Linking "%s" to "%s"', SYMBOLS_PATH, CONFIG_PATH)
os.makedirs(os.path.dirname(SYMBOLS_PATH), exist_ok=True)
os.symlink(CONFIG_PATH, SYMBOLS_PATH, target_is_directory=True)
home_preset_path = get_home_path(device, preset) home_preset_path = get_home_path(device, preset)
if not os.path.exists(home_preset_path): if not os.path.exists(home_preset_path):
@ -136,7 +145,13 @@ def apply_preset(device, preset):
logger.error('Something else is')""" logger.error('Something else is')"""
symbols = '/usr/share/X11/xkb/symbols/' symbols = '/usr/share/X11/xkb/symbols/'
layout_name = get_usr_path(device, preset)[len(symbols):] layout_path = get_usr_path(device, preset)
with open(layout_path, 'r') as f:
if f.read() == '':
logger.error('Tried to load empty config')
return
layout_name = layout_path[len(symbols):]
cmd = [ cmd = [
'setxkbmap', 'setxkbmap',
'-layout', layout_name, '-layout', layout_name,