[wayland] Drop Qt extended surface
Summary: This is only relevant on Qt and when WlShell is used. This was only the case before Qt5.10. We will depend on Qt5.12 next release. Static Qt builds which are that old typically wouldn't contain QtWayland Test Plan: Compiles. Not used in tests Reviewers: #kwin, graesslin Reviewed By: #kwin, graesslin Subscribers: graesslin, zzag, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D18594icc-effect-5.17.5
parent
4240c4af05
commit
7d10ab0fe7
|
@ -714,8 +714,6 @@ void ShellClient::closeWindow()
|
||||||
m_xdgShellSurface->close();
|
m_xdgShellSurface->close();
|
||||||
const qint32 pingSerial = static_cast<XdgShellInterface *>(m_xdgShellSurface->global())->ping(m_xdgShellSurface);
|
const qint32 pingSerial = static_cast<XdgShellInterface *>(m_xdgShellSurface->global())->ping(m_xdgShellSurface);
|
||||||
m_pingSerials.insert(pingSerial, PingReason::CloseWindow);
|
m_pingSerials.insert(pingSerial, PingReason::CloseWindow);
|
||||||
} else if (m_qtExtendedSurface && isCloseable()) {
|
|
||||||
m_qtExtendedSurface->close();
|
|
||||||
} else if (m_internalWindow) {
|
} else if (m_internalWindow) {
|
||||||
m_internalWindow->hide();
|
m_internalWindow->hide();
|
||||||
}
|
}
|
||||||
|
@ -738,7 +736,7 @@ bool ShellClient::isCloseable() const
|
||||||
if (m_internal) {
|
if (m_internal) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return m_qtExtendedSurface ? true : false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ShellClient::isFullScreen() const
|
bool ShellClient::isFullScreen() const
|
||||||
|
@ -1450,19 +1448,6 @@ bool ShellClient::isInitialPositionSet() const
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ShellClient::installQtExtendedSurface(QtExtendedSurfaceInterface *surface)
|
|
||||||
{
|
|
||||||
m_qtExtendedSurface = surface;
|
|
||||||
|
|
||||||
connect(m_qtExtendedSurface.data(), &QtExtendedSurfaceInterface::raiseRequested, this, [this]() {
|
|
||||||
workspace()->raiseClientRequest(this);
|
|
||||||
});
|
|
||||||
connect(m_qtExtendedSurface.data(), &QtExtendedSurfaceInterface::lowerRequested, this, [this]() {
|
|
||||||
workspace()->lowerClientRequest(this);
|
|
||||||
});
|
|
||||||
m_qtExtendedSurface->installEventFilter(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ShellClient::installAppMenu(AppMenuInterface *menu)
|
void ShellClient::installAppMenu(AppMenuInterface *menu)
|
||||||
{
|
{
|
||||||
m_appMenuInterface = menu;
|
m_appMenuInterface = menu;
|
||||||
|
|
|
@ -33,7 +33,6 @@ class ServerSideDecorationInterface;
|
||||||
class ServerSideDecorationPaletteInterface;
|
class ServerSideDecorationPaletteInterface;
|
||||||
class AppMenuInterface;
|
class AppMenuInterface;
|
||||||
class PlasmaShellSurfaceInterface;
|
class PlasmaShellSurfaceInterface;
|
||||||
class QtExtendedSurfaceInterface;
|
|
||||||
class XdgDecorationInterface;
|
class XdgDecorationInterface;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -139,7 +138,6 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
void installPlasmaShellSurface(KWayland::Server::PlasmaShellSurfaceInterface *surface);
|
void installPlasmaShellSurface(KWayland::Server::PlasmaShellSurfaceInterface *surface);
|
||||||
void installQtExtendedSurface(KWayland::Server::QtExtendedSurfaceInterface *surface);
|
|
||||||
void installServerSideDecoration(KWayland::Server::ServerSideDecorationInterface *decoration);
|
void installServerSideDecoration(KWayland::Server::ServerSideDecorationInterface *decoration);
|
||||||
void installAppMenu(KWayland::Server::AppMenuInterface *appmenu);
|
void installAppMenu(KWayland::Server::AppMenuInterface *appmenu);
|
||||||
void installPalette(KWayland::Server::ServerSideDecorationPaletteInterface *palette);
|
void installPalette(KWayland::Server::ServerSideDecorationPaletteInterface *palette);
|
||||||
|
@ -255,7 +253,6 @@ private:
|
||||||
QRect m_geomMaximizeRestore; // size and position of the window before it was set to maximize
|
QRect m_geomMaximizeRestore; // size and position of the window before it was set to maximize
|
||||||
NET::WindowType m_windowType = NET::Normal;
|
NET::WindowType m_windowType = NET::Normal;
|
||||||
QPointer<KWayland::Server::PlasmaShellSurfaceInterface> m_plasmaShellSurface;
|
QPointer<KWayland::Server::PlasmaShellSurfaceInterface> m_plasmaShellSurface;
|
||||||
QPointer<KWayland::Server::QtExtendedSurfaceInterface> m_qtExtendedSurface;
|
|
||||||
QPointer<KWayland::Server::AppMenuInterface> m_appMenuInterface;
|
QPointer<KWayland::Server::AppMenuInterface> m_appMenuInterface;
|
||||||
QPointer<KWayland::Server::ServerSideDecorationPaletteInterface> m_paletteInterface;
|
QPointer<KWayland::Server::ServerSideDecorationPaletteInterface> m_paletteInterface;
|
||||||
KWayland::Server::ServerSideDecorationInterface *m_serverDecoration = nullptr;
|
KWayland::Server::ServerSideDecorationInterface *m_serverDecoration = nullptr;
|
||||||
|
|
|
@ -295,17 +295,6 @@ bool WaylandServer::init(const QByteArray &socketName, InitalizationFlags flags)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
m_qtExtendedSurface = m_display->createQtSurfaceExtension(m_display);
|
|
||||||
m_qtExtendedSurface->create();
|
|
||||||
connect(m_qtExtendedSurface, &QtSurfaceExtensionInterface::surfaceCreated,
|
|
||||||
[this] (QtExtendedSurfaceInterface *surface) {
|
|
||||||
if (ShellClient *client = findClient(surface->surface())) {
|
|
||||||
client->installQtExtendedSurface(surface);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
m_appMenuManager = m_display->createAppMenuManagerInterface(m_display);
|
m_appMenuManager = m_display->createAppMenuManagerInterface(m_display);
|
||||||
m_appMenuManager->create();
|
m_appMenuManager->create();
|
||||||
connect(m_appMenuManager, &AppMenuManagerInterface::appMenuCreated,
|
connect(m_appMenuManager, &AppMenuManagerInterface::appMenuCreated,
|
||||||
|
|
|
@ -240,7 +240,6 @@ private:
|
||||||
KWayland::Server::PlasmaShellInterface *m_plasmaShell = nullptr;
|
KWayland::Server::PlasmaShellInterface *m_plasmaShell = nullptr;
|
||||||
KWayland::Server::PlasmaWindowManagementInterface *m_windowManagement = nullptr;
|
KWayland::Server::PlasmaWindowManagementInterface *m_windowManagement = nullptr;
|
||||||
KWayland::Server::PlasmaVirtualDesktopManagementInterface *m_virtualDesktopManagement = nullptr;
|
KWayland::Server::PlasmaVirtualDesktopManagementInterface *m_virtualDesktopManagement = nullptr;
|
||||||
KWayland::Server::QtSurfaceExtensionInterface *m_qtExtendedSurface = nullptr;
|
|
||||||
KWayland::Server::ServerSideDecorationManagerInterface *m_decorationManager = nullptr;
|
KWayland::Server::ServerSideDecorationManagerInterface *m_decorationManager = nullptr;
|
||||||
KWayland::Server::OutputManagementInterface *m_outputManagement = nullptr;
|
KWayland::Server::OutputManagementInterface *m_outputManagement = nullptr;
|
||||||
KWayland::Server::AppMenuManagerInterface *m_appMenuManager = nullptr;
|
KWayland::Server::AppMenuManagerInterface *m_appMenuManager = nullptr;
|
||||||
|
|
Loading…
Reference in New Issue