2018-09-03 22:50:12 +02:00
|
|
|
import logging
|
2018-09-04 00:21:34 +02:00
|
|
|
import sys
|
2018-09-03 22:50:12 +02:00
|
|
|
|
Massive refactor largely to support Unicode on Mac
This does a bunch of crazy stuff:
- The ability to set a unicode mode (right now only Linux+ibus or
MacOS-RALT) in the keymap. This will be changeable at runtime soon, to
allow a single keyboard to be able to send table flips and whatever
other crazy stuff on any OS the board is plugged into (something that's
not currently doable on QMK, so yay us?)
- As part of the above, there is now just one user-facing macro for
unicode codepoint submission,
`kmk.common.macros.unicode.unicode_sequence`. Users should never use the
platform-specific macros, partly because they just outright won't work.
There's all sorts of fun stuff in these methods now, thank goodness
MicroPython supports the `yield from` construct.
- Keycode (these should really be renamed Keysym or something) objects
that are intended to not be pressed, or not be released. Right now these
properties are completely ignored if not part of a macro, and it's
probably sane to keep it that way. This was necessary to support MacOS's
"hold RALT while typing the codepoint characters" flow.
- Other refactor-y bits, like moving macro support to `kmk/common`
rather than sitting at the top level of the tree. One day `kmk/common`
may make sense to surface at top level `kmk/`, but that's a discussion
for another day.
2018-10-01 04:33:23 +02:00
|
|
|
from kmk.common.consts import DiodeOrientation, UnicodeModes
|
2018-09-23 06:49:58 +02:00
|
|
|
from kmk.common.event_defs import (HID_REPORT_EVENT, INIT_FIRMWARE_EVENT,
|
|
|
|
KEY_DOWN_EVENT, KEY_UP_EVENT,
|
2018-10-01 03:03:43 +02:00
|
|
|
KEYCODE_DOWN_EVENT, KEYCODE_UP_EVENT,
|
|
|
|
MACRO_COMPLETE_EVENT, NEW_MATRIX_EVENT)
|
2018-09-23 06:49:58 +02:00
|
|
|
from kmk.common.internal_keycodes import process_internal_key_event
|
|
|
|
from kmk.common.keycodes import FIRST_KMK_INTERNAL_KEYCODE, Keycodes
|
Massive refactor largely to support Unicode on Mac
This does a bunch of crazy stuff:
- The ability to set a unicode mode (right now only Linux+ibus or
MacOS-RALT) in the keymap. This will be changeable at runtime soon, to
allow a single keyboard to be able to send table flips and whatever
other crazy stuff on any OS the board is plugged into (something that's
not currently doable on QMK, so yay us?)
- As part of the above, there is now just one user-facing macro for
unicode codepoint submission,
`kmk.common.macros.unicode.unicode_sequence`. Users should never use the
platform-specific macros, partly because they just outright won't work.
There's all sorts of fun stuff in these methods now, thank goodness
MicroPython supports the `yield from` construct.
- Keycode (these should really be renamed Keysym or something) objects
that are intended to not be pressed, or not be released. Right now these
properties are completely ignored if not part of a macro, and it's
probably sane to keep it that way. This was necessary to support MacOS's
"hold RALT while typing the codepoint characters" flow.
- Other refactor-y bits, like moving macro support to `kmk/common`
rather than sitting at the top level of the tree. One day `kmk/common`
may make sense to surface at top level `kmk/`, but that's a discussion
for another day.
2018-10-01 04:33:23 +02:00
|
|
|
from kmk.common.macros import KMKMacro
|
2018-09-03 22:50:12 +02:00
|
|
|
|
|
|
|
|
|
|
|
class ReduxStore:
|
|
|
|
def __init__(self, reducer, log_level=logging.NOTSET):
|
|
|
|
self.reducer = reducer
|
|
|
|
self.logger = logging.getLogger(__name__)
|
|
|
|
self.logger.setLevel(log_level)
|
|
|
|
self.state = self.reducer(logger=self.logger)
|
2018-09-04 00:21:34 +02:00
|
|
|
self.callbacks = []
|
2018-09-03 22:50:12 +02:00
|
|
|
|
|
|
|
def dispatch(self, action):
|
2018-09-23 06:49:58 +02:00
|
|
|
if callable(action):
|
|
|
|
self.logger.debug('Received thunk')
|
|
|
|
action(self.dispatch, self.get_state)
|
|
|
|
self.logger.debug('Finished thunk')
|
|
|
|
return None
|
|
|
|
|
2018-10-01 07:50:04 +02:00
|
|
|
self.logger.debug('Dispatching action: Type {} >> {}'.format(action[0], action))
|
2018-09-23 06:49:58 +02:00
|
|
|
self.state = self.reducer(self.state, action, logger=self.logger)
|
2018-10-01 07:50:04 +02:00
|
|
|
self.logger.debug('Dispatching complete: Type {}'.format(action[0]))
|
2018-09-03 22:50:12 +02:00
|
|
|
|
2018-09-17 08:20:16 +02:00
|
|
|
self.logger.debug('New state: {}'.format(self.state))
|
2018-09-04 00:21:34 +02:00
|
|
|
|
|
|
|
for cb in self.callbacks:
|
|
|
|
if cb is not None:
|
|
|
|
try:
|
|
|
|
cb(self.state, action)
|
|
|
|
except Exception as e:
|
|
|
|
self.logger.error('Callback failed, moving on')
|
|
|
|
print(sys.print_exception(e), file=sys.stderr)
|
|
|
|
|
2018-09-03 22:50:12 +02:00
|
|
|
def get_state(self):
|
|
|
|
return self.state
|
|
|
|
|
2018-09-04 00:21:34 +02:00
|
|
|
def subscribe(self, callback):
|
|
|
|
self.callbacks.append(callback)
|
|
|
|
return len(self.callbacks) - 1
|
|
|
|
|
|
|
|
def unsubscribe(self, idx):
|
|
|
|
self.callbacks[idx] = None
|
|
|
|
|
2018-09-03 22:50:12 +02:00
|
|
|
|
|
|
|
class InternalState:
|
2018-10-01 09:31:45 +02:00
|
|
|
keys_pressed = set()
|
Massive refactor largely to support Unicode on Mac
This does a bunch of crazy stuff:
- The ability to set a unicode mode (right now only Linux+ibus or
MacOS-RALT) in the keymap. This will be changeable at runtime soon, to
allow a single keyboard to be able to send table flips and whatever
other crazy stuff on any OS the board is plugged into (something that's
not currently doable on QMK, so yay us?)
- As part of the above, there is now just one user-facing macro for
unicode codepoint submission,
`kmk.common.macros.unicode.unicode_sequence`. Users should never use the
platform-specific macros, partly because they just outright won't work.
There's all sorts of fun stuff in these methods now, thank goodness
MicroPython supports the `yield from` construct.
- Keycode (these should really be renamed Keysym or something) objects
that are intended to not be pressed, or not be released. Right now these
properties are completely ignored if not part of a macro, and it's
probably sane to keep it that way. This was necessary to support MacOS's
"hold RALT while typing the codepoint characters" flow.
- Other refactor-y bits, like moving macro support to `kmk/common`
rather than sitting at the top level of the tree. One day `kmk/common`
may make sense to surface at top level `kmk/`, but that's a discussion
for another day.
2018-10-01 04:33:23 +02:00
|
|
|
macro_pending = None
|
2018-10-01 09:31:45 +02:00
|
|
|
hid_pending = False
|
Massive refactor largely to support Unicode on Mac
This does a bunch of crazy stuff:
- The ability to set a unicode mode (right now only Linux+ibus or
MacOS-RALT) in the keymap. This will be changeable at runtime soon, to
allow a single keyboard to be able to send table flips and whatever
other crazy stuff on any OS the board is plugged into (something that's
not currently doable on QMK, so yay us?)
- As part of the above, there is now just one user-facing macro for
unicode codepoint submission,
`kmk.common.macros.unicode.unicode_sequence`. Users should never use the
platform-specific macros, partly because they just outright won't work.
There's all sorts of fun stuff in these methods now, thank goodness
MicroPython supports the `yield from` construct.
- Keycode (these should really be renamed Keysym or something) objects
that are intended to not be pressed, or not be released. Right now these
properties are completely ignored if not part of a macro, and it's
probably sane to keep it that way. This was necessary to support MacOS's
"hold RALT while typing the codepoint characters" flow.
- Other refactor-y bits, like moving macro support to `kmk/common`
rather than sitting at the top level of the tree. One day `kmk/common`
may make sense to surface at top level `kmk/`, but that's a discussion
for another day.
2018-10-01 04:33:23 +02:00
|
|
|
unicode_mode = UnicodeModes.NOOP
|
2018-09-04 00:21:34 +02:00
|
|
|
keymap = []
|
|
|
|
row_pins = []
|
|
|
|
col_pins = []
|
|
|
|
matrix = []
|
|
|
|
diode_orientation = DiodeOrientation.COLUMNS
|
2018-09-22 02:22:03 +02:00
|
|
|
active_layers = [0]
|
2018-09-22 09:46:14 +02:00
|
|
|
_oldstates = []
|
2018-09-04 00:21:34 +02:00
|
|
|
|
2018-09-22 09:46:14 +02:00
|
|
|
def __init__(self, preserve_intermediate_states=False):
|
|
|
|
self.preserve_intermediate_states = preserve_intermediate_states
|
|
|
|
|
2018-09-23 06:49:58 +02:00
|
|
|
def __enter__(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
def __exit__(self, type, value, traceback):
|
|
|
|
pass
|
|
|
|
|
2018-09-22 09:46:14 +02:00
|
|
|
def to_dict(self, verbose=False):
|
|
|
|
ret = {
|
2018-09-04 00:21:34 +02:00
|
|
|
'keys_pressed': self.keys_pressed,
|
2018-09-22 02:22:03 +02:00
|
|
|
'active_layers': self.active_layers,
|
Massive refactor largely to support Unicode on Mac
This does a bunch of crazy stuff:
- The ability to set a unicode mode (right now only Linux+ibus or
MacOS-RALT) in the keymap. This will be changeable at runtime soon, to
allow a single keyboard to be able to send table flips and whatever
other crazy stuff on any OS the board is plugged into (something that's
not currently doable on QMK, so yay us?)
- As part of the above, there is now just one user-facing macro for
unicode codepoint submission,
`kmk.common.macros.unicode.unicode_sequence`. Users should never use the
platform-specific macros, partly because they just outright won't work.
There's all sorts of fun stuff in these methods now, thank goodness
MicroPython supports the `yield from` construct.
- Keycode (these should really be renamed Keysym or something) objects
that are intended to not be pressed, or not be released. Right now these
properties are completely ignored if not part of a macro, and it's
probably sane to keep it that way. This was necessary to support MacOS's
"hold RALT while typing the codepoint characters" flow.
- Other refactor-y bits, like moving macro support to `kmk/common`
rather than sitting at the top level of the tree. One day `kmk/common`
may make sense to surface at top level `kmk/`, but that's a discussion
for another day.
2018-10-01 04:33:23 +02:00
|
|
|
'unicode_mode': self.unicode_mode,
|
2018-09-04 00:21:34 +02:00
|
|
|
}
|
2018-09-03 22:50:12 +02:00
|
|
|
|
2018-09-22 09:46:14 +02:00
|
|
|
if verbose:
|
|
|
|
ret.update({
|
|
|
|
'keymap': self.keymap,
|
|
|
|
'matrix': self.matrix,
|
|
|
|
'col_pins': self.col_pins,
|
|
|
|
'row_pins': self.row_pins,
|
|
|
|
'diode_orientation': self.diode_orientation,
|
|
|
|
})
|
2018-09-03 22:50:12 +02:00
|
|
|
|
2018-09-22 09:46:14 +02:00
|
|
|
return ret
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'InternalState({})'.format(self.to_dict())
|
2018-09-03 22:50:12 +02:00
|
|
|
|
2018-09-22 09:46:14 +02:00
|
|
|
def update(self, **kwargs):
|
|
|
|
if self.preserve_intermediate_states:
|
|
|
|
self._oldstates.append(repr(self.to_dict(verbose=True)))
|
2018-09-03 22:50:12 +02:00
|
|
|
|
2018-09-04 00:21:34 +02:00
|
|
|
for k, v in kwargs.items():
|
2018-09-22 09:46:14 +02:00
|
|
|
setattr(self, k, v)
|
2018-09-03 22:50:12 +02:00
|
|
|
|
2018-09-22 09:46:14 +02:00
|
|
|
return self
|
2018-09-03 22:50:12 +02:00
|
|
|
|
|
|
|
|
2018-09-23 06:49:58 +02:00
|
|
|
def find_key_in_map(state, row, col):
|
|
|
|
# Later-added layers have priority. Sift through the layers
|
|
|
|
# in reverse order until we find a valid keycode object
|
|
|
|
for layer in reversed(state.active_layers):
|
|
|
|
layer_key = state.keymap[layer][row][col]
|
|
|
|
|
|
|
|
if not layer_key or layer_key == Keycodes.KMK.KC_TRNS:
|
|
|
|
continue
|
|
|
|
|
|
|
|
if layer_key == Keycodes.KMK.KC_NO:
|
|
|
|
break
|
|
|
|
|
|
|
|
return layer_key
|
|
|
|
|
|
|
|
|
2018-09-03 22:50:12 +02:00
|
|
|
def kmk_reducer(state=None, action=None, logger=None):
|
|
|
|
if state is None:
|
|
|
|
state = InternalState()
|
|
|
|
|
|
|
|
if logger is not None:
|
|
|
|
logger.debug('Reducer received state of None, creating new')
|
|
|
|
|
|
|
|
if action is None:
|
|
|
|
if logger is not None:
|
|
|
|
logger.debug('No action received, returning state unmodified')
|
|
|
|
|
|
|
|
return state
|
|
|
|
|
2018-10-01 07:50:04 +02:00
|
|
|
if action[0] == NEW_MATRIX_EVENT:
|
2018-10-01 09:31:45 +02:00
|
|
|
matrix_keys_pressed = {
|
|
|
|
find_key_in_map(state, row, col)
|
|
|
|
for row, col in action[1]
|
|
|
|
}
|
2018-09-23 06:49:58 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
pressed = matrix_keys_pressed - state.keys_pressed
|
|
|
|
released = state.keys_pressed - matrix_keys_pressed
|
2018-10-01 03:03:43 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
if not pressed and not released:
|
2018-10-01 03:03:43 +02:00
|
|
|
return state
|
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
for changed_key in released:
|
|
|
|
if not changed_key:
|
|
|
|
continue
|
2018-09-03 22:50:12 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
elif isinstance(changed_key, KMKMacro):
|
|
|
|
if changed_key.keyup:
|
|
|
|
state.macro_pending = changed_key.keyup
|
2018-09-22 08:44:30 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
elif changed_key.code >= FIRST_KMK_INTERNAL_KEYCODE:
|
|
|
|
state = process_internal_key_event(state, KEY_UP_EVENT, changed_key, logger=logger)
|
2018-09-22 08:44:30 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
for changed_key in pressed:
|
|
|
|
if not changed_key:
|
|
|
|
continue
|
2018-09-23 06:49:58 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
elif isinstance(changed_key, KMKMacro):
|
|
|
|
if changed_key.keydown:
|
|
|
|
state.macro_pending = changed_key.keydown
|
2018-09-23 06:49:58 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
elif changed_key.code >= FIRST_KMK_INTERNAL_KEYCODE:
|
|
|
|
state = process_internal_key_event(
|
|
|
|
state,
|
|
|
|
KEY_DOWN_EVENT,
|
|
|
|
changed_key,
|
|
|
|
logger=logger,
|
2018-10-01 03:03:43 +02:00
|
|
|
)
|
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
state.matrix = action[1]
|
|
|
|
state.keys_pressed |= pressed
|
|
|
|
state.keys_pressed -= released
|
|
|
|
state.hid_pending = True
|
2018-10-01 03:03:43 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
return state
|
2018-09-04 00:21:34 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
if action[0] == KEYCODE_UP_EVENT:
|
|
|
|
state.keys_pressed.discard(action[1])
|
|
|
|
state.hid_pending = True
|
|
|
|
return state
|
2018-09-22 08:44:30 +02:00
|
|
|
|
2018-10-01 09:31:45 +02:00
|
|
|
if action[0] == KEYCODE_DOWN_EVENT:
|
|
|
|
state.keys_pressed.add(action[1])
|
|
|
|
state.hid_pending = True
|
|
|
|
return state
|
2018-09-22 08:44:30 +02:00
|
|
|
|
2018-10-01 07:50:04 +02:00
|
|
|
if action[0] == INIT_FIRMWARE_EVENT:
|
2018-09-22 09:46:14 +02:00
|
|
|
return state.update(
|
2018-10-01 07:50:04 +02:00
|
|
|
keymap=action.keymap,
|
|
|
|
row_pins=action.row_pins,
|
|
|
|
col_pins=action.col_pins,
|
|
|
|
diode_orientation=action.diode_orientation,
|
|
|
|
unicode_mode=action.unicode_mode,
|
2018-09-04 00:21:34 +02:00
|
|
|
matrix=[
|
2018-10-01 07:50:04 +02:00
|
|
|
[False for c in action.col_pins]
|
|
|
|
for r in action.row_pins
|
2018-09-04 00:21:34 +02:00
|
|
|
],
|
|
|
|
)
|
2018-09-23 06:49:58 +02:00
|
|
|
|
|
|
|
# HID events are non-mutating, used exclusively for listeners to know
|
|
|
|
# they should be doing things. This could/should arguably be folded back
|
|
|
|
# into KEY_UP_EVENT and KEY_DOWN_EVENT, but for now it's nice to separate
|
|
|
|
# this out for debugging's sake.
|
2018-10-01 07:50:04 +02:00
|
|
|
if action[0] == HID_REPORT_EVENT:
|
2018-10-01 09:31:45 +02:00
|
|
|
state.hid_pending = False
|
2018-09-23 06:49:58 +02:00
|
|
|
return state
|
|
|
|
|
2018-10-01 07:50:04 +02:00
|
|
|
if action[0] == MACRO_COMPLETE_EVENT:
|
Massive refactor largely to support Unicode on Mac
This does a bunch of crazy stuff:
- The ability to set a unicode mode (right now only Linux+ibus or
MacOS-RALT) in the keymap. This will be changeable at runtime soon, to
allow a single keyboard to be able to send table flips and whatever
other crazy stuff on any OS the board is plugged into (something that's
not currently doable on QMK, so yay us?)
- As part of the above, there is now just one user-facing macro for
unicode codepoint submission,
`kmk.common.macros.unicode.unicode_sequence`. Users should never use the
platform-specific macros, partly because they just outright won't work.
There's all sorts of fun stuff in these methods now, thank goodness
MicroPython supports the `yield from` construct.
- Keycode (these should really be renamed Keysym or something) objects
that are intended to not be pressed, or not be released. Right now these
properties are completely ignored if not part of a macro, and it's
probably sane to keep it that way. This was necessary to support MacOS's
"hold RALT while typing the codepoint characters" flow.
- Other refactor-y bits, like moving macro support to `kmk/common`
rather than sitting at the top level of the tree. One day `kmk/common`
may make sense to surface at top level `kmk/`, but that's a discussion
for another day.
2018-10-01 04:33:23 +02:00
|
|
|
return state.update(macro_pending=None)
|
2018-10-01 03:03:43 +02:00
|
|
|
|
2018-09-23 06:49:58 +02:00
|
|
|
# On unhandled events, log and do not mutate state
|
|
|
|
logger.warning('Unhandled event! Returning state unmodified.')
|
|
|
|
return state
|