split state.py

bin/key-mapper-control

@@ -78,7 +78,7 @@ def utils(options):
         sys.exit(0)
 
     if options.key_names:
-        from keymapper.state import system_mapping
+        from keymapper.system_mapping import system_mapping
         print('\n'.join(system_mapping.list_names()))
         sys.exit(0)
 

keymapper/config.py

@@ -148,6 +148,7 @@ class ConfigBase:
         log_unknown : bool
             If True, write an error if `path` does not exist in the config
         """
+
         def callback(parent, child, chunk):
             return child
 

keymapper/daemon.py

@@ -41,7 +41,7 @@ from keymapper.logger import logger, is_debug
 from keymapper.injection.injector import Injector, UNKNOWN
 from keymapper.mapping import Mapping
 from keymapper.config import config
-from keymapper.state import system_mapping
+from keymapper.system_mapping import system_mapping
 from keymapper.groups import groups
 
 

keymapper/gui/custom_mapping.py

@@ -0,0 +1,28 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+# key-mapper - GUI for device specific keyboard mappings
+# Copyright (C) 2021 sezanzeb <proxima@sezanzeb.de>
+#
+# This file is part of key-mapper.
+#
+# key-mapper is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# key-mapper is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with key-mapper.  If not, see <https://www.gnu.org/licenses/>.
+
+
+"""One mapping object for the GUI application."""
+
+
+from keymapper.mapping import Mapping
+
+
+custom_mapping = Mapping()

keymapper/gui/reader.py

@@ -34,7 +34,7 @@ from keymapper.groups import groups, GAMEPAD
 from keymapper.ipc.pipe import Pipe
 from keymapper.gui.helper import TERMINATE, REFRESH_GROUPS
 from keymapper import utils
-from keymapper.state import custom_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.user import USER
 
 

keymapper/gui/row.py

@@ -25,7 +25,8 @@
 import evdev
 from gi.repository import Gtk, GLib, Gdk
 
-from keymapper.state import custom_mapping, system_mapping
+from keymapper.system_mapping import system_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.logger import logger
 from keymapper.key import Key
 from keymapper.gui.reader import reader

keymapper/gui/window.py

@@ -30,7 +30,8 @@ from gi.repository import Gtk, Gdk, GLib
 
 from keymapper.data import get_data_path
 from keymapper.paths import get_config_path
-from keymapper.state import custom_mapping, system_mapping
+from keymapper.system_mapping import system_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.presets import (
     find_newest_preset,
     get_presets,

keymapper/injection/context.py

@@ -24,7 +24,7 @@
 
 from keymapper.logger import logger
 from keymapper.injection.macros import parse, is_this_a_macro
-from keymapper.state import system_mapping
+from keymapper.system_mapping import system_mapping
 from keymapper.config import NONE, MOUSE, WHEEL, BUTTONS
 
 

keymapper/injection/macros.py

@@ -46,7 +46,7 @@ import select
 from evdev.ecodes import ecodes, EV_KEY, EV_REL, REL_X, REL_Y, REL_WHEEL, REL_HWHEEL
 
 from keymapper.logger import logger
-from keymapper.state import system_mapping
+from keymapper.system_mapping import system_mapping
 from keymapper.utils import PRESS, PRESS_NEGATIVE
 
 

keymapper/system_mapping.py

@@ -150,8 +150,5 @@ class SystemMapping:
         return xmodmap_dict
 
 
-# one mapping object for the GUI application
-custom_mapping = Mapping()
-
 # this mapping represents the xmodmap output, which stays constant
 system_mapping = SystemMapping()

tests/test.py

@@ -519,7 +519,8 @@ from keymapper.injection.injector import Injector
 from keymapper.config import config
 from keymapper.gui.reader import reader
 from keymapper.groups import groups
-from keymapper.state import system_mapping, custom_mapping
+from keymapper.system_mapping import system_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.paths import get_config_path
 from keymapper.injection.macros import macro_variables
 from keymapper.injection.consumers.keycode_mapper import active_macros, unreleased

tests/testcases/test_consumer_control.py

@@ -34,7 +34,7 @@ from keymapper.key import Key
 from keymapper.injection.consumer_control import ConsumerControl, consumer_classes
 from keymapper.injection.consumers.consumer import Consumer
 from keymapper.injection.consumers.keycode_mapper import KeycodeMapper
-from keymapper.state import system_mapping
+from keymapper.system_mapping import system_mapping
 
 from tests.test import new_event, quick_cleanup
 

tests/testcases/test_context.py

@@ -25,7 +25,7 @@ from keymapper.injection.context import Context
 from keymapper.mapping import Mapping
 from keymapper.key import Key
 from keymapper.config import NONE, MOUSE, WHEEL, BUTTONS
-from keymapper.state import system_mapping
+from keymapper.system_mapping import system_mapping
 from tests.test import quick_cleanup
 
 

tests/testcases/test_control.py

@@ -30,7 +30,7 @@ import collections
 from importlib.util import spec_from_loader, module_from_spec
 from importlib.machinery import SourceFileLoader
 
-from keymapper.state import custom_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.config import config
 from keymapper.daemon import Daemon
 from keymapper.mapping import Mapping

tests/testcases/test_daemon.py

@@ -31,7 +31,8 @@ from evdev.ecodes import EV_KEY, EV_ABS
 from gi.repository import Gtk
 from pydbus import SystemBus
 
-from keymapper.state import custom_mapping, system_mapping
+from keymapper.system_mapping import system_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.config import config
 from keymapper.groups import groups
 from keymapper.paths import get_config_path, mkdir, get_preset_path

tests/testcases/test_injector.py

@@ -57,7 +57,8 @@ from keymapper.injection.injector import (
     UNKNOWN,
 )
 from keymapper.injection.numlock import is_numlock_on, set_numlock, ensure_numlock
-from keymapper.state import custom_mapping, system_mapping
+from keymapper.system_mapping import system_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.mapping import Mapping, DISABLE_CODE, DISABLE_NAME
 from keymapper.config import config, NONE, MOUSE, WHEEL, BUTTONS
 from keymapper.key import Key

tests/testcases/test_integration.py

@@ -46,7 +46,8 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk
 
-from keymapper.state import custom_mapping, system_mapping, XMODMAP_FILENAME
+from keymapper.system_mapping import system_mapping, XMODMAP_FILENAME
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.paths import CONFIG_PATH, get_preset_path, get_config_path
 from keymapper.config import config, WHEEL, MOUSE, BUTTONS
 from keymapper.gui.reader import reader

tests/testcases/test_keycode_mapper.py

@@ -41,7 +41,7 @@ from keymapper.injection.consumers.keycode_mapper import (
     unreleased,
     subsets,
 )
-from keymapper.state import system_mapping
+from keymapper.system_mapping import system_mapping
 from keymapper.injection.macros import parse
 from keymapper.injection.context import Context
 from keymapper.utils import RELEASE, PRESS

tests/testcases/test_macros.py

@@ -38,7 +38,7 @@ from keymapper.injection.macros import (
 from keymapper.injection.context import Context
 from keymapper.config import config
 from keymapper.mapping import Mapping
-from keymapper.state import system_mapping
+from keymapper.system_mapping import system_mapping
 from keymapper.utils import PRESS, RELEASE
 
 from tests.test import quick_cleanup, new_event

tests/testcases/test_presets.py

@@ -34,7 +34,7 @@ from keymapper.presets import (
     migrate_path,
 )
 from keymapper.paths import CONFIG_PATH, get_preset_path, touch, mkdir
-from keymapper.state import custom_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 
 from tests.test import tmp
 

tests/testcases/test_reader.py

@@ -41,7 +41,7 @@ from evdev.ecodes import (
 )
 
 from keymapper.gui.reader import reader, will_report_up
-from keymapper.state import custom_mapping
+from keymapper.gui.custom_mapping import custom_mapping
 from keymapper.config import BUTTONS, MOUSE
 from keymapper.key import Key
 from keymapper.gui.helper import RootHelper