Adding full partial layer support.

[kiibohd-kll.git] / kll_lib / containers.py

diff --git a/kll_lib/containers.py b/kll_lib/containers.py
index a6c205ad96a6997b549fbc0e67b89a2734e009a2..d54ff1029e8d7e3a5b5c8a244ba59c93056c0d44 100644 (file)
--- a/kll_lib/containers.py
+++ b/kll_lib/containers.py
@@ -18,6 +18,8 @@
 
 ### Imports ###
 
+import copy
+
 
 
 ### Decorators ###
@@ -86,6 +88,10 @@ class Macros:
                # Macro Storage
                self.macros = [ dict() ]
 
+               # Base Layout Storage
+               self.baseLayout = None
+               self.layerLayoutMarkers = []
+
                # Correlated Macro Data
                self.resultsIndex = dict()
                self.triggersIndex = dict()
@@ -100,10 +106,23 @@ class Macros:
        def __repr__( self ):
                return "{0}".format( self.macros )
 
+       def completeBaseLayout( self ):
+               # Copy base layout for later use when creating partial layers and add marker
+               self.baseLayout = copy.deepcopy( self.macros[ 0 ] )
+               self.layerLayoutMarkers.append( copy.deepcopy( self.baseLayout ) ) # Not used for default layer, just simplifies coding
+
+       def removeUnmarked( self ):
+               # Remove all of the unmarked mappings from the partial layer
+               for trigger in self.layerLayoutMarkers[ self.layer ].keys():
+                       del self.macros[ self.layer ][ trigger ]
+
        def addLayer( self ):
                # Increment layer count, and append another macros dictionary
                self.layer += 1
-               self.macros.append( dict() )
+               self.macros.append( copy.deepcopy( self.baseLayout ) )
+
+               # Add a layout marker for each layer
+               self.layerLayoutMarkers.append( copy.deepcopy( self.baseLayout ) )
 
        # Use for ScanCode trigger macros
        def appendScanCode( self, trigger, result ):
@@ -123,6 +142,10 @@ class Macros:
        def replaceScanCode( self, trigger, result ):
                self.macros[ self.layer ][ trigger ] = [ result ]
 
+               # Mark layer scan code, so it won't be removed later
+               if not self.baseLayout is None:
+                       del self.layerLayoutMarkers[ self.layer ][ trigger ]
+
        # Return a list of ScanCode triggers with the given USB Code trigger
        def lookupUSBCodes( self, usbCode ):
                scanCodeList = []