github.com/lowobservable.oec
1
0
Fork 0
mirror of https://github.com/lowobservable/oec.git synced 2026-01-11 23:53:04 +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
Show Stats 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
class KeyboardModifiers(IntFlag):
class KeyboardModifiers(Flag):
"""Keyboard modifiers."""
LEFT_SHIFT = auto()
RIGHT_SHIFT = auto()
@ -30,8 +30,7 @@ class KeyboardModifiers(IntFlag):
"""Is CAPS LOCK toggled on?"""
return bool(self & KeyboardModifiers.CAPS_LOCK)
@unique
class Key(IntEnum):
class Key(Enum):
"""Keyboad key."""
# Modifiers
@ -127,20 +126,20 @@ class Key(IntEnum):
NUMPAD_BLANK_2 = 321
NUMPAD_BLANK_3 = 322
NUMPAD_BLANK_4 = 323
NUMPAD_SEVEN = 324
NUMPAD_EIGHT = 325
NUMPAD_NINE = 326
NUMPAD_SEVEN = ord('7')
NUMPAD_EIGHT = ord('8')
NUMPAD_NINE = ord('9')
NUMPAD_FIELD_MINUS = 327
NUMPAD_FOUR = 328
NUMPAD_FIVE = 329
NUMPAD_SIX = 330
NUMPAD_FOUR = ord('4')
NUMPAD_FIVE = ord('5')
NUMPAD_SIX = ord('6')
NUMPAD_BLANK_5 = 331
NUMPAD_ONE = 332
NUMPAD_TWO = 333
NUMPAD_THREE = 334
NUMPAD_ONE = ord('1')
NUMPAD_TWO = ord('2')
NUMPAD_THREE = ord('3')
NUMPAD_FIELD_PLUS = 335
NUMPAD_ZERO = 336
NUMPAD_PERIOD = 337
NUMPAD_ZERO = ord('0')
NUMPAD_PERIOD = ord('.')
# Latin
BACKTICK = ord('`')
@ -378,7 +377,7 @@ def get_ascii_character_for_key(key):
if not key:
return None
value = int(key)
value = key.value
if value > 255:
return None