block physical modifier up when included in hold, add moddedhold to r…

…elease modifiers before hold

capsicain/capsicain.cpp

@@ -1998,6 +1998,12 @@ void playKeyEventSequence(vector<VKeyEvent> keyEventSequence)
                 }
             }
         }
+        else if (vc == VK_CPS_RELEASEKEYS) //release all keys that are physically down
+        {
+            for (int i = 0; i <= 255; i++)
+                if (globalState.keysDownSent[i])
+                    sendVKeyEvent({ i, false }, false);
+        }
         //func key with param; wait for next key which is the param
         else if (vc == VK_CPS_SLEEP
             || vc == VK_CPS_DEADKEY
@@ -2029,6 +2035,15 @@ void playKeyEventSequence(vector<VKeyEvent> keyEventSequence)
         error("BUG: func key with param: " + getPrettyVKLabel(expectParamForFuncKey) + "is unfinished");
 }
 
+int getKeyHolding(int vcode)
+{
+    for (int i = 0; i <= 255; i++)
+    {
+        if (globalState.holdKeys[i].find(vcode) != globalState.holdKeys[i].end())
+            return i;
+    }
+    return 0;
+}
 
 void sendVKeyEvent(VKeyEvent keyEvent, bool hold)
 {
@@ -2060,9 +2075,12 @@ void sendVKeyEvent(VKeyEvent keyEvent, bool hold)
         }
         else
         {
+            vector<int> release;
             for (auto it = globalState.holdKeys[code].rbegin(); it != globalState.holdKeys[code].rend(); ++it)
-                sendVKeyEvent({*it, false}, false);
+                release.push_back(*it);
             globalState.holdKeys[code].clear();
+            for (auto key : release)
+                sendVKeyEvent({key, false}, false);
         }
         keyEvent.vcode = 0;
         return;
@@ -2079,6 +2097,13 @@ void sendVKeyEvent(VKeyEvent keyEvent, bool hold)
         return;
     }
 
+    auto holdingkey = getKeyHolding(scancode);
+    if (!keyEvent.isDownstroke && holdingkey)  //ignore up when other key is holding it
+    {
+        IFDEBUG cout << " {blocked " << PRETTY_VK_LABELS[scancode] << " UP: " << PRETTY_VK_LABELS[holdingkey] << " is holding}";
+        return;
+    }
+
     //consistency check
     if (globalState.keysDownSent[scancode] == 0 && keyEvent.isDownstroke)
         globalState.keysDownSentCounter++;

capsicain/configUtils.cpp

@@ -505,6 +505,12 @@ bool parseKeywordCombo(std::string line, int &key, unsigned short(&mods)[5], std
         if (!parseFunctionHold(funcParams, scLabels, strokeSeq))
             return false;
     }
+    else if (funcName == "moddedhold")
+    {
+        strokeSeq.push_back({ VK_CPS_RELEASEKEYS, true });
+        if (!parseFunctionHold(funcParams, scLabels, strokeSeq))
+            return false;
+    }
     else if (funcName == "combo")
     {
         if (!parseFunctionCombo(funcParams, scLabels, strokeSeq))

capsicain/scancodes.h

@@ -198,6 +198,7 @@ enum VirtualCode
     VK_CPS_OBFUSCATED_SEQUENCE_START = 0x115,
     VK_CPS_PAUSE = 0x116, // not a real scancode; Cherry Pause key sends an escaped key combo E1 LCTRL NUMLOCK
     VK_CPS_HOLDKEY = 0x117,
+    VK_CPS_RELEASEKEYS = 0x118,
 /* testing the VMK style config shift
     VK_SHFCFG0 = 0x117,  //shift config, i.e. shift back when the key is released
     VK_SHFCFG1 = 0x118,