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

Drop xcb-shm usage from QPainterWindowPixmap

Browse source 
Summary:
Before we were able to render Xwayland windows through the Wayland buffer
we used a xcb-shm to map the window data in the QPainter compositor.

As we don't use that any more and QPainter is not available for X11
anyway we can just drop the code.

Reviewers: #plasma

Subscribers: plasma-devel

Projects: #plasma

Differential Revision: https://phabricator.kde.org/D1193
This commit is contained in:
Martin Gräßlin 2016-03-21 17:11:35 +01:00
parent d49189276f
commit 6e18cae42a
2 changed files with 11 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
scene_qpainter.cpp
View file

@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "wayland_server.h"
#include <KWayland/Server/buffer_interface.h>
#include <KWayland/Server/surface_interface.h>
#include "xcbutils.h"
#include "decorations/decoratedclient.h"
// Qt
#include <QDebug>
@ -404,7 +403,6 @@ Decoration::Renderer *SceneQPainter::createDecorationRenderer(Decoration::Decora
//****************************************
QPainterWindowPixmap::QPainterWindowPixmap(Scene::Window *window)
: WindowPixmap(window)
, m_shm(kwinApp()->shouldUseWaylandForCompositing() ? nullptr : new Xcb::Shm)
{
}
@ -417,51 +415,27 @@ void QPainterWindowPixmap::create()
if (isValid()) {
return;
}
if (!kwinApp()->shouldUseWaylandForCompositing() && !m_shm->isValid()) {
return;
}
KWin::WindowPixmap::create();
if (!isValid()) {
return;
}
if (kwinApp()->shouldUseWaylandForCompositing()) {
// performing deep copy, this could probably be improved
m_image = buffer()->data().copy();
return;
}
m_image = QImage((uchar*)m_shm->buffer(), size().width(), size().height(), QImage::Format_ARGB32_Premultiplied);
// performing deep copy, this could probably be improved
m_image = buffer()->data().copy();
}
bool QPainterWindowPixmap::update(const QRegion &damage)
{
if (kwinApp()->shouldUseWaylandForCompositing()) {
const auto oldBuffer = buffer();
updateBuffer();
const auto &b = buffer();
if (b == oldBuffer || b.isNull()) {
return false;
}
QPainter p(&m_image);
const QImage &data = b->data();
p.setCompositionMode(QPainter::CompositionMode_Source);
for (const QRect &rect : damage.rects()) {
p.drawImage(rect, data, rect);
}
return true;
}
if (!m_shm->isValid()) {
const auto oldBuffer = buffer();
updateBuffer();
const auto &b = buffer();
if (b == oldBuffer || b.isNull()) {
return false;
}
// TODO: optimize by only updating the damaged areas
xcb_shm_get_image_cookie_t cookie = xcb_shm_get_image_unchecked(connection(), pixmap(),
0, 0, size().width(), size().height(),
~0, XCB_IMAGE_FORMAT_Z_PIXMAP, m_shm->segment(), 0);
ScopedCPointer<xcb_shm_get_image_reply_t> image(xcb_shm_get_image_reply(connection(), cookie, NULL));
if (image.isNull()) {
return false;
QPainter p(&m_image);
const QImage &data = b->data();
p.setCompositionMode(QPainter::CompositionMode_Source);
for (const QRect &rect : damage.rects()) {
p.drawImage(rect, data, rect);
}
return true;
}

5
scene_qpainter.h
View file

@ -27,10 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin {
namespace Xcb {
class Shm;
}
class KWIN_EXPORT QPainterBackend
{
public:
@ -163,7 +159,6 @@ public:
bool update(const QRegion &damage);
const QImage &image();
private:
QScopedPointer<Xcb::Shm> m_shm;
QImage m_image;
};