network/krfb
network/krfb
1
0
Fork 0
mirror of https://invent.kde.org/network/krfb synced 2024-06-28 22:14:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix broken WId refactoring

Browse Source 
Actually remove the WId member from the abtract framebuffer class and use the member in xcbframebuffer

qtframebuffer also uses the WId so add a member there
This commit is contained in:
Nicolas Fella 2022-08-04 11:57:55 +02:00
parent 4169a9f50a
commit 04494dfeb0
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framebuffers/qt/qtframebuffer.cpp
View File

@ -13,7 +13,8 @@
#include <QRegion>
#include <QPixmap>
#include <QBitmap>
#include <QGuiApplication>
#include <QApplication>
#include <QDesktopWidget>
#include <QScreen>
@ -22,6 +23,7 @@ const int UPDATE_TIME = 500;
QtFrameBuffer::QtFrameBuffer(QObject *parent)
: FrameBuffer(parent)
{
win = QApplication::desktop()->winId();
QScreen *screen = QGuiApplication::primaryScreen();
if (screen) {
primaryScreen = screen;

1
framebuffers/qt/qtframebuffer.h
View File

@ -38,6 +38,7 @@ public Q_SLOTS:
void updateFrameBuffer();
private:
WId win;
QImage fbImage;
QTimer *t;
QScreen *primaryScreen;

10
framebuffers/xcb/xcb_framebuffer.cpp
View File

@ -180,7 +180,7 @@ XCBFrameBuffer::XCBFrameBuffer(QObject *parent):
}
d->framebufferImage = xcb_image_get(QX11Info::connection(),
this->win,
d->win,
d->area.left(),
d->area.top(),
d->area.width(),
@ -249,7 +249,7 @@ XCBFrameBuffer::XCBFrameBuffer(QObject *parent):
// will return 1 on success (yes!)
int shmget_res = xcb_image_shm_get(
QX11Info::connection(),
this->win,
d->win,
d->updateTile,
d->shminfo,
d->area.left(), // x
@ -557,7 +557,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
// translate whe coordinates
xcb_shm_get_image_cookie_t sgi_cookie = xcb_shm_get_image(
QX11Info::connection(),
this->win,
d->win,
d->area.left() + r.left(),
d->area.top() + r.top(),
r.width(),
@ -612,7 +612,7 @@ QList<QRect> XCBFrameBuffer::modifiedTiles() {
// need function that copies pixels from one image to another
xcb_image_t *damagedImage = xcb_image_get(
QX11Info::connection(),
this->win,
d->win,
r.left(),
r.top(),
r.width(),
@ -652,7 +652,7 @@ void XCBFrameBuffer::startMonitor() {
d->running = true;
d->damage = xcb_generate_id(QX11Info::connection());
xcb_damage_create(QX11Info::connection(), d->damage, this->win,
xcb_damage_create(QX11Info::connection(), d->damage, d->win,
XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES);
// (currently) we do not call xcb_damage_subtract() EVER, because

1
krfb/framebuffer.h
View File

@ -52,7 +52,6 @@ Q_SIGNALS:
void frameBufferChanged();
protected:
WId win;
char *fb = nullptr;
QList<QRect> tiles;