old
/
legacy-imlib2
3
0
Fork 4
Code Issues 1 Pull Requests Projects Releases Wiki Activity

x11_grab: Eliminate some overhead in scaled grabbing 

Avoid call to XGetWindowAttributes(), X-error, call to XGetGeometry().
This commit is contained in:
Kim Woelders 2023-03-05 16:18:16 +01:00
parent 8af7975804
commit eae5c3bdbf
4 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/api_x11.c
View File

@ -307,7 +307,7 @@ imlib_create_image_from_drawable(Pixmap mask, int x, int y, int width,
err = __imlib_GrabDrawableToRGBA(&ctx->x11, im->data, 0, 0, width, height,
ctx->drawable, mask,
x, y, width, height,
&domask, need_to_grab_x, true);
&domask, need_to_grab_x, true, NULL);
if (err)
{
__imlib_FreeImage(im);
@ -359,7 +359,7 @@ imlib_create_scaled_image_from_drawable(Pixmap mask, int src_x, int src_y,
0, 0, dst_width, dst_height,
ctx->drawable, mask,
src_x, src_y, src_width, src_height,
&domask, need_to_grab_x, true);
&domask, need_to_grab_x, true, NULL);
else
err = __imlib_GrabDrawableScaledToRGBA(&ctx->x11, im->data,
0, 0, dst_width, dst_height,
@ -405,7 +405,7 @@ imlib_copy_drawable_to_image(Pixmap mask, int src_x, int src_y, int src_width,
dst_x, dst_y, im->w, im->h,
ctx->drawable, mask,
src_x, src_y, src_width, src_height,
&domask, need_to_grab_x, false);
&domask, need_to_grab_x, false, NULL);
}
EAPI void

87
src/lib/x11_grab.c
View File

@ -604,7 +604,8 @@ __imlib_GrabDrawableToRGBA(const ImlibContextX11 * x11, uint32_t * data,
int w_dst, int h_dst,
Drawable draw, Pixmap mask_,
int x_src, int y_src, int w_src, int h_src,
char *pdomask, int grab, bool clear)
char *pdomask, int grab, bool clear,
const XWindowAttributes * attr)
{
XWindowAttributes xatt;
bool is_pixmap, is_shm, is_mshm;
@ -624,49 +625,61 @@ __imlib_GrabDrawableToRGBA(const ImlibContextX11 * x11, uint32_t * data,
width = w_src;
height = h_src;
is_pixmap = _DrawableCheck(x11->dpy, draw, &xatt);
if (is_pixmap)
if (attr)
{
Window rret;
unsigned int bw;
XGetGeometry(x11->dpy, draw, &rret, &xatt.x, &xatt.y,
(unsigned int *)&xatt.width, (unsigned int *)&xatt.height,
&bw, (unsigned int *)&xatt.depth);
is_pixmap = true;
xatt.width = attr->width;
xatt.height = attr->height;
xatt.depth = attr->depth;
}
else
{
XWindowAttributes ratt;
Window cret;
is_pixmap = _DrawableCheck(x11->dpy, draw, &xatt);
if ((xatt.map_state != IsViewable) && (xatt.backing_store == NotUseful))
goto bail;
/* Clip source to screen */
XGetWindowAttributes(x11->dpy, xatt.root, &ratt);
XTranslateCoordinates(x11->dpy, draw, xatt.root,
0, 0, &xatt.x, &xatt.y, &cret);
if (xatt.x + x_src < 0)
if (is_pixmap)
{
width += xatt.x + x_src;
x_src = -xatt.x;
}
if (xatt.x + x_src + width > ratt.width)
width = ratt.width - (xatt.x + x_src);
Window rret;
unsigned int bw;
if (xatt.y + y_src < 0)
XGetGeometry(x11->dpy, draw, &rret, &xatt.x, &xatt.y,
(unsigned int *)&xatt.width,
(unsigned int *)&xatt.height,
&bw, (unsigned int *)&xatt.depth);
}
else
{
height += xatt.y + y_src;
y_src = -xatt.y;
}
if (xatt.y + y_src + height > ratt.height)
height = ratt.height - (xatt.y + y_src);
XWindowAttributes ratt;
Window cret;
/* Is this ever relevant? */
if (xatt.colormap == None)
xatt.colormap = ratt.colormap;
if (xatt.map_state != IsViewable &&
xatt.backing_store == NotUseful)
goto bail;
/* Clip source to screen */
XGetWindowAttributes(x11->dpy, xatt.root, &ratt);
XTranslateCoordinates(x11->dpy, draw, xatt.root,
0, 0, &xatt.x, &xatt.y, &cret);
if (xatt.x + x_src < 0)
{
width += xatt.x + x_src;
x_src = -xatt.x;
}
if (xatt.x + x_src + width > ratt.width)
width = ratt.width - (xatt.x + x_src);
if (xatt.y + y_src < 0)
{
height += xatt.y + y_src;
y_src = -xatt.y;
}
if (xatt.y + y_src + height > ratt.height)
height = ratt.height - (xatt.y + y_src);
/* Is this ever relevant? */
if (xatt.colormap == None)
xatt.colormap = ratt.colormap;
}
}
/* Clip source to drawable */
@ -993,9 +1006,11 @@ __imlib_GrabDrawableScaledToRGBA(const ImlibContextX11 * x11, uint32_t * data,
height -= xx;
}
xatt.width = w_dst; /* Not the actual pixmap size but the scaled size */
xatt.height = h_dst;
rc = __imlib_GrabDrawableToRGBA(x11, data, x_dst_, y_dst_, w_dst, h_dst,
psc, msc, x_src_, y_src_, width, height,
pdomask, grab, clear);
pdomask, grab, clear, &xatt);
if (mgc)
XFreeGC(x11->dpy, mgc);

3
src/lib/x11_grab.h
View File

@ -12,7 +12,8 @@ int __imlib_GrabDrawableToRGBA(const ImlibContextX11 * x11,
int x_src, int y_src,
int w_src, int h_src,
char *domask, int grab,
bool clear);
bool clear,
const XWindowAttributes * attr);
int __imlib_GrabDrawableScaledToRGBA(const ImlibContextX11 *
x11, uint32_t * data,

4
src/lib/x11_rend.c
View File

@ -319,7 +319,7 @@ __imlib_RenderImage(const ImlibContextX11 * x11, ImlibImage * im,
{
back = malloc(dw * dh * sizeof(uint32_t));
if (__imlib_GrabDrawableToRGBA(x11, back, 0, 0, dw, dh,
w, 0, dx, dy, dw, dh, 0, 1, false))
w, 0, dx, dy, dw, dh, 0, 1, false, NULL))
{
free(back);
back = NULL;
@ -568,7 +568,7 @@ __imlib_RenderImageSkewed(const ImlibContextX11 * x11, ImlibImage * im,
__imlib_GetContext(x11);
__imlib_GrabDrawableToRGBA(x11, back->data, 0, 0, dw, dh,
w, 0, dx1, dy1, dw, dh, 0, 1, false);
w, 0, dx1, dy1, dw, dh, 0, 1, false, NULL);
__imlib_BlendImageToImageSkewed(im, back, antialias, 1, 0, sx, sy, sw, sh,
dx - dx1, dy - dy1, hsx, hsy, vsx, vsy,