github.com/lowobservable.oec
1
0
Fork 0
mirror of https://github.com/lowobservable/oec.git synced 2026-05-04 23:16:10 +00:00
Code Issues Projects Releases Wiki Activity

Update Key and KeyboardModifiers enums to use Enum and Flag instead of IntEnum and IntFlag

Browse Source
This commit is contained in:
Andrew Kay
2019-06-19 21:52:09 -05:00
parent a6a79ea0f2
commit 078127ff48
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
oec/keyboard.py
View File

@@ -3,10 +3,10 @@ oec.keyboard
~~~~~~~~~~~~ ~~~~~~~~~~~~
""" """
from enum import IntEnum, IntFlag, unique, auto from enum import Enum, Flag, auto
from collections import namedtuple, Mapping from collections import namedtuple, Mapping
class KeyboardModifiers(IntFlag): class KeyboardModifiers(Flag):
"""Keyboard modifiers.""" """Keyboard modifiers."""
LEFT_SHIFT = auto() LEFT_SHIFT = auto()
RIGHT_SHIFT = auto() RIGHT_SHIFT = auto()
@@ -30,8 +30,7 @@ class KeyboardModifiers(IntFlag):
"""Is CAPS LOCK toggled on?""" """Is CAPS LOCK toggled on?"""
return bool(self & KeyboardModifiers.CAPS_LOCK) return bool(self & KeyboardModifiers.CAPS_LOCK)
@unique class Key(Enum):
class Key(IntEnum):
"""Keyboad key.""" """Keyboad key."""
# Modifiers # Modifiers
@@ -127,20 +126,20 @@ class Key(IntEnum):
NUMPAD_BLANK_2 = 321 NUMPAD_BLANK_2 = 321
NUMPAD_BLANK_3 = 322 NUMPAD_BLANK_3 = 322
NUMPAD_BLANK_4 = 323 NUMPAD_BLANK_4 = 323
NUMPAD_SEVEN = 324 NUMPAD_SEVEN = ord('7')
NUMPAD_EIGHT = 325 NUMPAD_EIGHT = ord('8')
NUMPAD_NINE = 326 NUMPAD_NINE = ord('9')
NUMPAD_FIELD_MINUS = 327 NUMPAD_FIELD_MINUS = 327
NUMPAD_FOUR = 328 NUMPAD_FOUR = ord('4')
NUMPAD_FIVE = 329 NUMPAD_FIVE = ord('5')
NUMPAD_SIX = 330 NUMPAD_SIX = ord('6')
NUMPAD_BLANK_5 = 331 NUMPAD_BLANK_5 = 331
NUMPAD_ONE = 332 NUMPAD_ONE = ord('1')
NUMPAD_TWO = 333 NUMPAD_TWO = ord('2')
NUMPAD_THREE = 334 NUMPAD_THREE = ord('3')
NUMPAD_FIELD_PLUS = 335 NUMPAD_FIELD_PLUS = 335
NUMPAD_ZERO = 336 NUMPAD_ZERO = ord('0')
NUMPAD_PERIOD = 337 NUMPAD_PERIOD = ord('.')
# Latin # Latin
BACKTICK = ord('`') BACKTICK = ord('`')
@@ -378,7 +377,7 @@ def get_ascii_character_for_key(key):
if not key: if not key:
return None return None
value = int(key) value = key.value
if value > 255: if value > 255:
return None return None