yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scene: Handle Xwayland windows changing surfaces

Browse source 
Xwayland can re-create the wl_surface if the window has been previously
unmapped.

BUG: 442936
BUG: 426069
This commit is contained in:
Vlad Zahorodnii 2021-09-29 11:29:39 +03:00
parent 73162e8fae
commit 8ac93a59ff
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/windowitem.cpp
View file

@ -61,12 +61,18 @@ void WindowItem::updateSurfaceItem(SurfaceItem *surfaceItem)
{
m_surfaceItem.reset(surfaceItem);
connect(m_window, &Toplevel::shadeChanged, this, &WindowItem::updateSurfaceVisibility);
connect(m_window, &Toplevel::bufferGeometryChanged, this, &WindowItem::updateSurfacePosition);
connect(m_window, &Toplevel::frameGeometryChanged, this, &WindowItem::updateSurfacePosition);
if (m_surfaceItem) {
connect(m_window, &Toplevel::shadeChanged, this, &WindowItem::updateSurfaceVisibility);
connect(m_window, &Toplevel::bufferGeometryChanged, this, &WindowItem::updateSurfacePosition);
connect(m_window, &Toplevel::frameGeometryChanged, this, &WindowItem::updateSurfacePosition);
updateSurfacePosition();
updateSurfaceVisibility();
updateSurfacePosition();
updateSurfaceVisibility();
} else {
disconnect(m_window, &Toplevel::shadeChanged, this, &WindowItem::updateSurfaceVisibility);
disconnect(m_window, &Toplevel::bufferGeometryChanged, this, &WindowItem::updateSurfacePosition);
disconnect(m_window, &Toplevel::frameGeometryChanged, this, &WindowItem::updateSurfacePosition);
}
}
void WindowItem::updateSurfacePosition()
@ -120,29 +126,27 @@ void WindowItem::updateDecorationItem()
WindowItemX11::WindowItemX11(Toplevel *window, Item *parent)
: WindowItem(window, parent)
{
switch (kwinApp()->operationMode()) {
case Application::OperationModeX11:
initialize();
break;
case Application::OperationModeXwayland:
// Xwayland windows and Wayland surfaces are associated asynchronously.
if (window->surface()) {
initialize();
} else {
connect(window, &Toplevel::surfaceChanged, this, &WindowItemX11::initialize);
}
break;
case Application::OperationModeWaylandOnly:
Q_UNREACHABLE();
}
initialize();
// Xwayland windows and Wayland surfaces are associated asynchronously.
connect(window, &Toplevel::surfaceChanged, this, &WindowItemX11::initialize);
}
void WindowItemX11::initialize()
{
if (!window()->surface()) {
switch (kwinApp()->operationMode()) {
case Application::OperationModeX11:
updateSurfaceItem(new SurfaceItemX11(window(), this));
} else {
updateSurfaceItem(new SurfaceItemXwayland(window(), this));
break;
case Application::OperationModeXwayland:
if (!window()->surface()) {
updateSurfaceItem(nullptr);
} else {
updateSurfaceItem(new SurfaceItemXwayland(window(), this));
}
break;
case Application::OperationModeWaylandOnly:
Q_UNREACHABLE();
}
}