Changeset 106611 in vbox

Timestamp:

Oct 23, 2024 7:50:23 AM (5 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10407. Handle machine view key press event in keyboard handler.

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (1 diff)
• UIKeyboardHandler.h (modified) (1 diff)
• UIMachineView.cpp (modified) (2 diffs)

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

@@ -2009 +2009 @@
     emit sigStateChange(state());
 }
+
+#ifdef VBOX_WS_NIX
+void UIKeyboardHandler::handleKeyEvent(quint32 nativeScanCode, bool fRelease)
+{
+    if (NativeWindowSubsystem::displayServerType() == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
+    {
+        /* On Linux xcb, wayland etc has an offset of 8 in scancodes (they start from 7 instead of 0): */
+        if (!fRelease)
+            uimachine()->putScancode(nativeScanCode - 8);
+        else
+            uimachine()->putScancode((nativeScanCode - 8) | 0x80);
+    }
+}
+#endif

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

@@ -120 +120 @@
       * @a bPressed is true for press and false for release inserts. */
     void setHostKeyComboPressedFlag(bool bPressed);
+
+#ifdef VBOX_WS_NIX
+    void handleKeyEvent(quint32 nativeScanCode, bool fRelease);
+#endif
 
 protected slots:

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

@@ -2021 +2021 @@
 void UIMachineView::keyPressEvent(QKeyEvent *pEvent)
 {
-    if (NativeWindowSubsystem::displayServerType() == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
-        uimachine()->putScancode(pEvent->nativeScanCode() - 8);
+    machineLogic()->keyboardHandler()->handleKeyEvent(pEvent->nativeScanCode(), false /* is release*/);
     QAbstractScrollArea::keyPressEvent(pEvent);
 }
@@ -2028 +2027 @@
 void UIMachineView::keyReleaseEvent(QKeyEvent *pEvent)
 {
-    if (NativeWindowSubsystem::displayServerType() == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
-        uimachine()->putScancode((pEvent->nativeScanCode() - 8) | 0x80);
+    machineLogic()->keyboardHandler()->handleKeyEvent(pEvent->nativeScanCode(), true /* is release*/);
     QAbstractScrollArea::keyReleaseEvent(pEvent);
 }