plover 5.0.0.dev2__py3-none-any.whl → 5.0.0.dev3__py3-none-any.whl

plover/oslayer/__init__.py

@@ -11,17 +11,19 @@ from .config import PLATFORM
 
 
 PLATFORM_PACKAGE = {
-    'bsd'  : 'linux',
-    'linux': 'linux',
-    'mac'  : 'osx',
-    'win'  : 'windows',
+    "bsd": "linux",
+    "linux": "linux",
+    "mac": "osx",
+    "win": "windows",
 }
 
+
 def _add_platform_package_to_path():
     platform_package = PLATFORM_PACKAGE.get(PLATFORM)
     if platform_package is None:
-        log.warning('No platform-specific oslayer package for: %s' % PLATFORM)
+        log.warning("No platform-specific oslayer package for: %s" % PLATFORM)
         return
     __path__.insert(0, os.path.join(__path__[0], platform_package))
 
+
 _add_platform_package_to_path()

plover/oslayer/config.py

@@ -9,14 +9,14 @@ import sys
 import appdirs
 
 
-if sys.platform.startswith('darwin'):
-    PLATFORM = 'mac'
-elif sys.platform.startswith('linux'):
-    PLATFORM = 'linux'
-elif sys.platform.startswith('win'):
-    PLATFORM = 'win'
-elif sys.platform.startswith(('freebsd', 'openbsd')):
-    PLATFORM = 'bsd'
+if sys.platform.startswith("darwin"):
+    PLATFORM = "mac"
+elif sys.platform.startswith("linux"):
+    PLATFORM = "linux"
+elif sys.platform.startswith("win"):
+    PLATFORM = "win"
+elif sys.platform.startswith(("freebsd", "openbsd")):
+    PLATFORM = "bsd"
 else:
     PLATFORM = None
 
@@ -25,20 +25,21 @@ else:
 # keeping all Plover files in a portable drive.
 #
 # Note: the special case when run from an app bundle on macOS.
-if PLATFORM == 'mac' and '.app/' in os.path.realpath(__file__):
-    PROGRAM_DIR = os.path.abspath(os.path.join(os.path.dirname(sys.executable),
-                                               *[os.path.pardir] * 3))
+if PLATFORM == "mac" and ".app/" in os.path.realpath(__file__):
+    PROGRAM_DIR = os.path.abspath(
+        os.path.join(os.path.dirname(sys.executable), *[os.path.pardir] * 3)
+    )
 else:
     PROGRAM_DIR = os.getcwd()
 
 # Setup configuration directory.
-CONFIG_BASENAME = 'plover.cfg'
+CONFIG_BASENAME = "plover.cfg"
 if os.path.isfile(os.path.join(PROGRAM_DIR, CONFIG_BASENAME)):
     CONFIG_DIR = PROGRAM_DIR
 else:
     config_directories = [
-        getattr(appdirs, directory_type)('plover')
-        for directory_type in ('user_config_dir', 'user_data_dir')
+        getattr(appdirs, directory_type)("plover")
+        for directory_type in ("user_config_dir", "user_data_dir")
     ]
     for CONFIG_DIR in config_directories:
         if os.path.isfile(os.path.join(CONFIG_DIR, CONFIG_BASENAME)):
@@ -50,4 +51,4 @@ CONFIG_FILE = os.path.join(CONFIG_DIR, CONFIG_BASENAME)
 # Setup plugins directory.
 PLUGINS_PLATFORM = PLATFORM
 
-ASSETS_DIR = os.path.realpath(os.path.join(__file__, '../../assets'))
+ASSETS_DIR = os.path.realpath(os.path.join(__file__, "../../assets"))

plover/oslayer/controller.py

@@ -9,14 +9,13 @@ from plover.oslayer.config import PLATFORM
 
 
 class Controller:
-
-    def __init__(self, instance='plover', authkey=b'plover'):
-        if PLATFORM == 'win':
-            self._address = r'\\.\pipe' + '\\' + instance
-            self._family = 'AF_PIPE'
+    def __init__(self, instance="plover", authkey=b"plover"):
+        if PLATFORM == "win":
+            self._address = r"\\.\pipe" + "\\" + instance
+            self._family = "AF_PIPE"
         else:
-            self._address = os.path.join(tempfile.gettempdir(), instance + '_socket')
-            self._family = 'AF_UNIX'
+            self._address = os.path.join(tempfile.gettempdir(), instance + "_socket")
+            self._family = "AF_UNIX"
         self._authkey = authkey
         self._listen = None
         self._thread = None
@@ -28,7 +27,7 @@ class Controller:
 
     def force_cleanup(self):
         assert not self.is_owner
-        if PLATFORM != 'win' and os.path.exists(self._address):
+        if PLATFORM != "win" and os.path.exists(self._address):
             os.unlink(self._address)
             return True
         return False
@@ -36,10 +35,11 @@ class Controller:
     def __enter__(self):
         assert self._listen is None
         try:
-            self._listen = connection.Listener(self._address, self._family,
-                                               authkey=self._authkey)
+            self._listen = connection.Listener(
+                self._address, self._family, authkey=self._authkey
+            )
         except Exception as e:
