9a7ab8a62e
Window management features were written with synchronous geometry updates in mind. Currently, this poses a big problem on Wayland because geometry updates are done in asynchronous fashion there. At the moment, geometry is updated in a so called pseudo-asynchronous fashion, meaning that the frame geometry will be reset to the old value once geometry updates are unblocked. The main drawback of this approach is that it is too error prone, the data flow is hard to comprehend, etc. It is worth noting that there is already a machinery to perform async geometry which is used during interactive move/resize operations. This change extends the move/resize geometry usage beyond interactive move/resize to make asynchronous geometry updates less error prone and easier to comprehend. With the proposed solution, all geometry updates must be done on the move/resize geometry first. After that, the new geometry is passed on to the Client-specific implementation of moveResizeInternal(). To be more specific, the frameGeometry() returns the current frame geometry, it is primarily useful only to the scene. If you want to move or resize a window, you need to use moveResizeGeometry() because it corresponds to the last requested frame geometry. It is worth noting that the moveResizeGeometry() returns the desired bounding geometry. The client may commit the xdg_toplevel surface with a slightly smaller window geometry, for example to enforce a specific aspect ratio. The client is not allowed to resize beyond the size as indicated in moveResizeGeometry(). The data flow is very simple: moveResize() updates the move/resize geometry and calls the client-specific implementation of the moveResizeInternal() method. Based on whether a configure event is needed, moveResizeInternal() will update the frameGeometry() either immediately or after the client commits a new buffer. Unfortunately, both the compositor and xdg-shell clients try to update the window geometry. It means that it's possible to have conflicts between the two. With this change, the compositor's move resize geometry will be synced only if there are no pending configure events, meaning that the user doesn't try to resize the window.
134 lines
4.1 KiB
C++
134 lines
4.1 KiB
C++
/*
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
SPDX-FileCopyrightText: 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
|
|
|
|
SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
|
|
#include "inputpanelv1client.h"
|
|
#include "deleted.h"
|
|
#include "wayland_server.h"
|
|
#include "workspace.h"
|
|
#include "abstract_wayland_output.h"
|
|
#include "platform.h"
|
|
#include <KWaylandServer/output_interface.h>
|
|
#include <KWaylandServer/seat_interface.h>
|
|
#include <KWaylandServer/surface_interface.h>
|
|
#include <KWaylandServer/textinput_v2_interface.h>
|
|
|
|
using namespace KWaylandServer;
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
InputPanelV1Client::InputPanelV1Client(InputPanelSurfaceV1Interface *panelSurface)
|
|
: WaylandClient(panelSurface->surface())
|
|
, m_panelSurface(panelSurface)
|
|
{
|
|
setSkipSwitcher(true);
|
|
setSkipPager(true);
|
|
setSkipTaskbar(true);
|
|
|
|
connect(surface(), &SurfaceInterface::aboutToBeDestroyed, this, &InputPanelV1Client::destroyClient);
|
|
connect(surface(), &SurfaceInterface::sizeChanged, this, &InputPanelV1Client::reposition);
|
|
connect(surface(), &SurfaceInterface::mapped, this, &InputPanelV1Client::updateDepth);
|
|
|
|
connect(panelSurface, &InputPanelSurfaceV1Interface::topLevel, this, &InputPanelV1Client::showTopLevel);
|
|
connect(panelSurface, &InputPanelSurfaceV1Interface::overlayPanel, this, &InputPanelV1Client::showOverlayPanel);
|
|
connect(panelSurface, &InputPanelSurfaceV1Interface::destroyed, this, &InputPanelV1Client::destroyClient);
|
|
}
|
|
|
|
void InputPanelV1Client::showOverlayPanel()
|
|
{
|
|
setOutput(nullptr);
|
|
m_mode = Overlay;
|
|
reposition();
|
|
setReadyForPainting();
|
|
}
|
|
|
|
void InputPanelV1Client::showTopLevel(OutputInterface *output, InputPanelSurfaceV1Interface::Position position)
|
|
{
|
|
Q_UNUSED(position);
|
|
m_mode = Toplevel;
|
|
setOutput(output);
|
|
reposition();
|
|
setReadyForPainting();
|
|
}
|
|
|
|
void KWin::InputPanelV1Client::reposition()
|
|
{
|
|
switch (m_mode) {
|
|
case Toplevel: {
|
|
if (m_output) {
|
|
const QSize panelSize = surface()->size();
|
|
if (!panelSize.isValid() || panelSize.isEmpty()) {
|
|
return;
|
|
}
|
|
|
|
QRect availableArea;
|
|
if (waylandServer()->isScreenLocked()) {
|
|
availableArea = m_output->geometry();
|
|
} else {
|
|
availableArea = workspace()->clientArea(MaximizeArea, m_output, desktop());
|
|
}
|
|
QRect geo(availableArea.topLeft(), panelSize);
|
|
geo.translate((availableArea.width() - panelSize.width())/2, availableArea.height() - panelSize.height());
|
|
moveResize(geo);
|
|
}
|
|
} break;
|
|
case Overlay: {
|
|
auto textClient = waylandServer()->findClient(waylandServer()->seat()->focusedTextInputSurface());
|
|
auto textInput = waylandServer()->seat()->textInputV2();
|
|
if (textClient && textInput) {
|
|
const auto cursorRectangle = textInput->cursorRectangle();
|
|
moveResize({textClient->pos() + textClient->clientPos() + cursorRectangle.bottomLeft(), surface()->size()});
|
|
}
|
|
} break;
|
|
}
|
|
}
|
|
|
|
void InputPanelV1Client::destroyClient()
|
|
{
|
|
markAsZombie();
|
|
|
|
Deleted *deleted = Deleted::create(this);
|
|
emit windowClosed(this, deleted);
|
|
StackingUpdatesBlocker blocker(workspace());
|
|
waylandServer()->removeClient(this);
|
|
deleted->unrefWindow();
|
|
|
|
delete this;
|
|
}
|
|
|
|
NET::WindowType InputPanelV1Client::windowType(bool, int) const
|
|
{
|
|
return NET::Utility;
|
|
}
|
|
|
|
QRect InputPanelV1Client::inputGeometry() const
|
|
{
|
|
return surface()->input().boundingRect().translated(pos());
|
|
}
|
|
|
|
void InputPanelV1Client::setOutput(OutputInterface *outputIface)
|
|
{
|
|
if (m_output) {
|
|
disconnect(m_output, &AbstractWaylandOutput::geometryChanged, this, &InputPanelV1Client::reposition);
|
|
}
|
|
|
|
m_output = waylandServer()->findOutput(outputIface);
|
|
|
|
if (m_output) {
|
|
connect(m_output, &AbstractWaylandOutput::geometryChanged, this, &InputPanelV1Client::reposition);
|
|
}
|
|
}
|
|
|
|
void InputPanelV1Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
|
|
{
|
|
Q_UNUSED(mode)
|
|
updateGeometry(rect);
|
|
}
|
|
|
|
} // namespace KWin
|