v79 (non beta): merge to master

- fixed reload / same layer

capsicain/capsicain.cpp

@@ -254,7 +254,7 @@ int main()
     }
 
     parseIniGlobals();
-    switchLayer(globals.activeLayerOnStartup);
+    switchLayer(globals.activeLayerOnStartup, true);
 
     interceptionState.interceptionContext = interception_create_context();
     interception_set_filter(interceptionState.interceptionContext, interception_is_keyboard, INTERCEPTION_FILTER_KEY_ALL);
@@ -637,7 +637,7 @@ bool processCommand()
     case SC_0:
     {
         cout << endl << "LAYER CHANGE: " << LAYER_DISABLED;
-        switchLayer(LAYER_DISABLED);
+        switchLayer(LAYER_DISABLED, 0);
         break;
     }
     case SC_1:
@@ -652,7 +652,7 @@ bool processCommand()
     {
         int layer = loopState.scancode - 1;
         cout << endl << "LAYER CHANGE: " << layer;
-        switchLayer(layer);
+        switchLayer(layer, false);
         break;
     }
     case SC_BACK:
@@ -1179,9 +1179,9 @@ bool parseProcessIniLayer(int layer)
     return true;
 }
 
-void switchLayer(int layer)
+void switchLayer(int layer, bool forceReloadSameLayer)
 {
-    if (layer == globalState.activeLayer)
+    if (!forceReloadSameLayer && layer == globalState.activeLayer)
         return;
 
     int oldLayer = globalState.activeLayer;
@@ -1254,7 +1254,7 @@ void reload()
     readSanitizeIniFile(sanitizedIniContent);
 
     parseIniGlobals();
-    switchLayer(globalState.activeLayer);
+    switchLayer(globalState.activeLayer, true);
 }
 
 //Release all keys to 'up' that have been sent out as 'down'
@@ -1461,7 +1461,7 @@ void sendCapsicainCodeHandler(VKeyEvent keyEvent)
     }
     case VK_CPS_LAYERPREVIOUS:
     {
-        switchLayer(globalState.previousLayer);
+        switchLayer(globalState.previousLayer, false);
     }
     }
 
@@ -1524,7 +1524,7 @@ void playKeyEventSequence(vector<VKeyEvent> keyEventSequence)
         else if (expectNextLayerSwitch)
         {
             IFDEBUG cout << endl << "vklayerswitch: " << getPrettyVKLabelPadded(keyEvent.vcode, 0);
-            switchLayer(keyEvent.vcode);
+            switchLayer(keyEvent.vcode, false);
             expectNextLayerSwitch = false;
         }
         //release and remember all keys that are physically down

capsicain/capsicain.h

@@ -56,6 +56,6 @@ void reset();
 void reload();
 void releaseAllSentKeys();
 std::vector<std::string> assembleLayerConfig(int layer);
-void switchLayer(int layer);
+void switchLayer(int layer, bool forceReloadSameLayer);
 void resetCapsNumScrollLock();
 

capsicain/capsicain.ini

@@ -53,7 +53,7 @@ GLOBAL IniVersion ini66
                 #any string, so you can check with Status [ESC]+[S] if you're using the right config
 
 
-#GLOBAL ActiveLayerOnStartup 1
+GLOBAL ActiveLayerOnStartup 1
                 #This layer is active on startup. Default=1
                 #Switch layer with [ESC]+[0..9]  
                 #0=hardcoded = no changes at all, Only listen to layer change (ESC + number)
@@ -163,6 +163,7 @@ COMBO  V   [&^^^ .... ....] > sequence (&LSHF_H_^LSHF_e_l_l_o_SLEEP:1000_&LSHF_1
 REWIRE LCTRL NOP // LSHF
 COMBO F11  [...& .... ....] > layerSwitch(11) //should fail
 
+
 #Collect the many sections for the 'KingCon' config into one 'super-module'
 #The order of the includes may matter - the first matching rule always wins.
 [KINGCON_ALL_SECTIONS_BUT_LAYOUT]
@@ -183,7 +184,6 @@ INCLUDE KINGCON_NUMPAD+CONTROL_TO_TABLE1
 INCLUDE KINGCON_NUMPAD+CONTROL+SHIFT_TO_TABLE2
 INCLUDE CAPS+NUMBERS_TO_AHK_CLIPBOARDS
 INCLUDE WINDOWS_SHORTCUTS
-INCLUDE LAYER_SWITCH
 INCLUDE SHOWOFF
 
 # ╔════════════════════════════════════════════════════════════════════════╗

capsicain/codenotes.txt

@@ -116,3 +116,5 @@ v78beta: configurable layer change
 - new functions > layerSwitch(0..9), > layerPrevious()
 - disable Ctrl-C
 - (new internal vkeys LAYERSWITCH, LAYERPREVIOUS)
+
+v79: fix reload, final non-beta

capsicain/constants.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#define VERSION "79beta"
+#define VERSION "79"
 
 
 //arbitray limits