From c3580338955a994f389d237500e3faaf8179fbaa Mon Sep 17 00:00:00 2001 From: duncte123 Date: Mon, 17 Aug 2020 13:32:18 +0200 Subject: [PATCH 1/2] Try pynput for keys again --- INSTALL/requirements.txt | 6 +++--- system_apis/keyboard_unix.py | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/INSTALL/requirements.txt b/INSTALL/requirements.txt index 4abc3f1..c18cb40 100644 --- a/INSTALL/requirements.txt +++ b/INSTALL/requirements.txt @@ -1,10 +1,10 @@ MouseInfo==0.1.3 -Pillow==7.1.1 +Pillow==7.2.0 py-getch==1.0.1 PyAutoGUI==0.9.50 pygame==1.9.6 PyGetWindow==0.0.8 -PyMsgBox==1.0.7 +PyMsgBox==1.0.8 pynput==1.6.8 pyperclip==1.8.0 PyRect==0.1.4 @@ -12,6 +12,6 @@ PyScreeze==0.1.26 python-xlib==0.27 python3-xlib==0.15 PyTweening==1.0.3 -six==1.14.0 +six==1.15.0 tkcolorpicker==2.1.3 -e git+git://github.com/FMMT666/launchpad.py.git@master#egg=launchpad-py diff --git a/system_apis/keyboard_unix.py b/system_apis/keyboard_unix.py index b2c4b6e..d8b0af0 100644 --- a/system_apis/keyboard_unix.py +++ b/system_apis/keyboard_unix.py @@ -1,10 +1,10 @@ from pynput import keyboard from pynput.keyboard import KeyCode -# from pynput.keyboard import Controller as KeyboardController -import pyautogui +from pynput.keyboard import Controller as KeyboardController +# import pyautogui from pyautogui import KEY_NAMES as pyautogui_keys -# keyboard_controller = KeyboardController() +keyboard_controller = KeyboardController() media_key_map = { "vol_up": "media_volume_up", @@ -50,7 +50,7 @@ def sp(name): - return _sp_pyautogui(name) + return _sp_pynput(name) def _sp_pyautogui(name): @@ -78,15 +78,15 @@ def _sp_pynput(name): def press(key): - # keyboard_controller.press(key) - pyautogui.keyDown(key) + keyboard_controller.press(key) + # pyautogui.keyDown(key) def release(key): - # keyboard_controller.release(key) - pyautogui.keyUp(key) + keyboard_controller.release(key) + # pyautogui.keyUp(key) def write(string): - # keyboard_controller.type(string) - pyautogui.write(string) + keyboard_controller.type(string) + # pyautogui.write(string) From 54bb54fbbc3a227726f43ba5ef8ebc15bece7ee2 Mon Sep 17 00:00:00 2001 From: duncte123 Date: Tue, 18 Aug 2020 12:58:56 +0200 Subject: [PATCH 2/2] Use other keyboard driver --- system_apis/keyboard_win.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system_apis/keyboard_win.py b/system_apis/keyboard_win.py index db8c1ba..5feb536 100644 --- a/system_apis/keyboard_win.py +++ b/system_apis/keyboard_win.py @@ -1,6 +1,6 @@ import ctypes from ctypes import wintypes -import pyautogui +import system_apis.keyboard_unix as unix_controller # code in this file comes from https://gist.github.com/Aniruddha-Tapas/1627257344780e5429b10bc92eb2f52a @@ -243,4 +243,4 @@ def release(key): def write(string): - pyautogui.write(string) + unix_controller.write(string)