Changeset 26790 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 25, 2010 12:19:22 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: global hotkey processing

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxDefs.h (modified) (1 diff)
• runtime/UIActionsPool.cpp (modified) (2 diffs)
• runtime/UIActionsPool.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (6 diffs)
• runtime/UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h

@@ -116 +116 @@
         , ShellExecuteEventType
 #endif
-        , ActivateMenuEventType
+        , ActivateMenuEventType /* remove when new core is active */
+        , ActivateActionEventType /* New name for new core */
 #if defined (Q_WS_MAC)
         , ShowWindowEventType

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp

@@ -25 +25 @@
 #include "UIActionsPool.h"
 #include "VBoxGlobal.h"
+
+/* Action activation event */
+class ActivateActionEvent : public QEvent
+{
+public:
+
+    ActivateActionEvent(QAction *pAction)
+        : QEvent((QEvent::Type)VBoxDefs::ActivateActionEventType)
+        , m_pAction(pAction) {}
+    QAction* action() const { return m_pAction; }
+
+private:
+
+    QAction *m_pAction;
+};
 
 UIAction::UIAction(QObject *pParent, UIActionType type)
@@ -849 +864 @@
 }
 
+bool UIActionsPool::processHotKey(const QKeySequence &key)
+{
+    for (int i = 0; i < m_actionsPool.size(); ++i)
+    {
+        UIAction *pAction = m_actionsPool.at(i);
+        /* Skip menus/separators */
+        if (pAction->type() == UIActionType_Menu || pAction->type() == UIActionType_Separator)
+            continue;
+        QString hotkey = VBoxGlobal::extractKeyFromActionText(pAction->text());
+        if (pAction->isEnabled() && !hotkey.isEmpty())
+        {
+            if (key.matches(QKeySequence(hotkey)) == QKeySequence::ExactMatch)
+            {
+                /* We asynchronously post a special event instead of calling
+                 * pAction->trigger() directly, to let key presses and
+                 * releases be processed correctly by Qt first.
+                 * Note: we assume that nobody will delete the menu item
+                 * corresponding to the key sequence, so that the pointer to
+                 * menu data posted along with the event will remain valid in
+                 * the event handler, at least until the main window is closed. */
+                QApplication::postEvent(this, new ActivateActionEvent(pAction));
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool UIActionsPool::event(QEvent *pEvent)
+{
+    switch (pEvent->type())
+    {
+        case VBoxDefs::ActivateActionEventType:
+        {
+            ActivateActionEvent *pActionEvent = static_cast<ActivateActionEvent*>(pEvent);
+            pActionEvent->action()->trigger();
+
+            // TODO_NEW_CORE
+            /* The main window and its children can be destroyed at this point (if, for example, the activated menu
+             * item closes the main window). Detect this situation to prevent calls to destroyed widgets: */
+//            QWidgetList list = QApplication::topLevelWidgets();
+//            bool destroyed = list.indexOf(machineWindowWrapper()->machineWindow()) < 0;
+//            if (!destroyed && machineWindowWrapper()->machineWindow()->statusBar())
+//                machineWindowWrapper()->machineWindow()->statusBar()->clearMessage();
+
+            pEvent->accept();
+            return true;
+        }
+        default:
+            break;
+    }
+
+    return QObject::event(pEvent);
+}
+
 #include "UIActionsPool.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.h

@@ -111 +111 @@
     UIAction* action(UIActionIndex index) const;
 
+    bool processHotKey(const QKeySequence &key);
+
+protected:
+
+    bool event(QEvent *pEvent);
+
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -85 +85 @@
 # include <VBox/err.h>
 #endif /* defined (Q_WS_MAC) */
-
-/* Menu activation event */
-class ActivateMenuEvent : public QEvent
-{
-public:
-
-    ActivateMenuEvent (QAction *pAction)
-        : QEvent((QEvent::Type)VBoxDefs::ActivateMenuEventType)
-        , m_pAction(pAction) {}
-    QAction* action() const { return m_pAction; }
-
-private:
-
-    QAction *m_pAction;
-};
 
 class VBoxViewport: public QWidget
@@ -1102 +1087 @@
 #endif
 
-#if 0 // TODO: Move that to specific event handler!
-        case VBoxDefs::ActivateMenuEventType:
-        {
-            ActivateMenuEvent *pMenuEvent = static_cast<ActivateMenuEvent*>(pEvent);
-            pMenuEvent->action()->trigger();
-
-            /* The main window and its children can be destroyed at this point (if, for example, the activated menu
-             * item closes the main window). Detect this situation to prevent calls to destroyed widgets: */
-            QWidgetList list = QApplication::topLevelWidgets();
-            bool destroyed = list.indexOf(machineWindowWrapper()->machineWindow()) < 0;
-            if (!destroyed && machineWindowWrapper()->machineWindow()->statusBar())
-                machineWindowWrapper()->machineWindow()->statusBar()->clearMessage();
-
-            return true;
-        }
-#endif
-
         case QEvent::KeyPress:
         case QEvent::KeyRelease:
@@ -1246 +1214 @@
                 {
                     /* Process hot keys not processed in keyEvent() (as in case of non-alphanumeric keys): */
-                    processHotKey(QKeySequence (pKeyEvent->key()), machineWindowWrapper()->menuBar()->actions());
+                    processed = machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence (pKeyEvent->key()));
                 }
 #endif
@@ -1723 +1691 @@
                 ch = 0;
             if (ch)
-                processed = processHotKey(QKeySequence(Qt::UNICODE_ACCEL + QChar(ch).toUpper().unicode()),
-                                          machineWindowWrapper()->menuBar()->actions());
+                processed = machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence((Qt::UNICODE_ACCEL + QChar(ch).toUpper().unicode())));
         }
         delete[] list;
@@ -1743 +1710 @@
 #elif defined (Q_WS_MAC)
         // TODO_NEW_CORE
-//        if (pUniKey && pUniKey [0] && !pUniKey [1])
-//            processed = processHotKey(QKeySequence (Qt::UNICODE_ACCEL + QChar(pUniKey[0]).toUpper().unicode()),
-//                                      machineWindowWrapper()->menuBar()->actions());
+        if (pUniKey && pUniKey[0] && !pUniKey[1])
+            processed = machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence(Qt::UNICODE_ACCEL + QChar(pUniKey[0]).toUpper().unicode()));
 
         /* Don't consider the hot key as pressed since the guest never saw
@@ -2833 +2799 @@
 {
     ::memcpy(m_pressedKeysCopy, m_pressedKeys, sizeof(m_pressedKeys));
-}
-
-bool UIMachineView::processHotKey(const QKeySequence &key, const QList<QAction*> &actions)
-{
-    // TODO: Make it work for all modes:
-    foreach (QAction *pAction, actions)
-    {
-        if (QMenu *menu = pAction->menu())
-        {
-            /* Process recursively for each sub-menu */
-            if (processHotKey(key, menu->actions()))
-                return true;
-        }
-        else
-        {
-            QString hotkey = VBoxGlobal::extractKeyFromActionText(pAction->text());
-            if (pAction->isEnabled() && !hotkey.isEmpty())
-            {
-                if (key.matches(QKeySequence (hotkey)) == QKeySequence::ExactMatch)
-                {
-                    /* We asynchronously post a special event instead of calling
-                     * pAction->trigger() directly, to let key presses and
-                     * releases be processed correctly by Qt first.
-                     * Note: we assume that nobody will delete the menu item
-                     * corresponding to the key sequence, so that the pointer to
-                     * menu data posted along with the event will remain valid in
-                     * the event handler, at least until the main window is closed. */
-                    QApplication::postEvent(this, new ActivateMenuEvent(pAction));
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -224 +224 @@
     void captureMouse(bool fCapture, bool fEmitSignal = true);
     void saveKeyStates();
-    bool processHotKey(const QKeySequence &key, const QList<QAction*> &data);
     void releaseAllPressedKeys(bool aReleaseHostKey = true);
     void sendChangedKeyStates();