Make some of the error logs more informative

Print the X error causing the error as well.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui
2020-03-28 00:15:45 +00:00
parent 58582eb639
commit 23068c300c
3 changed files with 32 additions and 31 deletions

View File

@ -1355,9 +1355,7 @@ static void handle_pending_updates(EV_P_ struct session *ps) {
log_debug("Delayed handling of events, entering critical section");
auto e = xcb_request_check(ps->c, xcb_grab_server_checked(ps->c));
if (e) {
log_fatal("failed to grab x server");
x_print_error(e->full_sequence, e->major_code, e->minor_code,
e->error_code);
log_fatal_x_error(e, "failed to grab x server");
return quit(ps);
}
@ -1389,9 +1387,7 @@ static void handle_pending_updates(EV_P_ struct session *ps) {
e = xcb_request_check(ps->c, xcb_ungrab_server_checked(ps->c));
if (e) {
log_fatal("failed to ungrab x server");
x_print_error(e->full_sequence, e->major_code, e->minor_code,
e->error_code);
log_fatal_x_error(e, "failed to ungrab x server");
return quit(ps);
}
@ -1701,8 +1697,7 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY |
XCB_EVENT_MASK_PROPERTY_CHANGE}));
if (e) {
log_error("Failed to setup root window event mask");
free(e);
log_error_x_error(e, "Failed to setup root window event mask");
}
xcb_prefetch_extension_data(ps->c, &xcb_render_id);
@ -1903,8 +1898,8 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
e = xcb_request_check(
ps->c, xcb_sync_create_fence(ps->c, ps->root, ps->sync_fence, 0));
if (e) {
log_error("Failed to create a XSync fence. xrender-sync-fence "
"will be disabled");
log_error_x_error(e, "Failed to create a XSync fence. "
"xrender-sync-fence will be disabled");
ps->o.xrender_sync_fence = false;
ps->sync_fence = XCB_NONE;
free(e);
@ -2118,7 +2113,7 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
e = xcb_request_check(ps->c, xcb_ungrab_server(ps->c));
if (e) {
log_error("Failed to ungrab server");
log_error_x_error(e, "Failed to ungrab server");
free(e);
}