-            if PLATFORM == 'win':
+            if PLATFORM == "win":
                 if not isinstance(e, PermissionError):
                     raise
             else:
@@ -68,7 +68,7 @@ class Controller:
                 if self._accept():
                     break
             except Exception as e:
-                log.error('handling client failed', exc_info=True)
+                log.error("handling client failed", exc_info=True)
 
     def _send_message(self, msg):
         conn = connection.Client(self._address, self._family, authkey=self._authkey)
@@ -78,7 +78,7 @@ class Controller:
             conn.close()
 
     def send_command(self, command):
-        self._send_message(('command', command))
+        self._send_message(("command", command))
 
     def start(self, message_cb):
         assert self.is_owner

plover/oslayer/linux/i18n.py

@@ -3,7 +3,8 @@ import os
 
 
 # Note: highest priority first.
-LANG_ENV_VARS = ('LC_ALL', 'LC_MESSAGES', 'LANG')
+LANG_ENV_VARS = ("LC_ALL", "LC_MESSAGES", "LANG")
+
 
 def get_system_language():
     try:

plover/oslayer/linux/keyboardcontrol.py

@@ -1,6 +1,6 @@
 from .display_server import DISPLAY_SERVER
 
 if DISPLAY_SERVER == "x11":
-    from .keyboardcontrol_x11 import KeyboardCapture, KeyboardEmulation # pylint: disable=unused-import
+    from .keyboardcontrol_x11 import KeyboardCapture, KeyboardEmulation  # pylint: disable=unused-import
 else:
-    from .keyboardcontrol_uinput import KeyboardCapture, KeyboardEmulation #pylint: disable=unused-import
+    from .keyboardcontrol_uinput import KeyboardCapture, KeyboardEmulation  # pylint: disable=unused-import

plover/oslayer/linux/keyboardcontrol_uinput.py

@@ -275,9 +275,50 @@ LAYOUTS = {
         "k": e.KEY_N,
         "h": e.KEY_M,
     },
+    "dvorak": {
+        **BASE_LAYOUT,
+        # Top row
+        "'": e.KEY_Q,
+        ",": e.KEY_W,
+        ".": e.KEY_E,
+        "p": e.KEY_R,
+        "y": e.KEY_T,
+        "f": e.KEY_Y,
+        "g": e.KEY_U,
+        "c": e.KEY_I,
+        "r": e.KEY_O,
+        "l": e.KEY_P,
+        "/": e.KEY_LEFTBRACE,
+        "=": e.KEY_RIGHTBRACE,
+        # Middle row
+        "a": e.KEY_A,
+        "o": e.KEY_S,
+        "e": e.KEY_D,
+        "u": e.KEY_F,
+        "i": e.KEY_G,
+        "d": e.KEY_H,
+        "h": e.KEY_J,
+        "t": e.KEY_K,
+        "n": e.KEY_L,
+        "s": e.KEY_SEMICOLON,
+        "-": e.KEY_APOSTROPHE,
+        # Bottom row
+        ";": e.KEY_Z,
+        "q": e.KEY_X,
+        "j": e.KEY_C,
+        "k": e.KEY_V,
+        "x": e.KEY_B,
+        "b": e.KEY_N,
+        "m": e.KEY_M,
+        "w": e.KEY_COMMA,
+        "v": e.KEY_DOT,
+        "z": e.KEY_SLASH,
+    },
 }
 
-KEYCODE_TO_KEY = dict(zip(LAYOUTS[DEFAULT_LAYOUT].values(), LAYOUTS[DEFAULT_LAYOUT].keys()))
+KEYCODE_TO_KEY = dict(
+    zip(LAYOUTS[DEFAULT_LAYOUT].values(), LAYOUTS[DEFAULT_LAYOUT].keys())
+)
 
 
 class KeyboardEmulation(GenericKeyboardEmulation):
@@ -289,7 +330,9 @@ class KeyboardEmulation(GenericKeyboardEmulation):
 
         # Check that ibus or fcitx5 is running
         if not any(p.name() in ["ibus-daemon", "fcitx5"] for p in process_iter()):
-            log.warning("It appears that an input method, such as ibus or fcitx5, is not running on your system. Without this, some text may not be output correctly.")
+            log.warning(
+                "It appears that an input method, such as ibus or fcitx5, is not running on your system. Without this, some text may not be output correctly."
+            )
 
     def _update_layout(self, layout):
         if not layout in LAYOUTS:
@@ -464,7 +507,9 @@ class KeyboardCapture(Capture):
                                 key_name = KEYCODE_TO_KEY[event.code]
                                 if key_name in self._suppressed_keys:
                                     pressed = event.value == 1
-                                    (self.key_down if pressed else self.key_up)(key_name)
+                                    (self.key_down if pressed else self.key_up)(
+                                        key_name
+                                    )
                                     continue  # Go to the next iteration, skipping the below code:
                         self._ui.write(e.EV_KEY, event.code, event.value)
                         self._ui.syn()