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

globalshortcut-x11: Use private header for accessing app root window

Browse Source 
QX11Application Currently lacks a method for this.

Fixes #893
This commit is contained in:
Jonas Kvinge
2022-02-11 02:32:19 +01:00
parent 01d4d404c0
commit 1b8966b3a4
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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