Merge branch 'master' into master

boppreh · Jan 13, 2017 · d3bf224 · d3bf224
2 parents 4fe4b51 + a7c7d5e
commit d3bf224
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/keyboard/__init__.py b/keyboard/__init__.py
@@ -95,6 +95,9 @@ class _State(object): pass
 
 _pressed_events = {}
 class _KeyboardListener(_GenericListener):
+    def init(self):
+        _os_keyboard.init()
+
     def pre_process_event(self, event):
         if not event.scan_code and event.name == 'unknown':
             return False

diff --git a/keyboard/_generic.py b/keyboard/_generic.py
@@ -33,6 +33,8 @@ def start_if_necessary(self):
         self.lock.acquire()
         try:
             if not self.listening:
+                self.init()
+
                 self.listening = True
                 self.listening_thread = Thread(target=self.listen)
                 self.listening_thread.daemon = True

diff --git a/keyboard/_nixkeyboard.py b/keyboard/_nixkeyboard.py
@@ -106,6 +106,10 @@ def build_device():
     ensure_root()
     device = aggregate_devices('kbd')
 
+def init():
+    build_device()
+    build_tables()
+
 pressed_modifiers = set()
 
 def listen(queue):

diff --git a/keyboard/_winkeyboard.py b/keyboard/_winkeyboard.py
@@ -352,6 +352,7 @@ def setup_tables():
 shift_is_pressed = False
 alt_gr_is_pressed = False
 
+init = setup_tables
 
 def listen(queue):
     setup_tables()

diff --git a/keyboard/mouse.py b/keyboard/mouse.py
@@ -12,6 +12,8 @@
 
 _pressed_events = set()
 class _MouseListener(_GenericListener):
+    def init(self):
+        _os_mouse.init()
     def pre_process_event(self, event):
         if isinstance(event, ButtonEvent):
             if event.event_type in (UP, DOUBLE):