BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert XFixesCreateRegionFromWindow to use Shape directly 

Fetch the rectangles directly use the Shape extension.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2018-09-30 14:21:05 +01:00
parent 82e63593ae
commit 915839c3d3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/win.c
View File

@ -1150,21 +1150,24 @@ void win_update_bounding_shape(session_t *ps, win *w) {
if (w->bounding_shaped) { if (w->bounding_shaped) {
/* /*
* if window doesn't exist anymore, this will generate an error * if window doesn't exist anymore, this will generate an error
* as well as not generate a region. Perhaps a better XFixes * as well as not generate a region.
* architecture would be to have a request that copies instead
* of creates, that way you'd just end up with an empty region
* instead of an invalid XID.
*/ */
XserverRegion border = XFixesCreateRegionFromWindow( xcb_connection_t *c = XGetXCBConnection(ps->dpy);
ps->dpy, w->id, WindowRegionBounding); xcb_shape_get_rectangles_reply_t *r = xcb_shape_get_rectangles_reply(c,
xcb_shape_get_rectangles(c, w->id, XCB_SHAPE_SK_BOUNDING), NULL);
if (!border) if (!r)
return; return;
xcb_rectangle_t *xrects = xcb_shape_get_rectangles_rectangles(r);
int nrects = xcb_shape_get_rectangles_rectangles_length(r);
rect_t *rects = from_x_rects(nrects, xrects);
free(r);
region_t br; region_t br;
pixman_region32_init(&br); pixman_region32_init_rects(&br, rects, nrects);
x_fetch_region(ps, border, &br); free(rects);
// Add border width because we are using a different origin. // Add border width because we are using a different origin.
// X thinks the top left of the inner window is the origin, // X thinks the top left of the inner window is the origin,