Client: modify eventfilter for Key_meta

KangLin · May 20, 2023 · e48585e · e48585e
1 parent 8679a19
commit e48585e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/Client/Client.cpp b/Client/Client.cpp
@@ -37,6 +37,7 @@ CClient::CClient(QObject *parent) : QObject(parent),
     check = connect(&m_ParameterClient, SIGNAL(sigHookKeyboardChanged()),
                     this, SLOT(slotHookKeyboardChanged()));
     Q_ASSERT(check);
+    // TODO: Disabe it ?
     if(m_ParameterClient.GetHookKeyboard())
         m_Hook = QSharedPointer<CHook>(CHook::GetHook());
 }
@@ -258,7 +259,8 @@ void CClient::slotHookKeyboardChanged()
     {
         m_Hook = QSharedPointer<CHook>(CHook::GetHook());
     } else {
-        m_Hook.reset();
+        if(m_Hook)
+            m_Hook.reset();
     }
 }
 
@@ -269,7 +271,17 @@ bool CClient::eventFilter(QObject *watched, QEvent *event)
         //qDebug(Client) << "eventFilter:" << event;
         bool bProcess = false;
         QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-        switch (keyEvent->key()) {
+        int key = keyEvent->key();
+        switch (key) {
+        case Qt::Key_Meta:
+#if defined(Q_OS_WIN)
+            key = Qt::Key_Super_L;
+#endif
+#if defined(Q_OS_MACOS)
+            key = Qt::Qt::Key_Control;
+#endif
+            bProcess = true;
+            break;
         case Qt::Key_Tab:
         case Qt::Key_Alt:
             bProcess = true;
@@ -284,19 +296,20 @@ bool CClient::eventFilter(QObject *watched, QEvent *event)
             {
                 CFrmViewer* focus = qobject_cast<CFrmViewer*>(QApplication::focusWidget());
                 if(focus) {
-                    emit focus->sigKeyPressEvent(keyEvent->key(), keyEvent->modifiers());
+                    emit focus->sigKeyPressEvent(key, keyEvent->modifiers());
                     return true;
                 }
             }
             case QEvent::KeyRelease:
             {
                 CFrmViewer* focus = qobject_cast<CFrmViewer*>(QApplication::focusWidget());
                 if(focus) {
-                    emit focus->sigKeyReleaseEvent(keyEvent->key(), keyEvent->modifiers());
+                    emit focus->sigKeyReleaseEvent(key, keyEvent->modifiers());
                     return true;
                 }
-
             }
+            default:
+                break;
             }
         }
     }

diff --git a/Client/FrmViewer.cpp b/Client/FrmViewer.cpp
@@ -190,16 +190,16 @@ void CFrmViewer::wheelEvent(QWheelEvent *event)
 
 void CFrmViewer::keyPressEvent(QKeyEvent *event)
 {
-    //qDebug(Client) << "keyPressEvent key:" << event->key() << "modifiers:" << event->modifiers();
+    //qDebug(Client) << "CFrmViewer::keyPressEvent" << event;
     emit sigKeyPressEvent(event->key(), event->modifiers());
-    //event->accept();
+    event->accept();
 }
 
 void CFrmViewer::keyReleaseEvent(QKeyEvent *event)
 {
-    //qDebug(Client) << "keyReleaseEvent key:" << event->key() << "modifiers:" << event->modifiers();
+    //qDebug(Client) << "CFrmViewer::keyReleaseEvent" << event;
     emit sigKeyReleaseEvent(event->key(), event->modifiers());
-    //event->accept();
+    event->accept();
 }
 
 void CFrmViewer::slotSystemCombination()

diff --git a/Client/Windows/HookWindows.cpp b/Client/Windows/HookWindows.cpp
@@ -1,7 +1,10 @@
 #include "HookWindows.h"
 #include "FrmViewer.h"
 #include <QApplication>
-#include <QDebug>
+
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(clientHookWindows, "Client.Hook.Windows")
 
 CHook* CHook::GetHook(QObject *parent)
 {
@@ -20,7 +23,7 @@ CHookWindows::CHookWindows(QObject *parent)
 
 CHookWindows::~CHookWindows()
 {
-    qDebug() << "CHookWindows::~CHookWindows()";
+    qDebug(clientHookWindows) << "CHookWindows::~CHookWindows()";
     UnRegisterKeyboard();
 }
 
@@ -30,8 +33,10 @@ LRESULT CALLBACK CHookWindows::keyboardHookProc(INT code, WPARAM wparam, LPARAM
     if (code == HC_ACTION)
     {
         KBDLLHOOKSTRUCT* hook = reinterpret_cast<KBDLLHOOKSTRUCT*>(lparam);
-//        LOG_MODEL_DEBUG("CHookWindows", "vkCode: 0x%X; scanCode: 0x%X; flags: 0x%X",
-//                        hook->vkCode, hook->scanCode, hook->flags);
+        /*
+        qDebug(clientHookWindows) << "process vkCode:" << hook->vkCode
+                                  << "scanCode:" << hook->scanCode
+                                  << "flags:" << hook->flags;//*/
         int key = 0;
         Qt::KeyboardModifiers keyMdf = Qt::NoModifier;
         switch(hook->vkCode)
@@ -49,11 +54,13 @@ LRESULT CALLBACK CHookWindows::keyboardHookProc(INT code, WPARAM wparam, LPARAM
         case VK_LWIN:
         {
             key = Qt::Key_Super_L;
+            keyMdf = Qt::MetaModifier;
             break;
         }
         case VK_RWIN:
         {
             key = Qt::Key_Super_R;
+            keyMdf = Qt::MetaModifier;
             break;
         }
         /*
@@ -93,8 +100,10 @@ LRESULT CALLBACK CHookWindows::keyboardHookProc(INT code, WPARAM wparam, LPARAM
                     emit self->sigKeyPressEvent(key, keyMdf);
                 if(wparam == WM_KEYUP || wparam == WM_SYSKEYUP)
                     emit self->sigKeyReleaseEvent(key, Qt::NoModifier);
-//                LOG_MODEL_DEBUG("CHookWindows", "process vkCode: 0x%X; scanCode: 0x%X; flags: 0x%X",
-//                                hook->vkCode, hook->scanCode, hook->flags);
+                /*
+                qDebug(clientHookWindows) << "process vkCode:" << hook->vkCode
+                                          << "scanCode:" << hook->scanCode
+                                          << "flags:" << hook->flags;//*/
                 return 0;
             }
         }