minor cleanups

diff --git a/keyboard/keyboard.py b/keyboard/keyboard.py
index fe1c8ceafe60087655393781d3d1b79f302835a8..26e77c65ca5084a048cf7fe9a8ac4910765406cd 100644 (file)
--- a/keyboard/keyboard.py
+++ b/keyboard/keyboard.py
@@ -60,7 +60,7 @@ class Root(BaseRoot):
             widget_width = size[0] // (3 if len(widget_row) == 3 else 2)
             x = 0 if len(widget_row) > 0 else size[0] // 4
             for keyset in widget_row:
-                rect = pygame.Rect((x, half_height), (widget_width, half_height))
+                rect = pygame.Rect((x, widget_top), (widget_width, half_height))
                 if keyset is MousePadWidget:
                     keyset(self, rect, self.click_cb, self.move_cb)
                 elif keyset is ClockWidget:

diff --git a/keyboard/sounds/Clutch.mp3 b/keyboard/sounds/Clutch.mp3
index 2a4bcf1e03c15d9ef7dee073ae28ca38e13c4eb7..c6d9e03f1fc938e60ad227275a21c2996329a48e 100644 (file)
Binary files a/keyboard/sounds/Clutch.mp3 and b/keyboard/sounds/Clutch.mp3 differ

diff --git a/keyboard/sounds/Flicker_Sound_Effect.mp3 b/keyboard/sounds/Flicker_Sound_Effect.mp3
index db8df4f4fe1508d69b1221ee371d5e1ceadafeed..c807e62e69d3faa7ea33118706b6e1ed9c0718dc 100644 (file)
Binary files a/keyboard/sounds/Flicker_Sound_Effect.mp3 and b/keyboard/sounds/Flicker_Sound_Effect.mp3 differ

diff --git a/launch.py b/launch.py
index ae75ddbfd00e5e9c505c7c48d624c6a28f51484e..39ecddd657364bd8db42d1462abe2c8537b2954b 100755 (executable)
--- a/launch.py
+++ b/launch.py
@@ -122,26 +122,13 @@ def setup_venv():
             raise SystemError("'venv' is not a directory.")
         run_cmd((sys.executable, "-m", "venv", str(venv_dir)))
     os.environ.update(get_venv_environ(venv_dir))
-    has_pkgs = (
-        venv_dir_is_dir
-        and all(check_has_pkg(pkg) for pkg in pkgs)
-    )
+    has_pkgs = (venv_dir_is_dir and all(check_has_pkg(pkg) for pkg in pkgs))
     if get_ipv4_is_connected():
         yesterday = time() - 86400
         if not has_pkgs or all(
             p.stat().st_mtime < yesterday for p in walk_outer(venv_dir)
         ):
-            run_cmd(
-                (
-                    executable,
-                    "-m",
-                    "pip",
-                    "install",
-                    "-qU",
-                    "pip",
-                    *pkgs
-                )
-            )
+            run_cmd((executable, "-m", "pip", "install", "-qU", "pip", *pkgs))
             venv_dir.touch(0o755, True)
     elif not has_pkgs:
         raise ConnectionError("Internet needed to install requirement: pygame")

diff --git a/requirements.txt b/requirements.txt
index 0f13c093a631e42c7b422adec558635b509c7ed9..44d4673055bfc02a7aef430a4549d5f74a58f349 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,5 @@
 evdev==1.9.2
 pygame==2.6.1
+pynput==1.8.1
+python-xlib==0.33
+six==1.17.0