Changeset 53079 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 16, 2014 2:49:09 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96591

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #24): Using cached wrappers in keyboard/mouse handlers.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIKeyboardHandler.cpp (modified) (12 diffs)
• UIKeyboardHandler.h (modified) (3 diffs)
• UIMouseHandler.cpp (modified) (10 diffs)
• UIMouseHandler.h (modified) (2 diffs)

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

@@ -297 +297 @@
 void UIKeyboardHandler::releaseAllPressedKeys(bool aReleaseHostKey /* = true */)
 {
-    CKeyboard keyboard = session().GetConsole().GetKeyboard();
     bool fSentRESEND = false;
 
@@ -311 +310 @@
             if (!fSentRESEND)
             {
-                keyboard.PutScancode (0xFE);
+                keyboard().PutScancode(0xFE);
                 fSentRESEND = true;
             }
-            keyboard.PutScancode(i | 0x80);
+            keyboard().PutScancode(i | 0x80);
         }
         else if (m_pressedKeys[i] & IsExtKeyPressed)
@@ -320 +319 @@
             if (!fSentRESEND)
             {
-                keyboard.PutScancode(0xFE);
+                keyboard().PutScancode(0xFE);
                 fSentRESEND = true;
             }
@@ -326 +325 @@
             codes[0] = 0xE0;
             codes[1] = i | 0x80;
-            keyboard.PutScancodes(codes);
+            keyboard().PutScancodes(codes);
         }
         m_pressedKeys[i] = 0;
@@ -869 +868 @@
 }
 
-/* Main Session getter: */
-CSession& UIKeyboardHandler::session() const
-{
-    return uisession()->session();
+CKeyboard& UIKeyboardHandler::keyboard() const
+{
+    return uisession()->keyboard();
 }
 
@@ -1022 +1020 @@
                             combo[3] = 0xd7 + (pKeyEvent->key() - Qt::Key_F11); /* F11-F12 up   */
                         }
-                        CKeyboard keyboard = session().GetConsole().GetKeyboard();
-                        keyboard.PutScancodes(combo);
+                        keyboard().PutScancodes(combo);
                     }
                     /* Process hot keys not processed in keyEvent() (as in case of non-alphanumeric keys): */
@@ -1564 +1561 @@
     if (!uisession()->isPaused())
     {
-        /* Get the VM keyboard: */
-        CKeyboard keyboard = session().GetConsole().GetKeyboard();
-        Assert(!keyboard.isNull());
-
         /* If there are scan-codes to send: */
         if (uCodesCount)
@@ -1573 +1566 @@
             /* Send prepared scan-codes to the guest: */
             std::vector<LONG> scancodes(pCodes, &pCodes[uCodesCount]);
-            keyboard.PutScancodes(QVector<LONG>::fromStdVector(scancodes));
+            keyboard().PutScancodes(QVector<LONG>::fromStdVector(scancodes));
         }
 
@@ -1579 +1572 @@
         if (isHostComboStateChanged && m_bIsHostComboPressed)
         {
-            keyEventReleaseHostComboKeys(keyboard);
+            keyEventReleaseHostComboKeys(keyboard());
         }
     }
@@ -1730 +1723 @@
 {
     QVector <LONG> codes(2);
-    CKeyboard keyboard = session().GetConsole().GetKeyboard();
     for (uint i = 0; i < SIZEOF_ARRAY(m_pressedKeys); ++ i)
     {
@@ -1740 +1732 @@
             if (!(ns & IsKeyPressed))
                 codes[0] |= 0x80;
-            keyboard.PutScancode(codes[0]);
+            keyboard().PutScancode(codes[0]);
         }
         else if ((os & IsExtKeyPressed) != (ns & IsExtKeyPressed))
@@ -1748 +1740 @@
             if (!(ns & IsExtKeyPressed))
                 codes[1] |= 0x80;
-            keyboard.PutScancodes(codes);
+            keyboard().PutScancodes(codes);
         }
     }

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

@@ -35 +35 @@
 /* Forward declarations: */
 class QWidget;
-class CSession;
 class UISession;
 class UIActionPool;
@@ -45 +44 @@
 typedef union  _XEvent XEvent;
 #endif /* Q_WS_X11 */
+class CKeyboard;
 
 /* Delegate to control VM keyboard functionality: */
@@ -117 +117 @@
     UIActionPool* actionPool() const;
     UISession* uisession() const;
-    CSession& session() const;
+
+    /** Returns the console's keyboard reference. */
+    CKeyboard& keyboard() const;
 
     /* Event handler for registered machine-view(s): */

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

