diff --git a/src/compton.c b/src/compton.c index 0cd8cf4c..38ee2f0a 100644 --- a/src/compton.c +++ b/src/compton.c @@ -1313,7 +1313,7 @@ xr_blur_dst(session_t *ps, xcb_render_picture_t tgt_buffer, xrfilter_reset(ps, src_pict); { - XserverRegion tmp = src_pict; + xcb_xfixes_region_t tmp = src_pict; src_pict = dst_pict; dst_pict = tmp; } @@ -4957,7 +4957,7 @@ cxinerama_upd_scrs(session_t *ps) { xcb_xinerama_screen_info_t *scrs = xcb_xinerama_query_screens_screen_info(ps->xinerama_scrs); ps->xinerama_nscrs = xcb_xinerama_query_screens_screen_info_length(ps->xinerama_scrs); - ps->xinerama_scr_regs = allocchk(malloc(sizeof(XserverRegion *) + ps->xinerama_scr_regs = allocchk(malloc(sizeof(xcb_xfixes_region_t *) * ps->xinerama_nscrs)); for (int i = 0; i < ps->xinerama_nscrs; ++i) { const xcb_xinerama_screen_info_t * const s = &scrs[i]; diff --git a/src/x.c b/src/x.c index b8188c7b..d3e3b571 100644 --- a/src/x.c +++ b/src/x.c @@ -213,7 +213,7 @@ x_create_picture(session_t *ps, int wid, int hei, return picture; } -bool x_fetch_region(session_t *ps, XserverRegion r, pixman_region32_t *res) { +bool x_fetch_region(session_t *ps, xcb_xfixes_region_t r, pixman_region32_t *res) { xcb_generic_error_t *e = NULL; xcb_connection_t *c = XGetXCBConnection(ps->dpy); xcb_xfixes_fetch_region_reply_t *xr = xcb_xfixes_fetch_region_reply(c, diff --git a/src/x.h b/src/x.h index f5508c06..587da9ce 100644 --- a/src/x.h +++ b/src/x.h @@ -84,7 +84,7 @@ x_create_picture(session_t *ps, int wid, int hei, const xcb_render_create_picture_value_list_t *attr); /// Fetch a X region and store it in a pixman region -bool x_fetch_region(session_t *ps, XserverRegion r, region_t *res); +bool x_fetch_region(session_t *ps, xcb_xfixes_region_t r, region_t *res); void x_set_picture_clip_region(session_t *ps, xcb_render_picture_t, int clip_x_origin, int clip_y_origin, const region_t *);