- fix #570

currentGitHash.txt

@@ -1 +1 @@
-56f5d952eaa1a4f4977e0330fbfdc3dfc2806b6f
+c08142b60dfc4ea71c335649649cda259c492d3b

hi_backend/backend/currentGit.h

@@ -1 +1 @@
-#define PREVIOUS_HISE_COMMIT "56f5d952eaa1a4f4977e0330fbfdc3dfc2806b6f" 
+#define PREVIOUS_HISE_COMMIT "c08142b60dfc4ea71c335649649cda259c492d3b" 

hi_scripting/scripting/api/ScriptingApiContent.cpp

@@ -1595,8 +1595,7 @@ void ScriptComponent::setConsumedKeyPresses(var listOfKeys)
 
 	if(listOfKeys.isArray())
 	{
-		catchAllKeys = false;
-
+		catchAllKeys = AllCatchBehaviour::Inactive;
 		for(const auto& v: *listOfKeys.getArray())
 		{
 			auto k = ApiHelpers::getKeyPress(v, &r);
@@ -1611,15 +1610,19 @@ void ScriptComponent::setConsumedKeyPresses(var listOfKeys)
 	{
         if(listOfKeys.toString() == "all")
         {
-            catchAllKeys = true;
+            catchAllKeys = AllCatchBehaviour::Exclusive;
         }
+		else if(listOfKeys.toString() == "all_nonexclusive")
+		{
+			catchAllKeys = AllCatchBehaviour::NonExlusive;
+		}
         else
         {
             auto k = ApiHelpers::getKeyPress(listOfKeys, &r);
 
             if(r.wasOk())
             {
-                catchAllKeys = false;
+                catchAllKeys = AllCatchBehaviour::Inactive;
                 registeredKeys.add(k);
             }
             else
@@ -1636,18 +1639,16 @@ bool ScriptingApi::Content::ScriptComponent::handleKeyPress(const KeyPress& k)
 {
 	if (keyboardCallback)
 	{
-		if(catchAllKeys || registeredKeys.contains(k))
+		auto matchesKey = registeredKeys.contains(k);
+
+		if((catchAllKeys != AllCatchBehaviour::Inactive) || matchesKey)
 		{
 			auto args = Content::createKeyboardCallbackObject(k);
-
-			var rv;
-
 			keyboardCallback.call(&args, 1); 
 
-			return true;
+			bool consumed = matchesKey || catchAllKeys == AllCatchBehaviour::Exclusive;
+			return consumed;
 		}
-
-
 	}
 
 	return false;

hi_scripting/scripting/api/ScriptingApiContent.h

@@ -758,6 +758,13 @@ class ScriptingApi::Content : public ScriptingObject,
 
 	private:
 
+		enum class AllCatchBehaviour
+		{
+			Inactive,
+			Exclusive,
+			NonExlusive
+		};
+
 		int pseudoState = 0;
 
 		void sendValueListenerMessage();
@@ -767,7 +774,7 @@ class ScriptingApi::Content : public ScriptingObject,
 		MacroControlledObject::ModulationPopupData::Ptr modulationData;
 
         bool consumedCalled = false;
-		bool catchAllKeys = true;
+		AllCatchBehaviour catchAllKeys = AllCatchBehaviour::Exclusive;
 		Array<juce::KeyPress> registeredKeys;
 
 		WeakCallbackHolder keyboardCallback;