@@ -206 +206 @@
 
         /* Switch guest mouse to the relative mode: */
-        CMouse mouse = session().GetConsole().GetMouse();
-        mouse.PutMouseEvent(0, 0, 0, 0, 0);
+        mouse().PutMouseEvent(0, 0, 0, 0, 0);
 
         /* Notify all the listeners: */
@@ -338 +337 @@
         releaseMouse();
         /* Also we should switch guest mouse to the absolute mode: */
-        CMouse mouse = session().GetConsole().GetMouse();
-        mouse.PutMouseEventAbsolute(-1, -1, 0, 0, 0);
+        mouse().PutMouseEventAbsolute(-1, -1, 0, 0, 0);
     }
 #if 0 /* current team's decision is NOT to capture mouse on mouse-absolute mode loosing! */
@@ -368 +366 @@
     {
         /* Switch guest mouse to the relative mode: */
-        CMouse mouse = session().GetConsole().GetMouse();
-        mouse.PutMouseEvent(0, 0, 0, 0, 0);
+        mouse().PutMouseEvent(0, 0, 0, 0, 0);
     }
 #endif
@@ -488 +485 @@
 }
 
-/* Main Session getter: */
-CSession& UIMouseHandler::session() const
-{
-    return uisession()->session();
+CDisplay& UIMouseHandler::display() const
+{
+    return uisession()->display();
+}
+
+CMouse& UIMouseHandler::mouse() const
+{
+    return uisession()->mouse();
 }
 
@@ -842 +843 @@
         ::UpdateWindow(m_viewports[uScreenId]->winId());
 #endif
-        CMouse mouse = session().GetConsole().GetMouse();
-        mouse.PutMouseEvent(globalPos.x() - m_lastMousePos.x(),
-                            globalPos.y() - m_lastMousePos.y(),
-                            iWheelVertical, iWheelHorizontal, iMouseButtonsState);
+        mouse().PutMouseEvent(globalPos.x() - m_lastMousePos.x(),
+                              globalPos.y() - m_lastMousePos.y(),
+                              iWheelVertical, iWheelHorizontal, iMouseButtonsState);
 
 #ifdef Q_WS_WIN
@@ -963 +963 @@
             ULONG dummy;
             KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
-            session().GetConsole().GetDisplay().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift, monitorStatus);
+            display().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift, monitorStatus);
             /* Set shifting: */
             cpnt.setX(cpnt.x() + xShift);
@@ -969 +969 @@
 
             /* Post absolute mouse-event into guest: */
-            CMouse mouse = session().GetConsole().GetMouse();
-            mouse.PutMouseEventAbsolute(cpnt.x() + 1, cpnt.y() + 1, iWheelVertical, iWheelHorizontal, iMouseButtonsState);
+            mouse().PutMouseEventAbsolute(cpnt.x() + 1, cpnt.y() + 1, iWheelVertical, iWheelHorizontal, iMouseButtonsState);
             return true;
         }
@@ -1021 +1020 @@
         return true;
 
-    /* Get mouse: */
-    CMouse mouse = session().GetConsole().GetMouse();
-
     QVector<LONG64> contacts(pTouchEvent->touchPoints().size());
 
@@ -1029 +1025 @@
     ULONG dummy;
     KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
-    session().GetConsole().GetDisplay().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift, monitorStatus);
+    display().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift, monitorStatus);
 
     /* Pass all multi-touch events into guest: */
@@ -1065 +1061 @@
     }
 
-    mouse.PutEventMultiTouch(pTouchEvent->touchPoints().size(),
-                             contacts,
-                             (ULONG)RTTimeMilliTS());
+    mouse().PutEventMultiTouch(pTouchEvent->touchPoints().size(),
+                               contacts,
+                               (ULONG)RTTimeMilliTS());
 
     /* Eat by default? */

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

@@ -38 +38 @@
 typedef union  _XEvent XEvent;
 #endif /* Q_WS_X11 */
-class CSession;
+class CDisplay;
+class CMouse;
 
 /* Delegate to control VM mouse functionality: */
@@ -97 +98 @@
     UIMachineLogic* machineLogic() const;
     UISession* uisession() const;
-    CSession& session() const;
+
+    /** Returns the console's display reference. */
+    CDisplay& display() const;
+    /** Returns the console's mouse reference. */
+    CMouse& mouse() const;
 
     /* Event handler for registered machine-view(s): */