Mulitple independent handlers for same entity/event.

Howard Stearns committed 11 years ago

Commit a0d09c01 parent b884d3c2 files · +17 −9Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+16−8

     const RegisteredEventHandlers& handlersOnEntity = _registeredHandlers[entityID];
     if (!handlersOnEntity.contains(eventName)) return;
     // FIXME: Need one more level of indirection. We need to allow multiple handlers per event, registered by different scripts.
-    QScriptValue handlerForEvent = handlersOnEntity[eventName];
+    QScriptValueList handlersForEvent = handlersOnEntity[eventName];
-    if (handlerForEvent.isValid()) {
+    if (!handlersForEvent.isEmpty()) {
         QScriptValueList args = argGenerator();
-        handlerForEvent.call(QScriptValue(), args);
+        for (int i = 0; i < handlersForEvent.count(); ++i) {
+            handlersForEvent[i].call(QScriptValue(), args);
+        }
     }
 }
-// Unregister the handler for this eventName and entityID.
+// Unregister the handlers for this eventName and entityID.
 void ScriptEngine::removeEntityEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler) {
     if (!_registeredHandlers.contains(entityID)) return;
     RegisteredEventHandlers& handlersOnEntity = _registeredHandlers[entityID];
-    if (!handlersOnEntity.contains(eventName)) return;
+    QScriptValueList& handlersForEvent = handlersOnEntity[eventName];
-    handlersOnEntity.remove(eventName);
+    // QScriptValue does not have operator==(), so we can't use QList::removeOne and friends. So iterate.
+    for (int i = 0; i < handlersForEvent.count(); ++i) {
+        if (handlersForEvent[i].equals(handler)) {
+            handlersForEvent.removeAt(i);
+            return; // Design choice: since comparison is relatively expensive, just remove the first matching handler.
+        }
+    }
 }
-// FIXME: deletingEntity, changingEntityID
 // Register the handler.
 void ScriptEngine::addEntityEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler) {
     if (_registeredHandlers.count() == 0) { // First time any per-entity handler has been added in this script...
     if (!_registeredHandlers.contains(entityID)) {
         _registeredHandlers[entityID] = RegisteredEventHandlers();
     }
-    _registeredHandlers[entityID][eventName] = handler;
+    QScriptValueList& handlersForEvent = _registeredHandlers[entityID][eventName];
+    handlersForEvent << handler; // Note that the same handler can be added many times. See removeEntityEventHandler().
 }