kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Get wayland serial with new Qt 6.4 API

Browse source
This commit is contained in:
Ilya Fedin 2022-09-01 16:31:28 +04:00 • committed by John Preston
parent f420e302d7
commit 47268d21ce
1 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ui/platform/linux/ui_linux_wayland_integration.cpp
View file

@ -15,23 +15,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
// private QtWaylandClient headers are using keywords :(
#ifdef QT_NO_KEYWORDS
#define signals Q_SIGNALS
#define slots Q_SLOTS
#endif // QT_NO_KEYWORDS
#include <private/qwaylanddisplay_p.h>
#include <private/qwaylandwindow_p.h>
#include <private/qwaylandinputdevice_p.h>
#include <wayland-client.h> #include <wayland-client.h>
Q_DECLARE_METATYPE(QMargins); Q_DECLARE_METATYPE(QMargins);
using QtWaylandClient::QWaylandWindow;
namespace Ui { namespace Ui {
namespace Platform { namespace Platform {
namespace { namespace {
@ -198,21 +185,20 @@ void WaylandIntegration::showWindowMenu(
const auto seat = reinterpret_cast<wl_seat*>( const auto seat = reinterpret_cast<wl_seat*>(
native->nativeResourceForIntegration(QByteArray("wl_seat"))); native->nativeResourceForIntegration(QByteArray("wl_seat")));
const auto serial = [&]() -> std::optional<uint32_t> {
const auto waylandWindow = static_cast<QWaylandWindow*>(
widget->windowHandle()->handle());
if (!waylandWindow) {
return std::nullopt;
}
return waylandWindow->display()->defaultInputDevice()->serial();
}();
if (!toplevel || !seat || !serial) { const auto serial = uint32_t(reinterpret_cast<quintptr>(
native->nativeResourceForIntegration(QByteArray("serial"))));
if (!toplevel || !seat) {
return; return;
} }
xdg_toplevel_show_window_menu(toplevel, seat, *serial, point.x(), point.y()); xdg_toplevel_show_window_menu(
toplevel,
seat,
serial,
point.x(),
point.y());
} }
} // namespace Platform } // namespace Platform