UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/events] Compare event for repetition

Browse Source 
This fixes the following bug :
  (Anywhere with a movable cursor, like a table, a text field or a curve)
  - press Alpha (once, or twice to activate the lock)
  - keep pressing a direction
--> The cursor would only move once.

Change-Id: I46115d1a31ced244615bfdfe08f37dfe7e918d6e
This commit is contained in:
Gabriel Ozouf
2020-09-30 10:12:12 +02:00
committed by Émilie Feral
parent d8e6b63a2e
commit ab864d10d8
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ion/src/shared/events_keyboard.cpp
View File

@@ -50,6 +50,10 @@ void resetLongRepetition() {
ComputeAndSetRepetionFactor(sEventRepetitionCount);
}
static Keyboard::Key keyFromState(Keyboard::State state) {
return static_cast<Keyboard::Key>(63 - __builtin_clzll(state));
}
Event getEvent(int * timeout) {
assert(*timeout > delayBeforeRepeat);
assert(*timeout > delayBetweenRepeat);
@@ -66,6 +70,11 @@ Event getEvent(int * timeout) {
keysSeenUp |= ~state;
keysSeenTransitionningFromUpToDown = keysSeenUp & state;
Keyboard::Key key;
bool shift = isShiftActive() || state.keyDown(Keyboard::Key::Shift);
bool alpha = isAlphaActive() || state.keyDown(Keyboard::Key::Alpha);
bool lock = isLockActive();
if (keysSeenTransitionningFromUpToDown != 0) {
sEventIsRepeating = false;
resetLongRepetition();
@@ -75,10 +84,7 @@ Event getEvent(int * timeout) {
* processors have an instruction (ARM thumb uses CLZ).
* Unfortunately there's no way to express this in standard C, so we have
* to resort to using a builtin function. */
Keyboard::Key key = (Keyboard::Key)(63-__builtin_clzll(keysSeenTransitionningFromUpToDown));
bool shift = isShiftActive() || state.keyDown(Keyboard::Key::Shift);
bool alpha = isAlphaActive() || state.keyDown(Keyboard::Key::Alpha);
bool lock = isLockActive();
key = keyFromState(keysSeenTransitionningFromUpToDown);
Event event(key, shift, alpha, lock);
sLastEventShift = shift;
sLastEventAlpha = alpha;
@@ -97,10 +103,11 @@ Event getEvent(int * timeout) {
// At this point, we know that keysSeenTransitionningFromUpToDown has *always* been zero
// In other words, no new key has been pressed
key = keyFromState(state);
Event event(key, shift, alpha, lock);
if (canRepeatEvent(sLastEvent)
&& state == sLastKeyboardState
&& sLastEventShift == state.keyDown(Keyboard::Key::Shift)
&& sLastEventAlpha == state.keyDown(Keyboard::Key::Alpha))
&& sLastEvent == event)
{
int delay = (sEventIsRepeating ? delayBetweenRepeat : delayBeforeRepeat);
if (time >= delay) {