Commit 8ab72776 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

[scenes/xrender] Correctly render client-side decorated clients

Summary:
The buffer shape is in buffer-local coordinates and must be mapped to
window coordinates. After that, we are free to map it to the global screen
coordinates.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D25733
parent a7e18789
......@@ -387,6 +387,16 @@ QPoint SceneXrender::Window::mapToScreen(int mask, const WindowPaintData &data,
return pt;
}
QRect SceneXrender::Window::bufferToWindowRect(const QRect &rect) const
{
return rect.translated(bufferOffset());
}
QRegion SceneXrender::Window::bufferToWindowRegion(const QRegion &region) const
{
return region.translated(bufferOffset());
}
void SceneXrender::Window::prepareTempPixmap()
{
const QSize oldSize = temp_visibleRect.size();
......@@ -447,7 +457,7 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
filter = ImageFilterFast;
// do required transformations
const QRect wr = mapToScreen(mask, data, QRect(0, 0, width(), height()));
QRect cr = QRect(toplevel->clientPos(), toplevel->clientSize()); // Client rect (in the window)
QRect cr = QRect(toplevel->clientPos(), toplevel->clientSize()); // Content rect (in the buffer)
qreal xscale = 1;
qreal yscale = 1;
bool scaled = false;
......@@ -461,11 +471,11 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
transformed_shape = decorationRect;
if (toplevel->shape()) {
// "xeyes" + decoration
transformed_shape -= cr;
transformed_shape += bufferShape();
transformed_shape -= bufferToWindowRect(cr);
transformed_shape += bufferToWindowRegion(bufferShape());
}
} else {
transformed_shape = bufferShape();
transformed_shape = bufferToWindowRegion(bufferShape());
}
if (toplevel->shadow()) {
transformed_shape |= toplevel->shadow()->shadowRegion();
......@@ -624,7 +634,7 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
if (blitInTempPixmap) {
dr.translate(-temp_visibleRect.topLeft());
} else {
dr = mapToScreen(mask, data, dr); // Destination rect
dr = mapToScreen(mask, data, bufferToWindowRect(dr)); // Destination rect
if (scaled) {
cr.moveLeft(cr.x() * xscale);
cr.moveTop(cr.y() * yscale);
......
......@@ -201,6 +201,8 @@ protected:
private:
QRect mapToScreen(int mask, const WindowPaintData &data, const QRect &rect) const;
QPoint mapToScreen(int mask, const WindowPaintData &data, const QPoint &point) const;
QRect bufferToWindowRect(const QRect &rect) const;
QRegion bufferToWindowRegion(const QRegion &region) const;
void prepareTempPixmap();
void setPictureFilter(xcb_render_picture_t pic, ImageFilterType filter);
SceneXrender *m_scene;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment