Make processActivateKeyPostponed act well on active keys.

kareltucek · Aug 13, 2021 · d06b654 · d06b654
1 parent ac0c0b2
commit d06b654
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/right/src/macros.c b/right/src/macros.c
@@ -1782,8 +1782,13 @@ static bool processActivateKeyPostponedCommand(const char* arg1, const char* arg
 {
     uint16_t keyid = parseNUM(arg1, argEnd);
     key_state_t* key = Utils_KeyIdToKeyState(keyid);
-    PostponerCore_TrackKeyEvent(key, true);
-    PostponerCore_TrackKeyEvent(key, false);
+    if(PostponerQuery_IsActiveEventually(key)) {
+        PostponerCore_TrackKeyEvent(key, false);
+        PostponerCore_TrackKeyEvent(key, true);
+    } else {
+        PostponerCore_TrackKeyEvent(key, true);
+        PostponerCore_TrackKeyEvent(key, false);
+    }
     return false;
 }
 

diff --git a/right/src/postponer.c b/right/src/postponer.c
@@ -140,6 +140,7 @@ uint8_t PostponerQuery_PendingKeypressCount()
     return cnt;
 }
 
+
 bool PostponerQuery_IsKeyReleased(key_state_t* key)
 {
     if (key == NULL) {
@@ -153,6 +154,19 @@ bool PostponerQuery_IsKeyReleased(key_state_t* key)
     return false;
 }
 
+bool PostponerQuery_IsActiveEventually(key_state_t* key)
+{
+    if (key == NULL) {
+        return false;
+    }
+    for ( int8_t i = bufferSize - 1; i >= 0; i-- ) {
+        if (buffer[POS(i)].key == key) {
+            return buffer[POS(i)].active;
+        }
+    }
+    return KeyState_Active(key);
+}
+
 //##########################
 //### Extended Functions ###
 //##########################

diff --git a/right/src/postponer.h b/right/src/postponer.h
@@ -55,6 +55,7 @@
 
     uint8_t PostponerQuery_PendingKeypressCount();
     bool PostponerQuery_IsKeyReleased(key_state_t* key);
+    bool PostponerQuery_IsActiveEventually(key_state_t* key);
 
 // Functions (Query APIs extended):
     uint16_t PostponerExtended_PendingId(uint16_t idx);