dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

globalshortcut-x11: Use XDefaultRootWindow with Qt >= 6.2

Browse Source
This commit is contained in:
Jonas Kvinge
2022-02-14 22:49:37 +01:00
parent 1e0c0a35ba
commit 488b326e0f
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -373,13 +373,17 @@ optional_component(GLOBALSHORTCUTS ON "Global shortcuts"
DEPENDS "D-Bus, X11, Windows or macOS" HAVE_GLOBALSHORTCUTS_SUPPORT DEPENDS "D-Bus, X11, Windows or macOS" HAVE_GLOBALSHORTCUTS_SUPPORT
) )
if(HAVE_X11EXTRAS OR HAVE_QPA_QPLATFORMNATIVEINTERFACE_H) if(BUILD_WITH_QT6 AND (Qt6Core_VERSION VERSION_EQUAL 6.2.0 OR Qt6Core_VERSION VERSION_GREATER 6.2.0))
set(HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H ON) optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts" DEPENDS "X11" X11_FOUND)
else()
if(HAVE_X11EXTRAS OR HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
set(HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H ON)
endif()
optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
DEPENDS "X11" X11_FOUND
DEPENDS "Qt >= 6.2, X11Extras or qpa/qplatformnativeinterface.h header" HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H
)
endif() endif()
optional_component(X11_GLOBALSHORTCUTS ON "X11 global shortcuts"
DEPENDS "X11" X11_FOUND
DEPENDS "X11Extras or qpa/qplatformnativeinterface.h header" HAVE_X11EXTRAS_OR_QPA_QPLATFORMNATIVEINTERFACE_H
)
optional_component(AUDIOCD ON "Devices: Audio CD support" optional_component(AUDIOCD ON "Devices: Audio CD support"
DEPENDS "libcdio" LIBCDIO_FOUND DEPENDS "libcdio" LIBCDIO_FOUND

21
src/globalshortcuts/globalshortcut-x11.cpp
View File

@@ -21,6 +21,7 @@
#include <QtGlobal> #include <QtGlobal>
#include <QApplication> #include <QApplication>
#include <QGuiApplication>
#include <QMap> #include <QMap>
#include <QVector> #include <QVector>
#include <QByteArray> #include <QByteArray>
@@ -37,14 +38,12 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xproto.h> #include <xcb/xproto.h>
#include <QGuiApplication> #if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
#if defined(HAVE_X11EXTRAS) #if defined(HAVE_X11EXTRAS)
# include <QX11Info> # include <QX11Info>
#elif defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H) #elif defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
# include <qpa/qplatformnativeinterface.h> # include <qpa/qplatformnativeinterface.h>
#else #endif
# error "Missing X11Extras or qpa/qplatformnativeinterface.h header."
#endif #endif
const QVector<quint32> GlobalShortcut::mask_modifiers_ = QVector<quint32>() << 0 << Mod2Mask << LockMask << (Mod2Mask | LockMask); const QVector<quint32> GlobalShortcut::mask_modifiers_ = QVector<quint32>() << 0 << Mod2Mask << LockMask << (Mod2Mask | LockMask);
@@ -60,9 +59,7 @@ Display *X11Display() {
if (QNativeInterface::QX11Application *x11_app = qApp->nativeInterface<QNativeInterface::QX11Application>()) { if (QNativeInterface::QX11Application *x11_app = qApp->nativeInterface<QNativeInterface::QX11Application>()) {
return x11_app->display(); return x11_app->display();
} }
else { return nullptr;
return nullptr;
}
#elif defined(HAVE_X11EXTRAS) // Qt 5: Use X11Extras #elif defined(HAVE_X11EXTRAS) // Qt 5: Use X11Extras
@@ -87,14 +84,14 @@ Display *X11Display() {
quint32 AppRootWindow() { quint32 AppRootWindow() {
#if 0 // 6.2: There currently isn't a way to access rootWindow through QX11Application. #if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) // 6.2: Use the new native interface.
if (QNativeInterface::QX11Application *x11_app = qApp->nativeInterface<QNativeInterface::QX11Application>()) { if (QNativeInterface::QX11Application *x11_app = qApp->nativeInterface<QNativeInterface::QX11Application>()) {
return static_cast<xcb_window_t>(reinterpret_cast<quintptr>(x11_app->rootWindow())); if (x11_app->display()) {
} return XDefaultRootWindow(x11_app->display());
else { }
return 0;
} }
return 0;
#elif defined(HAVE_X11EXTRAS) // Qt 5: Use X11Extras #elif defined(HAVE_X11EXTRAS) // Qt 5: Use X11Extras