Removes dependency on QtX11Extras for Qt6.2-beta (#331)

spiderkeys · web-flow · commit fc91502162d1 · 2021-07-17T14:49:20.000+02:00
* Removes dependency on QtX11Extras and implements placeholder solution with QtGUI private API

* Fixes CMakeLists.txt to work with Qt5 and Qt6

* Removes all other uses of X11extras

* Renames and moves x11 methods into ads::internal

* Fixes typo

* Adds gui-private to src.pro
diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml
@@ -16,7 +16,6 @@ jobs:
       run: |
         sudo apt-get update --fix-missing
         sudo apt-get install qt5-default
-        sudo apt-get install libqt5x11extras5-dev
     - name: qmake
       run: qmake
     - name: make
diff --git a/.travis.yml b/.travis.yml
@@ -9,8 +9,6 @@ matrix:
     os: linux
     dist: trusty
     group: stable
-    before_install:
-      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -20,8 +18,6 @@ matrix:
         packages:
         - qt55base
         - qt55tools
-        - qt55x11extras
-        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
     script:
@@ -39,8 +35,6 @@ matrix:
     services:
         - xvfb
     compiler: gcc
-    before_install:
-      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -50,8 +44,6 @@ matrix:
         packages:
         - qt514base
         - qt514tools
-        - qt514x11extras
-        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386
@@ -73,8 +65,6 @@ matrix:
     services:
         - xvfb
     compiler: gcc
-    before_install:
-      - sudo apt-get -y install libqt5x11extras5-dev  
     addons:  
       apt:
         sources:
@@ -84,8 +74,6 @@ matrix:
         packages:
         - qt514base
         - qt514tools
-        - qt514x11extras
-        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386
@@ -107,8 +95,6 @@ matrix:
     services:
         - xvfb
     compiler: gcc
-    before_install:
-      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -118,8 +104,6 @@ matrix:
         packages:
         - qt514base
         - qt514tools
-        - qt514x11extras
-        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386
@@ -147,8 +131,6 @@ matrix:
     services:
         - xvfb
     compiler: gcc
-    before_install:
-      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -158,8 +140,6 @@ matrix:
         packages:
         - qt514base
         - qt514tools
-        - qt514x11extras
-        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386
diff --git a/ads.pri b/ads.pri
@@ -17,5 +17,4 @@ else{
 
 unix:!macx {
     LIBS += -lxcb
-    QT += x11extras
 }
diff --git a/adsConfig.cmake b/adsConfig.cmake
@@ -2,7 +2,4 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
-if(UNIX AND NOT APPLE)
-    find_dependency(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED)
-endif()
 include("${CMAKE_CURRENT_LIST_DIR}/adsTargets.cmake")
diff --git a/setup.py b/setup.py
@@ -227,9 +227,7 @@ def swig_sources (self, sources, extension=None):
                 extension.extra_link_args += ['-F' + self.qtconfig.QT_INSTALL_LIBS,
                     '-mmacosx-version-min=10.9']
             elif sys.platform == 'linux':
-                extension.extra_compile_args += ['-D', 'QT_X11EXTRAS_LIB', '-std=c++11']
-                extension.include_dirs += [os.path.join(self.qt_include_dir, 'QtX11Extras')]
-                extension.libraries += ['Qt5X11Extras' + self.qt_libinfix]
+                extension.extra_compile_args += ['-std=c++11']
 
         return super().swig_sources(sources, extension)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT})
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
 if (UNIX AND NOT APPLE)
-	find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS X11Extras REQUIRED)
+    include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
 endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 if(BUILD_STATIC)
@@ -64,10 +64,6 @@ endif()
 target_link_libraries(qtadvanceddocking PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                Qt${QT_VERSION_MAJOR}::Gui 
                                                Qt${QT_VERSION_MAJOR}::Widgets)
