process ANY consistently with CODAL/SIM

microsoft · May 15, 2019 · 1167fa3 · 1167fa3
1 parent d2ae6d8
commit 1167fa3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/libs/base/core.cpp b/libs/base/core.cpp
@@ -22,16 +22,26 @@ PXT_DEF_STRING(emptyString, "")
 static HandlerBinding *handlerBindings;
 
 HandlerBinding *findBinding(int source, int value) {
-    for (auto p = handlerBindings; p; p = p->next) {
-        if (p->source == source && p->value == value) {
+    return nextBinding(handlerBindings);
+}
+
+HandlerBinding *nextBinding(HandlerBinding *curr, int source, int value) {
+    for (auto p = curr; p; p = p->next) {
+        if ((p->source == source || p->source == DEVICE_ID_ANY) && (p->value == value || p->value == DEVICE_EVT_ANY) {
             return p;
         }
     }
     return 0;
 }
 
 void setBinding(int source, int value, Action act) {
-    auto curr = findBinding(source, value);
+    HandlerBinding* curr = NULL;
+    for (auto p = handlerBindings; p; p = p->next) {
+        if ((p->source == source) && (p->value == value) {
+            curr = p; 
+            break;
+        }
+    }
     incr(act);
     if (curr) {
         decr(curr->action);

diff --git a/libs/base/pxtbase.h b/libs/base/pxtbase.h
@@ -298,6 +298,7 @@ struct HandlerBinding {
     Action action;
 };
 HandlerBinding *findBinding(int source, int value);
+HandlerBinding *nextBinding(HandlerBinding* curr, int source, int value);
 void setBinding(int source, int value, Action act);
 
 // The standard calling convention is:

diff --git a/libs/core---linux/linux.cpp b/libs/core---linux/linux.cpp
@@ -255,12 +255,10 @@ static void dispatchEvent(Event &e) {
     lastEvent = e;
 
     auto curr = findBinding(e.source, e.value);
-    if (curr)
-        setupThread(curr->action, fromInt(e.value));
-
-    curr = findBinding(e.source, DEVICE_EVT_ANY);
-    if (curr)
+    while(curr) {
         setupThread(curr->action, fromInt(e.value));
+        curr = nextBinding(curr, e.source, e.value);
+    }
 }
 
 static void *evtDispatcher(void *dummy) {

diff --git a/libs/core/codal.cpp b/libs/core/codal.cpp
@@ -108,8 +108,10 @@ void dispatchEvent(Event e) {
 
     auto curr = findBinding(e.source, e.value);
     auto value = fromInt(e.value);
-    if (curr)
+    while (curr) {
         runAction1(curr->action, value);
+        curr = nextBinding(curr, e.source, e.value);
+    }
 }
 
 void registerWithDal(int id, int event, Action a, int flags) {