Merge branch 'next' into more-xcb-conv
This commit is contained in:
@ -5393,6 +5393,7 @@ session_init(session_t *ps_old, int argc, char **argv) {
|
||||
xcb_prefetch_extension_data(c, &xcb_composite_id);
|
||||
xcb_prefetch_extension_data(c, &xcb_damage_id);
|
||||
xcb_prefetch_extension_data(c, &xcb_shape_id);
|
||||
xcb_prefetch_extension_data(c, &xcb_xfixes_id);
|
||||
xcb_prefetch_extension_data(c, &xcb_randr_id);
|
||||
xcb_prefetch_extension_data(c, &xcb_xinerama_id);
|
||||
|
||||
@ -5436,10 +5437,15 @@ session_init(session_t *ps_old, int argc, char **argv) {
|
||||
xcb_discard_reply(c,
|
||||
xcb_damage_query_version(c, XCB_DAMAGE_MAJOR_VERSION, XCB_DAMAGE_MINOR_VERSION).sequence);
|
||||
|
||||
if (!XFixesQueryExtension(ps->dpy, &ps->xfixes_event, &ps->xfixes_error)) {
|
||||
ext_info = xcb_get_extension_data(c, &xcb_xfixes_id);
|
||||
if (!ext_info || !ext_info->present) {
|
||||
fprintf(stderr, "No XFixes extension\n");
|
||||
exit(1);
|
||||
}
|
||||
ps->xfixes_event = ext_info->first_event;
|
||||
ps->xfixes_error = ext_info->first_error;
|
||||
xcb_discard_reply(c,
|
||||
xcb_xfixes_query_version(c, XCB_XFIXES_MAJOR_VERSION, XCB_XFIXES_MINOR_VERSION).sequence);
|
||||
|
||||
// Build a safe representation of display name
|
||||
{
|
||||
|
Reference in New Issue
Block a user