-if(UNIX AND NOT APPLE)
-    target_link_libraries(qtadvanceddocking PUBLIC Qt${QT_VERSION_MAJOR}::X11Extras)
-	target_link_libraries(qtadvanceddocking PRIVATE xcb)
-endif()
 set_target_properties(qtadvanceddocking PROPERTIES
     AUTOMOC ON
     AUTORCC ON
diff --git a/src/ads_globals.cpp b/src/ads_globals.cpp
@@ -39,13 +39,11 @@
 #include "ads_globals.h"
 
 #ifdef Q_OS_LINUX
-#include <QX11Info>
 #include <QSettings>
 #include <QFile>
-#endif
-
-
 #include <QApplication>
+#include <qpa/qplatformnativeinterface.h>
+#endif
 
 namespace ads
 {
@@ -57,10 +55,31 @@ static QString _window_manager;
 static QHash<QString, xcb_atom_t> _xcb_atom_cache;
 
 
+//============================================================================
+ bool is_platform_x11()
+{
+	return QGuiApplication::platformName() == QLatin1String("xcb");
+}
+
+
+//============================================================================
+xcb_connection_t* x11_connection()
+{
+	if (!qApp)
+		return nullptr;
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+	if (!native)
+		return nullptr;
+
+	void *connection = native->nativeResourceForIntegration(QByteArray("connection"));
+	return reinterpret_cast<xcb_connection_t *>(connection);
+}
+
+
 //============================================================================
 xcb_atom_t xcb_get_atom(const char *name)
 {
-	if (!QX11Info::isPlatformX11())
+	if (!is_platform_x11())
 	{
 		return XCB_ATOM_NONE;
 	}
@@ -69,7 +88,7 @@ xcb_atom_t xcb_get_atom(const char *name)
 	{
 		return _xcb_atom_cache[key];
 	}
-	xcb_connection_t *connection = QX11Info::connection();
+	xcb_connection_t *connection = x11_connection();
 	xcb_intern_atom_cookie_t request = xcb_intern_atom(connection, 1, strlen(name), name);
 	xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, request, NULL);
 	if (!reply)
@@ -93,7 +112,7 @@ xcb_atom_t xcb_get_atom(const char *name)
 //============================================================================
 void xcb_update_prop(bool set, WId window, const char *type, const char *prop, const char *prop2)
 {
-	auto connection = QX11Info::connection();
+	auto connection = x11_connection();
 	xcb_atom_t type_atom = xcb_get_atom(type);
 	xcb_atom_t prop_atom = xcb_get_atom(prop);
 	xcb_client_message_event_t event;
@@ -118,11 +137,11 @@ void xcb_update_prop(bool set, WId window, const char *type, const char *prop, c
 //============================================================================
 xcb_get_property_reply_t* _xcb_get_props(WId window, const char *type, unsigned int atom_type)
 {
-	if (!QX11Info::isPlatformX11())
+    if (!is_platform_x11())
 	{
 		return nullptr;
 	}
-	xcb_connection_t *connection = QX11Info::connection();
+	xcb_connection_t *connection = x11_connection();
 	xcb_atom_t type_atom = xcb_get_atom(type);
 	if (type_atom == XCB_ATOM_NONE)
 	{
@@ -191,7 +210,7 @@ bool xcb_dump_props(WId window, const char *type)
 	QVector<xcb_atom_t> atoms;
 	xcb_get_prop_list(window, type, atoms, XCB_ATOM_ATOM);
 	qDebug() << "\n\n!!!" << type << "  -  " << atoms.length();
-	xcb_connection_t *connection = QX11Info::connection();
+	xcb_connection_t *connection = x11_connection();
 	for (auto atom : atoms)
 	{
 		auto foo = xcb_get_atom_name(connection, atom);
@@ -206,7 +225,7 @@ bool xcb_dump_props(WId window, const char *type)
 //============================================================================
 void xcb_add_prop(bool state, WId window, const char *type, const char *prop)
 {
-	if (!QX11Info::isPlatformX11())
+    if (!is_platform_x11())
 	{
 		return;
 	}
@@ -227,7 +246,7 @@ void xcb_add_prop(bool state, WId window, const char *type, const char *prop)
 	{
 		atoms.remove(index);
 	}
-	xcb_connection_t *connection = QX11Info::connection();
+	xcb_connection_t *connection = x11_connection();
 	xcb_change_property(connection, XCB_PROP_MODE_REPLACE, window, type_atom, XCB_ATOM_ATOM, 32, atoms.count(), atoms.constData());
 	xcb_flush(connection);
 }
@@ -238,11 +257,11 @@ QString detectWindowManagerX11()
 {
 	// Tries to detect the windowmanager via X11.
 	// See: https://specifications.freedesktop.org/wm-spec/1.3/ar01s03.html#idm46018259946000
-	if (!QX11Info::isPlatformX11())
+    if (!is_platform_x11())
 	{
 		return "UNKNOWN";
 	}
-	xcb_connection_t *connection = QX11Info::connection();
+	xcb_connection_t *connection = x11_connection();
 	xcb_screen_t *first_screen = xcb_setup_roots_iterator (xcb_get_setup (connection)).data;
 	if(!first_screen)
 	{
diff --git a/src/src.pro b/src/src.pro
@@ -73,8 +73,8 @@ SOURCES += \
 unix:!macx {
 HEADERS += linux/FloatingWidgetTitleBar.h
 SOURCES += linux/FloatingWidgetTitleBar.cpp
-QT += x11extras
 LIBS += -lxcb
+QT += gui-private
 }
 
 isEmpty(PREFIX){

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,4 @@ else{`
`17`	`17`
`18`	`18`	`unix:!macx {`
`19`	`19`	`LIBS += -lxcb`
`20`		`- QT += x11extras`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,11 @@`
`39`	`39`	`#include "ads_globals.h"`
`40`	`40`
`41`	`41`	`#ifdef Q_OS_LINUX`
`42`		`-#include <QX11Info>`
`43`	`42`	`#include <QSettings>`
`44`	`43`	`#include <QFile>`
`45`		`-#endif`
`46`		`-`
`47`		`-`
`48`	`44`	`#include <QApplication>`
	`45`	`+#include <qpa/qplatformnativeinterface.h>`
	`46`	`+#endif`
`49`	`47`
`50`	`48`	`namespace ads`
`51`	`49`	`{`
`@@ -57,10 +55,31 @@ static QString _window_manager;`
`57`	`55`	`static QHash<QString, xcb_atom_t> _xcb_atom_cache;`
`58`	`56`
`59`	`57`
	`58`	`+//============================================================================`
	`59`	`+ bool is_platform_x11()`
	`60`	`+{`
	`61`	`+ return QGuiApplication::platformName() == QLatin1String("xcb");`
	`62`	`+}`
	`63`	`+`
	`64`	`+`
	`65`	`+//============================================================================`
	`66`	`+xcb_connection_t* x11_connection()`
	`67`	`+{`
	`68`	`+ if (!qApp)`
	`69`	`+ return nullptr;`
	`70`	`+ QPlatformNativeInterface *native = qApp->platformNativeInterface();`
	`71`	`+ if (!native)`
	`72`	`+ return nullptr;`
	`73`	`+`
	`74`	`+ void *connection = native->nativeResourceForIntegration(QByteArray("connection"));`
	`75`	`+ return reinterpret_cast<xcb_connection_t *>(connection);`
	`76`	`+}`
	`77`	`+`
	`78`	`+`
`60`	`79`	`//============================================================================`
`61`	`80`	`xcb_atom_t xcb_get_atom(const char *name)`
`62`	`81`	`{`
`63`		`- if (!QX11Info::isPlatformX11())`
	`82`	`+ if (!is_platform_x11())`
`64`	`83`	`{`
`65`	`84`	`return XCB_ATOM_NONE;`
`66`	`85`	`}`
`@@ -69,7 +88,7 @@ xcb_atom_t xcb_get_atom(const char *name)`
`69`	`88`	`{`
`70`	`89`	`return _xcb_atom_cache[key];`
`71`	`90`	`}`
`72`		`- xcb_connection_t *connection = QX11Info::connection();`
	`91`	`+ xcb_connection_t *connection = x11_connection();`
`73`	`92`	`xcb_intern_atom_cookie_t request = xcb_intern_atom(connection, 1, strlen(name), name);`
`74`	`93`	`xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, request, NULL);`
`75`	`94`	`if (!reply)`
`@@ -93,7 +112,7 @@ xcb_atom_t xcb_get_atom(const char *name)`
`93`	`112`	`//============================================================================`
`94`	`113`	`void xcb_update_prop(bool set, WId window, const char type, const char prop, const char *prop2)`
`95`	`114`	`{`
`96`		`- auto connection = QX11Info::connection();`
	`115`	`+ auto connection = x11_connection();`
`97`	`116`	`xcb_atom_t type_atom = xcb_get_atom(type);`
`98`	`117`	`xcb_atom_t prop_atom = xcb_get_atom(prop);`
`99`	`118`	`xcb_client_message_event_t event;`
`@@ -118,11 +137,11 @@ void xcb_update_prop(bool set, WId window, const char type, const char prop, c`
`118`	`137`	`//============================================================================`
`119`	`138`	`xcb_get_property_reply_t* _xcb_get_props(WId window, const char *type, unsigned int atom_type)`
`120`	`139`	`{`
`121`		`- if (!QX11Info::isPlatformX11())`
	`140`	`+ if (!is_platform_x11())`
`122`	`141`	`{`
`123`	`142`	`return nullptr;`
`124`	`143`	`}`
`125`		`- xcb_connection_t *connection = QX11Info::connection();`
	`144`	`+ xcb_connection_t *connection = x11_connection();`
`126`	`145`	`xcb_atom_t type_atom = xcb_get_atom(type);`
`127`	`146`	`if (type_atom == XCB_ATOM_NONE)`
`128`	`147`	`{`
`@@ -191,7 +210,7 @@ bool xcb_dump_props(WId window, const char *type)`
`191`	`210`	`QVector<xcb_atom_t> atoms;`
`192`	`211`	`xcb_get_prop_list(window, type, atoms, XCB_ATOM_ATOM);`
`193`	`212`	`qDebug() << "\n\n!!!" << type << " - " << atoms.length();`
`194`		`- xcb_connection_t *connection = QX11Info::connection();`
	`213`	`+ xcb_connection_t *connection = x11_connection();`
`195`	`214`	`for (auto atom : atoms)`
`196`	`215`	`{`
`197`	`216`	`auto foo = xcb_get_atom_name(connection, atom);`
`@@ -206,7 +225,7 @@ bool xcb_dump_props(WId window, const char *type)`
`206`	`225`	`//============================================================================`
`207`	`226`	`void xcb_add_prop(bool state, WId window, const char type, const char prop)`
`208`	`227`	`{`
`209`		`- if (!QX11Info::isPlatformX11())`
	`228`	`+ if (!is_platform_x11())`
`210`	`229`	`{`
`211`	`230`	`return;`
`212`	`231`	`}`
`@@ -227,7 +246,7 @@ void xcb_add_prop(bool state, WId window, const char type, const char prop)`
`227`	`246`	`{`
`228`	`247`	`atoms.remove(index);`
`229`	`248`	`}`
`230`		`- xcb_connection_t *connection = QX11Info::connection();`
	`249`	`+ xcb_connection_t *connection = x11_connection();`
`231`	`250`	`xcb_change_property(connection, XCB_PROP_MODE_REPLACE, window, type_atom, XCB_ATOM_ATOM, 32, atoms.count(), atoms.constData());`
`232`	`251`	`xcb_flush(connection);`
`233`	`252`	`}`
`@@ -238,11 +257,11 @@ QString detectWindowManagerX11()`
`238`	`257`	`{`
`239`	`258`	`// Tries to detect the windowmanager via X11.`
`240`	`259`	`// See: https://specifications.freedesktop.org/wm-spec/1.3/ar01s03.html#idm46018259946000`
`241`		`- if (!QX11Info::isPlatformX11())`
	`260`	`+ if (!is_platform_x11())`
`242`	`261`	`{`
`243`	`262`	`return "UNKNOWN";`
`244`	`263`	`}`
`245`		`- xcb_connection_t *connection = QX11Info::connection();`
	`264`	`+ xcb_connection_t *connection = x11_connection();`
`246`	`265`	`xcb_screen_t *first_screen = xcb_setup_roots_iterator (xcb_get_setup (connection)).data;`
`247`	`266`	`if(!first_screen)`
`248`	`267`	`{`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ SOURCES += \`
`73`	`73`	`unix:!macx {`
`74`	`74`	`HEADERS += linux/FloatingWidgetTitleBar.h`
`75`	`75`	`SOURCES += linux/FloatingWidgetTitleBar.cpp`
`76`		`-QT += x11extras`
`77`	`76`	`LIBS += -lxcb`
	`77`	`+QT += gui-private`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`isEmpty(PREFIX){`