Changeset 99437 in vbox

Timestamp:

Apr 18, 2023 8:09:50 AM (2 years ago)

Author:

vboxsync

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

156896

Message:

FE/Qt: bugref:10407. Make sure xcb calls in UIHostComboEditor are guarded by XServer availability check.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.cpp

@@ -573 +573 @@
 #elif defined(VBOX_WS_X11)
     /* Initialize the X keyboard subsystem: */
-    initMappedX11Keyboard(NativeWindowSubsystem::X11GetDisplay(), gEDataManager->remappedScanCodes());
+    if (uiCommon().X11XServerAvailable())
+        initMappedX11Keyboard(NativeWindowSubsystem::X11GetDisplay(), gEDataManager->remappedScanCodes());
 #endif /* VBOX_WS_X11 */
 }
@@ -746 +747 @@
 
 # elif defined(VBOX_WS_X11)
-
-    /* Make sure it's generic XCB event: */
-    if (eventType != "xcb_generic_event_t")
-        return QLineEdit::nativeEvent(eventType, pMessage, pResult);
-    xcb_generic_event_t *pEvent = static_cast<xcb_generic_event_t*>(pMessage);
-
-    /* Check if some XCB event should be filtered out: */
-    // Returning @c true means filtering-out,
-    // Returning @c false means passing event to Qt.
-    switch (pEvent->response_type & ~0x80)
-    {
-        /* Watch for key-events: */
-        case XCB_KEY_PRESS:
-        case XCB_KEY_RELEASE:
-        {
-            /* Parse key-event: */
-            xcb_key_press_event_t *pKeyEvent = static_cast<xcb_key_press_event_t*>(pMessage);
-            RT_GCC_NO_WARN_DEPRECATED_BEGIN
-            const KeySym ks = ::XKeycodeToKeysym(NativeWindowSubsystem::X11GetDisplay(), pKeyEvent->detail, 0);
-            RT_GCC_NO_WARN_DEPRECATED_END
-            const int iKeySym = static_cast<int>(ks);
-
-            /* Handle key-event: */
-            return processKeyEvent(iKeySym, (pEvent->response_type & ~0x80) == XCB_KEY_PRESS);
-        }
-        default:
-            break;
+    if (uiCommon().X11XServerAvailable())
+    {
+        /* Make sure it's generic XCB event: */
+        if (eventType != "xcb_generic_event_t")
+            return QLineEdit::nativeEvent(eventType, pMessage, pResult);
+        xcb_generic_event_t *pEvent = static_cast<xcb_generic_event_t*>(pMessage);
+
+        /* Check if some XCB event should be filtered out: */
+        // Returning @c true means filtering-out,
+        // Returning @c false means passing event to Qt.
+        switch (pEvent->response_type & ~0x80)
+        {
+            /* Watch for key-events: */
+            case XCB_KEY_PRESS:
+            case XCB_KEY_RELEASE:
+            {
+                /* Parse key-event: */
+                xcb_key_press_event_t *pKeyEvent = static_cast<xcb_key_press_event_t*>(pMessage);
+                RT_GCC_NO_WARN_DEPRECATED_BEGIN
+                const KeySym ks = ::XKeycodeToKeysym(NativeWindowSubsystem::X11GetDisplay(), pKeyEvent->detail, 0);
+                RT_GCC_NO_WARN_DEPRECATED_END
+                const int iKeySym = static_cast<int>(ks);
+
+                /* Handle key-event: */
+                return processKeyEvent(iKeySym, (pEvent->response_type & ~0x80) == XCB_KEY_PRESS);
+            }
+            default:
+                break;
+        }
     }