diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/configure.cmake | 6 | ||||
-rw-r--r-- | src/gui/configure.json | 12 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_basic.cpp | 14 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_basic.h | 3 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_screens.cpp | 17 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 10 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 2 |
9 files changed, 4 insertions, 65 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index a6d265183f..c260bb86ad 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -99,10 +99,6 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) endif() qt_add_qmake_lib_dependency(xcb_xfixes xcb) if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) - qt_find_package(XCB COMPONENTS XINERAMA PROVIDED_TARGETS XCB::XINERAMA MODULE_NAME gui QMAKE_LIB xcb_xinerama) -endif() -qt_add_qmake_lib_dependency(xcb_xinerama xcb) -if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(X11_XCB PROVIDED_TARGETS X11::XCB MODULE_NAME gui QMAKE_LIB xcb_xlib) endif() qt_add_qmake_lib_dependency(xcb_xlib xcb xlib) @@ -491,7 +487,6 @@ qt_config_compile_test(xcb_syslibs XCB::SHM XCB::SYNC XCB::XFIXES - XCB::XINERAMA XCB::XKB XCB::XCB CODE @@ -506,7 +501,6 @@ qt_config_compile_test(xcb_syslibs #include <xcb/shm.h> #include <xcb/sync.h> #include <xcb/xfixes.h> -#include <xcb/xinerama.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_renderutil.h> #include <xcb/xkb.h> diff --git a/src/gui/configure.json b/src/gui/configure.json index a29f870f05..80df53edd1 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -598,15 +598,6 @@ ], "use": "xcb" }, - "xcb_xinerama": { - "label": "XCB Xinerama", - "headers": "xcb/xinerama.h", - "sources": [ - { "type": "pkgConfig", "args": "xcb-xinerama" }, - "-lxcb-xinerama" - ], - "use": "xcb" - }, "xcb_xlib": { "label": "XCB Xlib", "test": { @@ -973,7 +964,6 @@ "xcb/shm.h", "xcb/sync.h", "xcb/xfixes.h", - "xcb/xinerama.h", "xcb/xcb_icccm.h", "xcb/xcb_renderutil.h", "xcb/xkb.h" @@ -996,7 +986,7 @@ "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);" ] }, - "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" + "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xkb xcb" }, "x11prefix": { "label": "X11 prefix", diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 22a955fec6..9b04785dcb 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -53,7 +53,6 @@ qt_add_module(XcbQpa XCB::SYNC XCB::XCB XCB::XFIXES - XCB::XINERAMA XCB::XKB XKB::XKB ) diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp index 18dee89adb..020412fc87 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp @@ -43,7 +43,6 @@ #include <xcb/shm.h> #include <xcb/sync.h> #include <xcb/xfixes.h> -#include <xcb/xinerama.h> #include <xcb/render.h> #include <xcb/xinput.h> #define explicit dont_use_cxx_explicit @@ -145,8 +144,6 @@ QXcbBasicConnection::QXcbBasicConnection(const char *displayName) initializeShm(); if (!qEnvironmentVariableIsSet("QT_XCB_NO_XRANDR")) initializeXRandr(); - if (!m_hasXRandr) - initializeXinerama(); initializeXFixes(); initializeXRender(); if (!qEnvironmentVariableIsSet("QT_XCB_NO_XI2")) @@ -307,17 +304,6 @@ void QXcbBasicConnection::initializeXRender() m_xrenderVersion.second = xrenderQuery->minor_version; } -void QXcbBasicConnection::initializeXinerama() -{ - const xcb_query_extension_reply_t *reply = xcb_get_extension_data(m_xcbConnection, &xcb_xinerama_id); - if (!reply || !reply->present) - return; - - auto xineramaActive = Q_XCB_REPLY(xcb_xinerama_is_active, m_xcbConnection); - if (xineramaActive && xineramaActive->state) - m_hasXinerama = true; -} - void QXcbBasicConnection::initializeXFixes() { const xcb_query_extension_reply_t *reply = xcb_get_extension_data(m_xcbConnection, &xcb_xfixes_id); diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.h b/src/plugins/platforms/xcb/qxcbconnection_basic.h index 109186f966..bda02ce9c2 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_basic.h +++ b/src/plugins/platforms/xcb/qxcbconnection_basic.h @@ -96,7 +96,6 @@ public: bool hasShm() const { return m_hasShm; } bool hasShmFd() const { return m_hasShmFd; } bool hasXSync() const { return m_hasXSync; } - bool hasXinerama() const { return m_hasXinerama; } bool hasBigRequest() const; bool isAtLeastXI21() const { return m_xi2Enabled && m_xi2Minor >= 1; } @@ -113,7 +112,6 @@ protected: void initializeXFixes(); void initializeXRender(); void initializeXRandr(); - void initializeXinerama(); void initializeXShape(); void initializeXKB(); void initializeXSync(); @@ -130,7 +128,6 @@ private: QXcbAtom m_xcbAtom; bool m_hasXFixes = false; - bool m_hasXinerama = false; bool m_hasXhape = false; bool m_hasInputShape; bool m_hasXRandr = false; diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp index 9ba71ada37..82b0f65774 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp @@ -46,8 +46,6 @@ #include <qpa/qwindowsysteminterface.h> -#include <xcb/xinerama.h> - void QXcbConnection::xrandrSelectEvents() { xcb_screen_iterator_t rootIter = xcb_setup_roots_iterator(setup()); @@ -358,21 +356,6 @@ void QXcbConnection::initializeScreens() } } } - } else if (hasXinerama()) { - // Xinerama is available - auto screens = Q_XCB_REPLY(xcb_xinerama_query_screens, xcb_connection()); - if (screens) { - xcb_xinerama_screen_info_iterator_t it = xcb_xinerama_query_screens_screen_info_iterator(screens.get()); - while (it.rem) { - xcb_xinerama_screen_info_t *screen_info = it.data; - QXcbScreen *screen = new QXcbScreen(this, virtualDesktop, - XCB_NONE, nullptr, - screen_info, it.index); - siblings << screen; - m_screens << screen; - xcb_xinerama_screen_info_next(&it); - } - } } if (siblings.isEmpty()) { // If there are no XRandR outputs or XRandR extension is missing, diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 6ce8a91f36..c17be437ce 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -494,8 +494,7 @@ quint8 QXcbVirtualDesktop::depthOfVisual(xcb_visualid_t visualid) const } QXcbScreen::QXcbScreen(QXcbConnection *connection, QXcbVirtualDesktop *virtualDesktop, - xcb_randr_output_t outputId, xcb_randr_get_output_info_reply_t *output, - const xcb_xinerama_screen_info_t *xineramaScreenInfo, int xineramaScreenIdx) + xcb_randr_output_t outputId, xcb_randr_get_output_info_reply_t *output) : QXcbObject(connection) , m_virtualDesktop(virtualDesktop) , m_output(outputId) @@ -511,13 +510,6 @@ QXcbScreen::QXcbScreen(QXcbConnection *connection, QXcbVirtualDesktop *virtualDe updateGeometry(QRect(crtc->x, crtc->y, crtc->width, crtc->height), crtc->rotation); updateRefreshRate(crtc->mode); } - } else if (xineramaScreenInfo) { - m_geometry = QRect(xineramaScreenInfo->x_org, xineramaScreenInfo->y_org, - xineramaScreenInfo->width, xineramaScreenInfo->height); - m_availableGeometry = m_geometry & m_virtualDesktop->workArea(); - m_sizeMillimeters = sizeInMillimeters(m_geometry.size(), m_virtualDesktop->dpi()); - if (xineramaScreenIdx > -1) - m_outputName += QLatin1Char('-') + QString::number(xineramaScreenIdx); } if (m_geometry.isEmpty()) diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index 60ef82bae3..9298a67b2b 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -47,7 +47,6 @@ #include <xcb/xcb.h> #include <xcb/randr.h> #include <xcb/xfixes.h> -#include <xcb/xinerama.h> #include "qxcbobject.h" @@ -142,8 +141,7 @@ class Q_XCB_EXPORT QXcbScreen : public QXcbObject, public QPlatformScreen { public: QXcbScreen(QXcbConnection *connection, QXcbVirtualDesktop *virtualDesktop, - xcb_randr_output_t outputId, xcb_randr_get_output_info_reply_t *outputInfo, - const xcb_xinerama_screen_info_t *xineramaScreenInfo = nullptr, int xineramaScreenIdx = -1); + xcb_randr_output_t outputId, xcb_randr_get_output_info_reply_t *outputInfo); ~QXcbScreen(); QString getOutputName(xcb_randr_get_output_info_reply_t *outputInfo); diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index f44388cc6d..bb57e16ab5 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -85,7 +85,7 @@ qtConfig(vulkan) { QMAKE_USE += \ xcb xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil \ - xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xkbcommon xkbcommon_x11 + xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xkb xkbcommon xkbcommon_x11 qtConfig(system-xcb-xinput) { QMAKE_USE += xcb_xinput |