Use consistent naming pattern for wayland shell integrations
This change intends to fix a minor inconsistency regarding how shell integration classes are named.master
parent
631276e3c1
commit
7e9bec6fd7
|
@ -538,7 +538,6 @@ set(kwin_SRCS
|
||||||
wayland_server.cpp
|
wayland_server.cpp
|
||||||
waylandclient.cpp
|
waylandclient.cpp
|
||||||
waylandshellintegration.cpp
|
waylandshellintegration.cpp
|
||||||
waylandxdgshellintegration.cpp
|
|
||||||
window_property_notify_x11_filter.cpp
|
window_property_notify_x11_filter.cpp
|
||||||
workspace.cpp
|
workspace.cpp
|
||||||
x11client.cpp
|
x11client.cpp
|
||||||
|
@ -546,6 +545,7 @@ set(kwin_SRCS
|
||||||
xcbutils.cpp
|
xcbutils.cpp
|
||||||
xcursortheme.cpp
|
xcursortheme.cpp
|
||||||
xdgshellclient.cpp
|
xdgshellclient.cpp
|
||||||
|
xdgshellintegration.cpp
|
||||||
xkb.cpp
|
xkb.cpp
|
||||||
xwaylandclient.cpp
|
xwaylandclient.cpp
|
||||||
xwl/xwayland_interface.cpp
|
xwl/xwayland_interface.cpp
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "inputpanelv1integration.h"
|
#include "inputpanelv1integration.h"
|
||||||
#include "screens.h"
|
#include "screens.h"
|
||||||
#include "layershellv1integration.h"
|
#include "layershellv1integration.h"
|
||||||
#include "waylandxdgshellintegration.h"
|
#include "xdgshellintegration.h"
|
||||||
#include "workspace.h"
|
#include "workspace.h"
|
||||||
#include "xdgshellclient.h"
|
#include "xdgshellclient.h"
|
||||||
#include "service_utils.h"
|
#include "service_utils.h"
|
||||||
|
@ -364,8 +364,8 @@ bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags
|
||||||
connect(inputPanelV1Integration, &InputPanelV1Integration::clientCreated,
|
connect(inputPanelV1Integration, &InputPanelV1Integration::clientCreated,
|
||||||
this, &WaylandServer::registerShellClient);
|
this, &WaylandServer::registerShellClient);
|
||||||
|
|
||||||
auto xdgShellIntegration = new WaylandXdgShellIntegration(this);
|
auto xdgShellIntegration = new XdgShellIntegration(this);
|
||||||
connect(xdgShellIntegration, &WaylandXdgShellIntegration::clientCreated,
|
connect(xdgShellIntegration, &XdgShellIntegration::clientCreated,
|
||||||
this, &WaylandServer::registerXdgGenericClient);
|
this, &WaylandServer::registerXdgGenericClient);
|
||||||
|
|
||||||
auto layerShellV1Integration = new LayerShellV1Integration(this);
|
auto layerShellV1Integration = new LayerShellV1Integration(this);
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later
|
SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "waylandxdgshellintegration.h"
|
#include "xdgshellintegration.h"
|
||||||
#include "wayland_server.h"
|
#include "wayland_server.h"
|
||||||
#include "workspace.h"
|
#include "workspace.h"
|
||||||
#include "xdgshellclient.h"
|
#include "xdgshellclient.h"
|
||||||
|
@ -29,18 +29,18 @@ namespace KWin
|
||||||
* surface role of the underlying xdg_surface object.
|
* surface role of the underlying xdg_surface object.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
WaylandXdgShellIntegration::WaylandXdgShellIntegration(QObject *parent)
|
XdgShellIntegration::XdgShellIntegration(QObject *parent)
|
||||||
: WaylandShellIntegration(parent)
|
: WaylandShellIntegration(parent)
|
||||||
{
|
{
|
||||||
XdgShellInterface *shell = waylandServer()->display()->createXdgShell(this);
|
XdgShellInterface *shell = waylandServer()->display()->createXdgShell(this);
|
||||||
|
|
||||||
connect(shell, &XdgShellInterface::toplevelCreated,
|
connect(shell, &XdgShellInterface::toplevelCreated,
|
||||||
this, &WaylandXdgShellIntegration::registerXdgToplevel);
|
this, &XdgShellIntegration::registerXdgToplevel);
|
||||||
connect(shell, &XdgShellInterface::popupCreated,
|
connect(shell, &XdgShellInterface::popupCreated,
|
||||||
this, &WaylandXdgShellIntegration::registerXdgPopup);
|
this, &XdgShellIntegration::registerXdgPopup);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WaylandXdgShellIntegration::registerXdgToplevel(XdgToplevelInterface *toplevel)
|
void XdgShellIntegration::registerXdgToplevel(XdgToplevelInterface *toplevel)
|
||||||
{
|
{
|
||||||
// Note that the client is going to be destroyed and immediately re-created when the
|
// Note that the client is going to be destroyed and immediately re-created when the
|
||||||
// underlying surface is unmapped. XdgToplevelClient is re-created right away since
|
// underlying surface is unmapped. XdgToplevelClient is re-created right away since
|
||||||
|
@ -52,7 +52,7 @@ void WaylandXdgShellIntegration::registerXdgToplevel(XdgToplevelInterface *tople
|
||||||
createXdgToplevelClient(toplevel);
|
createXdgToplevelClient(toplevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WaylandXdgShellIntegration::createXdgToplevelClient(XdgToplevelInterface *toplevel)
|
void XdgShellIntegration::createXdgToplevelClient(XdgToplevelInterface *toplevel)
|
||||||
{
|
{
|
||||||
if (!workspace()) {
|
if (!workspace()) {
|
||||||
qCWarning(KWIN_CORE, "An xdg-toplevel surface has been created while the compositor "
|
qCWarning(KWIN_CORE, "An xdg-toplevel surface has been created while the compositor "
|
||||||
|
@ -63,7 +63,7 @@ void WaylandXdgShellIntegration::createXdgToplevelClient(XdgToplevelInterface *t
|
||||||
emit clientCreated(new XdgToplevelClient(toplevel));
|
emit clientCreated(new XdgToplevelClient(toplevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
void WaylandXdgShellIntegration::registerXdgPopup(XdgPopupInterface *popup)
|
void XdgShellIntegration::registerXdgPopup(XdgPopupInterface *popup)
|
||||||
{
|
{
|
||||||
if (!workspace()) {
|
if (!workspace()) {
|
||||||
qCWarning(KWIN_CORE, "An xdg-popup surface has been created while the compositor is "
|
qCWarning(KWIN_CORE, "An xdg-popup surface has been created while the compositor is "
|
|
@ -17,12 +17,12 @@ class XdgPopupInterface;
|
||||||
namespace KWin
|
namespace KWin
|
||||||
{
|
{
|
||||||
|
|
||||||
class WaylandXdgShellIntegration : public WaylandShellIntegration
|
class XdgShellIntegration : public WaylandShellIntegration
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit WaylandXdgShellIntegration(QObject *parent = nullptr);
|
explicit XdgShellIntegration(QObject *parent = nullptr);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void registerXdgToplevel(KWaylandServer::XdgToplevelInterface *toplevel);
|
void registerXdgToplevel(KWaylandServer::XdgToplevelInterface *toplevel);
|
Loading…
Reference in New Issue