Added tempKeys, & lua hooks for tempKeys/permKeys

src/KeyUnit.cpp

@@ -77,6 +77,16 @@ void KeyUnit::compileAll()
     }
 }
 
+TKey* KeyUnit::findKey(QString& name)
+{
+    QMap<QString, TKey*>::const_iterator it = mLookupTable.find(name);
+    while (it != mLookupTable.end() && it.key() == name) {
+        TKey* pT = it.value();
+        return pT;
+    }
+    return 0;
+}
+
 bool KeyUnit::enableKey(const QString& name)
 {
     bool found = false;
@@ -99,6 +109,24 @@ bool KeyUnit::disableKey(const QString& name)
     return found;
 }
 
+bool KeyUnit::killKey(QString& name)
+{
+    for (auto it = mKeyRootNodeList.begin(); it != mKeyRootNodeList.end(); it++) {
+        TKey* pChild = *it;
+        if (pChild->getName() == name) {
+            // only temporary Keys can be killed
+            if (!pChild->isTempKey()) {
+                return false;
+            } else {
+                pChild->setIsActive(false);
+                markCleanup(pChild);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 void KeyUnit::addKeyRootNode(TKey* pT, int parentPosition, int childPosition)
 {
     if (!pT) {
@@ -158,9 +186,14 @@ void KeyUnit::reParentKey(int childID, int oldParentID, int newParentID, int par
 
 void KeyUnit::removeKeyRootNode(TKey* pT)
 {
-    if (!pT) {
+    if (!pT)
         return;
+    if (!pT->isTempKey()) {
+        mLookupTable.remove(pT->getName(), pT);
+    } else {
+        mLookupTable.remove(pT->getName());
     }
+    mKeyMap.remove(pT->getID());
     mKeyRootNodeList.remove(pT);
 }
 
@@ -227,8 +260,12 @@ void KeyUnit::addKey(TKey* pT)
 
 void KeyUnit::removeKey(TKey* pT)
 {
-    if (!pT) {
+    if (!pT)
         return;
+    if (!pT->isTempKey()) {
+        mLookupTable.remove(pT->getName(), pT);
+    } else {
+        mLookupTable.remove(pT->getName());
     }
     mKeyMap.remove(pT->getID());
 }
@@ -280,6 +317,79 @@ QString KeyUnit::getKeyName(int keyCode, int modifierCode)
     }
 }
 
+void KeyUnit::initStats()
+{
+    statsKeyTotal = 0;
+    statsTempKeys = 0;
+    statsActiveKeys = 0;
+    statsActiveKeysMax = 0;
+    statsActiveKeysMin = 0;
+    statsActiveKeysAverage = 0;
+    statsTempKeysCreated = 0;
+    statsTempKeysKilled = 0;
+}
+
+void KeyUnit::_assembleReport(TKey* pChild)
+{
+    list<TKey*>* childrenList = pChild->mpMyChildrenList;
+    for (auto it2 = childrenList->begin(); it2 != childrenList->end(); it2++) {
+        TKey* pT = *it2;
+        _assembleReport(pT);
+        if (pT->isActive())
+            statsActiveKeys++;
+        if (pT->isTempKey())
+            statsTempKeys++;
+        statsKeyTotal++;
+    }
+}
+
+QString KeyUnit::assembleReport()
+{
+    statsActiveKeys = 0;
+    statsKeyTotal = 0;
+    statsTempKeys = 0;
+    for (auto it = mKeyRootNodeList.begin(); it != mKeyRootNodeList.end(); it++) {
+        TKey* pChild = *it;
+        if (pChild->isActive())
+            statsActiveKeys++;
+        if (pChild->isTempKey())
+            statsTempKeys++;
+        statsKeyTotal++;
+        list<TKey*>* childrenList = pChild->mpMyChildrenList;
+        for (auto it2 = childrenList->begin(); it2 != childrenList->end(); it2++) {
+            TKey* pT = *it2;
+            _assembleReport(pT);
+            if (pT->isActive())
+                statsActiveKeys++;
+            if (pT->isTempKey())
+                statsTempKeys++;
+            statsKeyTotal++;
+        }
+    }
+    QStringList msg;
+    msg << "Keys current total: " << QString::number(statsKeyTotal) << "\n"
+        << "tempKeys current total: " << QString::number(statsTempKeys) << "\n"
+        << "active Keys: " << QString::number(statsActiveKeys) << "\n";
+    return msg.join("");
+}
+
+void KeyUnit::markCleanup(TKey* pT)
+{
+    for (auto it = mCleanupList.begin(); it != mCleanupList.end(); it++) {
+        if (*it == pT) {
+            return;
+        }
+    }
+    mCleanupList.push_back(pT);
+}
+
+void KeyUnit::doCleanup()
+{
+    for (auto it = mCleanupList.begin(); it != mCleanupList.end(); it++) {
+        delete *it;
+    }
+    mCleanupList.clear();
+}
 
 void KeyUnit::setupKeyNames()
 {

src/KeyUnit.h

@@ -51,23 +51,41 @@ class KeyUnit
 
     TKey* getKey(int id);
     void compileAll();
+    TKey* findKey(QString & name);
     bool enableKey(const QString& name);
     bool disableKey(const QString& name);
+    bool killKey(QString& name);
     bool registerKey(TKey* pT);
     void unregisterKey(TKey* pT);
     void reParentKey(int childID, int oldParentID, int newParentID, int parentPosition = -1, int childPosition = -1);
+    QString assembleReport();
     int getNewID();
     QString getKeyName(int keyCode, int modifier);
     void setupKeyNames();
     void uninstall(const QString&);
     void _uninstall(TKey* pChild, const QString& packageName);
     bool processDataStream(int, int);
+    void markCleanup( TKey * pT );
+    void doCleanup();
+
+    QMultiMap<QString, TKey*> mLookupTable;
+    std::list<TKey*> mCleanupList;
     QMutex mKeyUnitLock;
+    int statsKeyTotal;
+    int statsTempKeys;
+    int statsActiveKeys;
+    int statsActiveKeysMax;
+    int statsActiveKeysMin;
+    int statsActiveKeysAverage;
+    int statsTempKeysCreated;
+    int statsTempKeysKilled;
     QList<TKey*> uninstallList;
 
 private:
     KeyUnit() {}
     TKey* getKeyPrivate(int id);
+    void initStats();
+    void _assembleReport(TKey*);
     void addKeyRootNode(TKey* pT, int parentPosition = -1, int childPosition = -1);
     void addKey(TKey* pT);
     void removeKeyRootNode(TKey* pT);

src/TConsole.cpp

@@ -2727,16 +2727,22 @@ void TConsole::showStatistics()
 
     script = "setFgColor(190,150,0); setUnderline(true); echo([[\n\nTrigger Report:\n\n]]); setBold(false);setUnderline(false);setFgColor(150,120,0)";
     mpHost->mLuaInterpreter.compileAndExecuteScript( script );
-
     QString r1 = mpHost->getTriggerUnit()->assembleReport();
     msg = r1;
     print( msg, QColor(150, 120, 0), Qt::black );
     script = "setFgColor(190,150,0); setUnderline(true);echo([[\n\nTimer Report:\n\n]]);setBold(false);setUnderline(false);setFgColor(150,120,0)";
     mpHost->mLuaInterpreter.compileAndExecuteScript( script );
     QString r2 = mpHost->getTimerUnit()->assembleReport();
-    QString footer = QString("\n+--------------------------------------------------------------+\n" );
     msg = r2;
     print( msg, QColor(150, 120, 0), Qt::black );
+
+    script = "setFgColor(190,150,0); setUnderline(true);echo([[\n\nKeybinding Report:\n\n]]);setBold(false);setUnderline(false);setFgColor(150,120,0)";
+    mpHost->mLuaInterpreter.compileAndExecuteScript( script );
+    QString r3 = mpHost->getKeyUnit()->assembleReport();
+    msg = r3;
+    print( msg, QColor(150, 120, 0), Qt::black );
+
+    QString footer = QString("\n+--------------------------------------------------------------+\n" );
     mpHost->mpConsole->print( footer, QColor(150, 120, 0), Qt::black );
     script = "resetFormat();";
     mpHost->mLuaInterpreter.compileAndExecuteScript( script );

src/TKey.cpp

@@ -33,6 +33,7 @@ TKey::TKey( TKey * parent, Host * pHost )
 : Tree<TKey>( parent )
 , exportItem(true)
 , mModuleMasterFolder(false)
+, mIsTempKey( false )
 , mpHost( pHost )
 , mNeedsToBeCompiled( true )
 , mModuleMember(false)
@@ -43,9 +44,10 @@ TKey::TKey( TKey * parent, Host * pHost )
 }
 
 TKey::TKey( QString name, Host * pHost )
-: Tree<TKey>(0)
-, exportItem(true)
-, mModuleMasterFolder(false)
+: Tree<TKey>( 0 )
+, exportItem( true )
+, mModuleMasterFolder( false )
+, mIsTempKey( false )
 , mName( name )
 , mpHost( pHost )
 , mNeedsToBeCompiled( true )
@@ -64,6 +66,15 @@ TKey::~TKey()
     mpHost->getKeyUnit()->unregisterKey(this);
 }
 
+void TKey::setName( const QString& name )
+{
+    if( ! mIsTempKey )
+    {
+        mpHost->getKeyUnit()->mLookupTable.remove( mName, this );
+    }
+    mName = name;
+    mpHost->getKeyUnit()->mLookupTable.insertMulti( name, this );
+}
 
 bool TKey::match(int key, int modifier)
 {

src/TKey.h

@@ -43,7 +43,7 @@ class TKey : public Tree<TKey>
     TKey(QString name, Host* pHost);
     void compileAll();
     QString getName() { return mName; }
-    void setName(QString name) { mName = name; }
+    void setName(const QString & name);
     int getKeyCode() { return mKeyCode; }
     void setKeyCode(int code) { mKeyCode = code; }
     int getKeyModifiers() { return mKeyModifier; }
@@ -61,6 +61,8 @@ class TKey : public Tree<TKey>
     void setIsFolder(bool b) { mIsFolder = b; }
     bool match(int, int);
     bool registerKey();
+    bool isTempKey() { return mIsTempKey; }
+    void setIsTempKey(bool b) { mIsTempKey = b; }
     //bool             serialize( QDataStream & );
     //bool             restore( QDataStream & fs, bool );
     bool exportItem;
@@ -88,6 +90,7 @@ class TKey : public Tree<TKey>
     bool mIsFolder;
     QPointer<Host> mpHost;
     bool mNeedsToBeCompiled;
+    bool mIsTempKey;
     bool mModuleMember;
 };