frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1654) Xnest: Pixmap: replace XGetImage() by xcb_get_image() 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-08 15:35:16 +02:00
parent cd6cd40686
commit 10f2746278
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hw/xnest/Pixmap.c
View File

@ -101,30 +101,60 @@ xnestModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
RegionPtr RegionPtr
xnestPixmapToRegion(PixmapPtr pPixmap) xnestPixmapToRegion(PixmapPtr pPixmap)
{ {
XImage *ximage;
register RegionPtr pReg, pTmpReg; register RegionPtr pReg, pTmpReg;
register int x, y; register int x, y;
unsigned long previousPixel, currentPixel; unsigned long previousPixel, currentPixel;
BoxRec Box = { 0, 0, 0, 0 }; BoxRec Box = { 0, 0, 0, 0 };
Bool overlap; Bool overlap;
ximage = XGetImage(xnestDisplay, xnestPixmap(pPixmap), 0, 0, if (pPixmap->drawable.depth != 1) {
pPixmap->drawable.width, pPixmap->drawable.height, LogMessage(X_WARNING, "xnestPixmapToRegion() depth != 1: %d\n", pPixmap->drawable.depth);
1, XYPixmap); return NULL;
}
xcb_generic_error_t *err = NULL;
xcb_get_image_reply_t *reply = xcb_get_image_reply(
xnestUpstreamInfo.conn,
xcb_get_image(
xnestUpstreamInfo.conn,
XCB_IMAGE_FORMAT_XY_PIXMAP,
xnestPixmap(pPixmap),
0,
0,
pPixmap->drawable.width,
pPixmap->drawable.height,
~0),
&err);
if (err) {
// badMatch may happeen if the upstream window is currently minimized
if (err->error_code != BadMatch)
ErrorF("xnestGetImage: received error %d\n", err->error_code);
free(err);
return NULL;
}
if (!reply) {
ErrorF("xnestGetImage: received no reply\n");
return NULL;
}
pReg = RegionCreate(NULL, 1); pReg = RegionCreate(NULL, 1);
pTmpReg = RegionCreate(NULL, 1); pTmpReg = RegionCreate(NULL, 1);
if (!pReg || !pTmpReg) { if (!pReg || !pTmpReg) {
XDestroyImage(ximage); free(reply);
return NullRegion; return NullRegion;
} }
uint8_t *image_data = xcb_get_image_data(reply);
for (y = 0; y < pPixmap->drawable.height; y++) { for (y = 0; y < pPixmap->drawable.height; y++) {
Box.y1 = y; Box.y1 = y;
Box.y2 = y + 1; Box.y2 = y + 1;
previousPixel = 0L; previousPixel = 0L;
const int line_start = BitmapBytePad(pPixmap->drawable.width) * y;
for (x = 0; x < pPixmap->drawable.width; x++) { for (x = 0; x < pPixmap->drawable.width; x++) {
currentPixel = XGetPixel(ximage, x, y); currentPixel = ((image_data[line_start + (x/8)]) >> (x % 8)) & 1;
if (previousPixel != currentPixel) { if (previousPixel != currentPixel) {
if (previousPixel == 0L) { if (previousPixel == 0L) {
/* left edge */ /* left edge */
@ -148,7 +178,7 @@ xnestPixmapToRegion(PixmapPtr pPixmap)
} }
RegionDestroy(pTmpReg); RegionDestroy(pTmpReg);
XDestroyImage(ximage); free(reply);
RegionValidate(pReg, &overlap); RegionValidate(pReg, &overlap);