PolytreeDE/picom
1
0
Fork 0
mirror of https://github.com/yshui/picom.git synced 2025-04-14 17:53:25 -04:00
Code Releases Activity

x: x_error_code_to_string doesn't need ps_g anymore

Browse source
This commit is contained in:
Maxim Solovyov 2024-10-18 23:46:08 +03:00
parent 150339f34e
commit da1db39d04
No known key found for this signature in database
9 changed files with 127 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/backend/xrender/xrender.c
View file

@ -172,7 +172,7 @@ xrender_make_rounded_corner_cache(struct x_connection *c, xcb_render_picture_t s
}
#undef ADD_POINT
XCB_AWAIT_VOID(xcb_render_tri_strip, c->c, XCB_RENDER_PICT_OP_SRC, src, picture,
XCB_AWAIT_VOID(xcb_render_tri_strip, c, XCB_RENDER_PICT_OP_SRC, src, picture,
x_get_pictfmt_for_standard(c, XCB_PICT_STANDARD_A_8), 0, 0,
(uint32_t)point_count, points);
free(points);
@ -641,7 +641,8 @@ xrender_bind_pixmap(backend_t *base, xcb_pixmap_t pixmap, struct xvisual_info fm
auto r = xcb_get_geometry_reply(base->c->c, xcb_get_geometry(base->c->c, pixmap), &e);
if (!r) {
log_error("Invalid pixmap: %#010x", pixmap);
x_print_error(e->full_sequence, e->major_code, e->minor_code, e->error_code);
x_print_error(base->c, e->full_sequence, e->major_code, e->minor_code,
e->error_code);
free(e);
return NULL;
}

14
src/event.c
View file

@ -199,7 +199,7 @@ struct ev_ewmh_active_win_request {
/// Does not change anything if we fail to get the attribute or the window
/// returned could not be found.
static void
update_ewmh_active_win(struct x_connection * /*c*/, struct x_async_request_base *req_base,
update_ewmh_active_win(struct x_connection *c, struct x_async_request_base *req_base,
const xcb_raw_generic_event_t *reply_or_error) {
auto ps = ((struct ev_ewmh_active_win_request *)req_base)->ps;
free(req_base);
@ -213,7 +213,7 @@ update_ewmh_active_win(struct x_connection * /*c*/, struct x_async_request_base
if (reply_or_error->response_type == 0) {
log_error("Failed to get _NET_ACTIVE_WINDOW: %s",
x_strerror(((xcb_generic_error_t *)reply_or_error)));
x_strerror(c, (xcb_generic_error_t *)reply_or_error));
return;
}
@ -246,7 +246,7 @@ struct ev_recheck_focus_request {
* @param ps current session
* @return struct _win of currently focused window, NULL if not found
*/
static void recheck_focus(struct x_connection * /*c*/, struct x_async_request_base *req_base,
static void recheck_focus(struct x_connection *c, struct x_async_request_base *req_base,
const xcb_raw_generic_event_t *reply_or_error) {
auto ps = ((struct ev_ewmh_active_win_request *)req_base)->ps;
free(req_base);
@ -263,7 +263,7 @@ static void recheck_focus(struct x_connection * /*c*/, struct x_async_request_ba
if (reply_or_error->response_type == 0) {
// Not able to get input focus means very not good things...
auto e = (xcb_generic_error_t *)reply_or_error;
log_error_x_error(e, "Failed to get focused window.");
log_error_x_error(c, e, "Failed to get focused window.");
return;
}
@ -419,7 +419,7 @@ static inline void ev_map_notify(session_t *ps, xcb_map_notify_event_t *ev) {
if (!ps->redirected) {
log_debug("Overlay is mapped while we are not redirected");
auto succeeded =
XCB_AWAIT_VOID(xcb_unmap_window, ps->c.c, ps->overlay);
XCB_AWAIT_VOID(xcb_unmap_window, &ps->c, ps->overlay);
if (!succeeded) {
log_error("Failed to unmap the overlay window");
}
@ -641,8 +641,8 @@ static inline void repair_win(session_t *ps, struct win *w) {
xcb_damage_subtract_checked(ps->c.c, w->damage, XCB_NONE, XCB_NONE));
if (e) {
if (ps->o.show_all_xerrors) {
x_print_error(e->sequence, e->major_code, e->minor_code,
e->error_code);
x_print_error(&ps->c, e->sequence, e->major_code,
e->minor_code, e->error_code);
}
free(e);
}

11
src/inspect.c
View file

@ -27,11 +27,11 @@ xcb_window_t inspect_select_window(struct x_connection *c) {
xcb_cursor_t cursor = x_new_id(c);
const char font_name[] = "cursor";
static const uint16_t CROSSHAIR_CHAR = 34;
XCB_AWAIT_VOID(xcb_open_font, c->c, font, sizeof(font_name) - 1, font_name);
XCB_AWAIT_VOID(xcb_create_glyph_cursor, c->c, cursor, font, font, CROSSHAIR_CHAR,
XCB_AWAIT_VOID(xcb_open_font, c, font, sizeof(font_name) - 1, font_name);
XCB_AWAIT_VOID(xcb_create_glyph_cursor, c, cursor, font, font, CROSSHAIR_CHAR,
CROSSHAIR_CHAR + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
auto grab_reply = XCB_AWAIT(
xcb_grab_pointer, c->c, false, c->screen_info->root,
xcb_grab_pointer, c, false, c->screen_info->root,
XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE, XCB_GRAB_MODE_SYNC,
XCB_GRAB_MODE_ASYNC, c->screen_info->root, cursor, XCB_CURRENT_TIME);
if (grab_reply->status != XCB_GRAB_STATUS_SUCCESS) {
@ -45,8 +45,7 @@ xcb_window_t inspect_select_window(struct x_connection *c) {
xcb_window_t target = XCB_NONE;
int buttons_pressed = 0;
while ((target == XCB_NONE) || (buttons_pressed > 0)) {
XCB_AWAIT_VOID(xcb_allow_events, c->c, XCB_ALLOW_ASYNC_POINTER,
XCB_CURRENT_TIME);
XCB_AWAIT_VOID(xcb_allow_events, c, XCB_ALLOW_ASYNC_POINTER, XCB_CURRENT_TIME);
xcb_generic_event_t *ev = xcb_wait_for_event(c->c);
if (!ev) {
log_fatal("Connection to X server lost");
@ -74,7 +73,7 @@ xcb_window_t inspect_select_window(struct x_connection *c) {
}
free(ev);
}
XCB_AWAIT_VOID(xcb_ungrab_pointer, c->c, XCB_CURRENT_TIME);
XCB_AWAIT_VOID(xcb_ungrab_pointer, c, XCB_CURRENT_TIME);
return target;
}

36
src/picom.c
View file

@ -601,7 +601,7 @@ err:
void configure_root(session_t *ps) {
// TODO(yshui) re-initializing backend should be done outside of the
// critical section. Probably set a flag and do it in draw_callback_impl.
auto r = XCB_AWAIT(xcb_get_geometry, ps->c.c, ps->c.screen_info->root);
auto r = XCB_AWAIT(xcb_get_geometry, &ps->c, ps->c.screen_info->root);
if (!r) {
log_fatal("Failed to fetch root geometry");
abort();
@ -949,7 +949,7 @@ static int register_cm(session_t *ps) {
prop_is_utf8[i] ? ps->atoms->aUTF8_STRING : XCB_ATOM_STRING,
8, strlen("picom"), "picom"));
if (e) {
log_error_x_error(e, "Failed to set window property %d",
log_error_x_error(&ps->c, e, "Failed to set window property %d",
prop_atoms[i]);
free(e);
}
@ -961,7 +961,7 @@ static int register_cm(session_t *ps) {
ps->atoms->aWM_CLASS, XCB_ATOM_STRING, 8,
ARR_SIZE(picom_class), picom_class));
if (e) {
log_error_x_error(e, "Failed to set the WM_CLASS property");
log_error_x_error(&ps->c, e, "Failed to set the WM_CLASS property");
free(e);
}
@ -978,8 +978,9 @@ static int register_cm(session_t *ps) {
ps->atoms->aWM_CLIENT_MACHINE, XCB_ATOM_STRING,
8, (uint32_t)strlen(hostname), hostname));
if (e) {
log_error_x_error(e, "Failed to set the WM_CLIENT_MACHINE"
" property");
log_error_x_error(&ps->c, e,
"Failed to set the WM_CLIENT_MACHINE"
" property");
free(e);
}
} else {
@ -1002,7 +1003,7 @@ static int register_cm(session_t *ps) {
ps->atoms->aCOMPTON_VERSION, XCB_ATOM_STRING, 8,
(uint32_t)strlen(PICOM_VERSION), PICOM_VERSION));
if (e) {
log_error_x_error(e, "Failed to set COMPTON_VERSION.");
log_error_x_error(&ps->c, e, "Failed to set COMPTON_VERSION.");
free(e);
}
@ -1066,13 +1067,13 @@ static bool init_overlay(session_t *ps) {
if (ps->overlay != XCB_NONE) {
// Set window region of the overlay window, code stolen from
// compiz-0.8.8
if (!XCB_AWAIT_VOID(xcb_shape_mask, ps->c.c, XCB_SHAPE_SO_SET,
if (!XCB_AWAIT_VOID(xcb_shape_mask, &ps->c, XCB_SHAPE_SO_SET,
XCB_SHAPE_SK_BOUNDING, ps->overlay, 0, 0, 0)) {
log_fatal("Failed to set the bounding shape of overlay, giving "
"up.");
return false;
}
if (!XCB_AWAIT_VOID(xcb_shape_rectangles, ps->c.c, XCB_SHAPE_SO_SET,
if (!XCB_AWAIT_VOID(xcb_shape_rectangles, &ps->c, XCB_SHAPE_SO_SET,
XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED,
ps->overlay, 0, 0, 0, NULL)) {
log_fatal("Failed to set the input shape of overlay, giving up.");
@ -1088,7 +1089,7 @@ static bool init_overlay(session_t *ps) {
// root_damage = XDamageCreate(ps->dpy, root, XDamageReportNonEmpty);
// Unmap the overlay, we will map it when needed in redirect_start
XCB_AWAIT_VOID(xcb_unmap_window, ps->c.c, ps->overlay);
XCB_AWAIT_VOID(xcb_unmap_window, &ps->c, ps->overlay);
} else {
log_error("Cannot get X Composite overlay window. Falling "
"back to painting on root window.");
@ -1174,7 +1175,7 @@ static bool redirect_start(session_t *ps) {
xcb_map_window(ps->c.c, ps->overlay);
}
bool success = XCB_AWAIT_VOID(xcb_composite_redirect_subwindows, ps->c.c,
bool success = XCB_AWAIT_VOID(xcb_composite_redirect_subwindows, &ps->c,
ps->c.screen_info->root, session_redirection_mode(ps));
if (!success) {
log_fatal("Another composite manager is already running "
@ -2010,7 +2011,7 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
}
ps->x_region = x_new_id(&ps->c);
if (!XCB_AWAIT_VOID(xcb_xfixes_create_region, ps->c.c, ps->x_region, 0, NULL)) {
if (!XCB_AWAIT_VOID(xcb_xfixes_create_region, &ps->c, ps->x_region, 0, NULL)) {
log_fatal("Failed to create a XFixes region");
goto err;
}
@ -2109,9 +2110,10 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
ps->c.c, ps->c.screen_info->root, ps->sync_fence, 0));
if (e) {
if (ps->o.xrender_sync_fence) {
log_error_x_error(e, "Failed to create a XSync fence. "
"xrender-sync-fence will be "
"disabled");
log_error_x_error(&ps->c, e,
"Failed to create a XSync fence. "
"xrender-sync-fence will be "
"disabled");
ps->o.xrender_sync_fence = false;
}
ps->sync_fence = XCB_NONE;
@ -2236,14 +2238,14 @@ 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_x_error(e, "Failed to setup root window event mask");
log_error_x_error(&ps->c, e, "Failed to setup root window event mask");
free(e);
goto err;
}
// Query the size of the root window. We need the size information before any
// window can be managed.
auto r = XCB_AWAIT(xcb_get_geometry, ps->c.c, ps->c.screen_info->root);
auto r = XCB_AWAIT(xcb_get_geometry, &ps->c, ps->c.screen_info->root);
if (!r) {
log_fatal("Failed to get geometry of the root window");
goto err;
@ -2277,7 +2279,7 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
// release it.
auto get_overlay =
xcb_composite_get_overlay_window(ps->c.c, ps->c.screen_info->root);
XCB_AWAIT_VOID(xcb_composite_release_overlay_window, ps->c.c,
XCB_AWAIT_VOID(xcb_composite_release_overlay_window, &ps->c,
ps->c.screen_info->root);
auto overlay_reply =
xcb_composite_get_overlay_window_reply(ps->c.c, get_overlay, NULL);

32
src/utils/ui.c
View file

@ -23,7 +23,7 @@ ui_message_box_draw_text(struct ui *ui, struct x_connection *c, xcb_window_t win
content->size.width > UINT16_MAX ? UINT16_MAX : (uint16_t)content->size.width;
uint16_t height =
content->size.height > UINT16_MAX ? UINT16_MAX : (uint16_t)content->size.height;
if (!XCB_AWAIT_VOID(xcb_create_pixmap, c->c, c->screen_info->root_depth, pixmap,
if (!XCB_AWAIT_VOID(xcb_create_pixmap, c, c->screen_info->root_depth, pixmap,
window, width, height)) {
return XCB_NONE;
}
@ -34,7 +34,7 @@ ui_message_box_draw_text(struct ui *ui, struct x_connection *c, xcb_window_t win
uint32_t value_list[3] = {c->screen_info->black_pixel,
c->screen_info->black_pixel};
if (!XCB_AWAIT_VOID(xcb_create_gc, c->c, gc, pixmap, mask, value_list)) {
if (!XCB_AWAIT_VOID(xcb_create_gc, c, gc, pixmap, mask, value_list)) {
return XCB_NONE;
}
}
@ -45,14 +45,14 @@ ui_message_box_draw_text(struct ui *ui, struct x_connection *c, xcb_window_t win
const char yellow_name[] = "yellow";
const char red_name[] = "red";
auto r = XCB_AWAIT(xcb_alloc_named_color, c->c, c->screen_info->default_colormap,
auto r = XCB_AWAIT(xcb_alloc_named_color, c, c->screen_info->default_colormap,
ARR_SIZE(yellow_name) - 1, yellow_name);
if (r == NULL) {
return XCB_NONE;
}
auto yellow_pixel = r->pixel;
free(r);
r = XCB_AWAIT(xcb_alloc_named_color, c->c, c->screen_info->default_colormap,
r = XCB_AWAIT(xcb_alloc_named_color, c, c->screen_info->default_colormap,
ARR_SIZE(red_name) - 1, red_name);
if (r == NULL) {
return XCB_NONE;
@ -85,12 +85,11 @@ ui_message_box_draw_text(struct ui *ui, struct x_connection *c, xcb_window_t win
void ui_message_box_place(struct x_connection *c, struct ui_message_box_content *content,
int16_t *x, int16_t *y) {
auto r =
XCB_AWAIT(xcb_randr_get_screen_resources_current, c->c, c->screen_info->root);
auto r = XCB_AWAIT(xcb_randr_get_screen_resources_current, c, c->screen_info->root);
if (r == NULL) {
return;
}
auto pointer = XCB_AWAIT(xcb_query_pointer, c->c, c->screen_info->root);
auto pointer = XCB_AWAIT(xcb_query_pointer, c, c->screen_info->root);
if (pointer == NULL) {
free(r);
return;
@ -100,7 +99,7 @@ void ui_message_box_place(struct x_connection *c, struct ui_message_box_content
auto crtcs = xcb_randr_get_screen_resources_current_crtcs(r);
for (int i = 0; i < num_crtc; i++) {
auto crtc_info_ptr =
XCB_AWAIT(xcb_randr_get_crtc_info, c->c, crtcs[i], r->config_timestamp);
XCB_AWAIT(xcb_randr_get_crtc_info, c, crtcs[i], r->config_timestamp);
if (crtc_info_ptr == NULL ||
crtc_info_ptr->status != XCB_RANDR_SET_CONFIG_SUCCESS) {
free(crtc_info_ptr);
@ -166,7 +165,7 @@ bool ui_message_box_show(struct ui *ui, struct x_connection *c,
XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_POINTER_MOTION |
XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW};
bool success = XCB_AWAIT_VOID(xcb_create_window, c->c, c->screen_info->root_depth,
bool success = XCB_AWAIT_VOID(xcb_create_window, c, c->screen_info->root_depth,
win, c->screen_info->root, x, y, width, height,
/*border_width=*/0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
c->screen_info->root_visual, mask, values);
@ -187,17 +186,17 @@ bool ui_message_box_show(struct ui *ui, struct x_connection *c,
.matrix22 = DOUBLE_TO_XFIXED(1.0F / content->scale),
.matrix33 = DOUBLE_TO_XFIXED(1.0),
};
if (!XCB_AWAIT_VOID(xcb_render_set_picture_transform, c->c, content_picture, transform)) {
if (!XCB_AWAIT_VOID(xcb_render_set_picture_transform, c, content_picture, transform)) {
return false;
}
const char filter_name[] = "bilinear";
if (!XCB_AWAIT_VOID(xcb_render_set_picture_filter, c->c, content_picture,
if (!XCB_AWAIT_VOID(xcb_render_set_picture_filter, c, content_picture,
ARR_SIZE(filter_name) - 1, filter_name, 0, NULL)) {
return false;
}
if (!XCB_AWAIT_VOID(xcb_map_window, c->c, win)) {
if (!XCB_AWAIT_VOID(xcb_map_window, c, win)) {
xcb_destroy_window(c->c, win);
return false;
}
@ -304,7 +303,7 @@ static bool ui_message_box_line_extent(struct ui *ui, struct x_connection *c,
text16[i].byte1 = 0;
text16[i].byte2 = (uint8_t)line->text[i];
}
auto r = XCB_AWAIT(xcb_query_text_extents, c->c, font, len, text16);
auto r = XCB_AWAIT(xcb_query_text_extents, c, font, len, text16);
free(text16);
if (!r) {
@ -367,15 +366,16 @@ struct ui *ui_new(struct x_connection *c) {
xcb_generic_error_t *e = xcb_request_check(c->c, cookie1);
if (e != NULL) {
log_error_x_error(e, "Cannot open the fixed font");
log_error_x_error(c, e, "Cannot open the fixed font");
free(e);
return NULL;
}
e = xcb_request_check(c->c, cookie2);
if (e != NULL) {
ui->bold_font = ui->normal_font;
log_error_x_error(e, "Cannot open the bold font, falling back to normal "
"font");
log_error_x_error(c, e,
"Cannot open the bold font, falling back to normal "
"font");
free(e);
}
return ui;

14
src/wm/win.c
View file

@ -501,7 +501,7 @@ void win_process_image_flags(session_t *ps, struct win *w) {
if (e != NULL) {
log_debug("Failed to get named pixmap for window %#010x(%s): %s. "
"Retaining its current window image",
win_id(w), w->name, x_strerror(e));
win_id(w), w->name, x_strerror(&ps->c, e));
free(e);
return;
}
@ -1180,7 +1180,7 @@ void win_on_client_update(session_t *ps, struct win *w) {
// Update everything related to conditions
win_set_flags(w, WIN_FLAGS_FACTOR_CHANGED);
auto r = XCB_AWAIT(xcb_get_window_attributes, ps->c.c, client_win_id);
auto r = XCB_AWAIT(xcb_get_window_attributes, &ps->c, client_win_id);
if (!r) {
return;
}
@ -1268,7 +1268,8 @@ struct win *win_maybe_allocate(session_t *ps, struct wm_ref *cursor,
xcb_generic_error_t *e;
auto g = xcb_get_geometry_reply(ps->c.c, xcb_get_geometry(ps->c.c, wid), &e);
if (!g) {
log_debug("Failed to get geometry of window %#010x: %s", wid, x_strerror(e));
log_debug("Failed to get geometry of window %#010x: %s", wid,
x_strerror(&ps->c, e));
free(e);
free(new);
return NULL;
@ -1289,7 +1290,8 @@ struct win *win_maybe_allocate(session_t *ps, struct wm_ref *cursor,
ps->c.c, xcb_damage_create_checked(ps->c.c, new->damage, wid,
XCB_DAMAGE_REPORT_LEVEL_NON_EMPTY));
if (e) {
log_debug("Failed to create damage for window %#010x: %s", wid, x_strerror(e));
log_debug("Failed to create damage for window %#010x: %s", wid,
x_strerror(&ps->c, e));
free(e);
free(new);
return NULL;
@ -1981,7 +1983,7 @@ struct win_get_geometry_request {
xcb_window_t wid;
};
static void win_handle_get_geometry_reply(struct x_connection * /*c*/,
static void win_handle_get_geometry_reply(struct x_connection *c,
struct x_async_request_base *req_base,
const xcb_raw_generic_event_t *reply_or_error) {
auto req = (struct win_get_geometry_request *)req_base;
@ -1996,7 +1998,7 @@ static void win_handle_get_geometry_reply(struct x_connection * /*c*/,
if (reply_or_error->response_type == 0) {
log_debug("Failed to get geometry of window %#010x: %s", wid,
x_strerror((xcb_generic_error_t *)reply_or_error));
x_strerror(c, (xcb_generic_error_t *)reply_or_error));
return;
}

12
src/wm/wm.c
View file

@ -560,7 +560,7 @@ wm_handle_query_tree_reply(struct x_connection *c, struct x_async_request_base *
// be impossible.
xcb_generic_error_t *err = (xcb_generic_error_t *)reply_or_error;
log_error("Query tree request for window %#010x failed with error %s.",
node == NULL ? 0 : node->id.x, x_strerror(err));
node == NULL ? 0 : node->id.x, x_strerror(c, err));
BUG_ON(false);
}
@ -585,9 +585,9 @@ wm_handle_query_tree_reply(struct x_connection *c, struct x_async_request_base *
}
}
static void wm_handle_get_wm_state_reply(struct x_connection * /*c*/,
struct x_async_request_base *base,
const xcb_raw_generic_event_t *reply_or_error) {
static void
wm_handle_get_wm_state_reply(struct x_connection *c, struct x_async_request_base *base,
const xcb_raw_generic_event_t *reply_or_error) {
auto req = (struct wm_get_property_request *)base;
if (reply_or_error == NULL) {
free(req);
@ -605,7 +605,7 @@ static void wm_handle_get_wm_state_reply(struct x_connection * /*c*/,
xcb_generic_error_t *err = (xcb_generic_error_t *)reply_or_error;
log_debug("Get WM_STATE request for window %#010x failed with "
"error %s",
req->wid, x_strerror(err));
req->wid, x_strerror(c, err));
free(req);
return;
}
@ -646,7 +646,7 @@ wm_handle_set_event_mask_reply(struct x_connection *c, struct x_async_request_ba
if (reply_or_error->response_type == 0) {
log_debug("Failed to set event mask for window %#010x: %s, ignoring this "
"window.",
wid, x_strerror((const xcb_generic_error_t *)reply_or_error));
wid, x_strerror(c, (const xcb_generic_error_t *)reply_or_error));
goto end_import;
}

70
src/x.c
View file

@ -51,10 +51,8 @@ enum {
///
/// @return a pointer to a string. this pointer shouldn NOT be freed, same buffer is used
/// for multiple calls to this function,
static const char *x_error_code_to_string(unsigned long serial, uint8_t major,
uint16_t minor, uint8_t error_code) {
session_t *const ps = ps_g;
static const char *x_error_code_to_string(struct x_connection *c, unsigned long serial,
uint8_t major, uint16_t minor, uint8_t error_code) {
int o = 0;
const char *name = "Unknown";
@ -64,13 +62,13 @@ static const char *x_error_code_to_string(unsigned long serial, uint8_t major,
#define CASESTRRET2(s) \
case XCB_##s: name = #s; break
o = error_code - ps->c.e.fixes_error;
o = error_code - c->e.fixes_error;
switch (o) { CASESTRRET2(XFIXES_BAD_REGION); }
o = error_code - ps->c.e.damage_error;
o = error_code - c->e.damage_error;
switch (o) { CASESTRRET2(DAMAGE_BAD_DAMAGE); }
o = error_code - ps->c.e.render_error;
o = error_code - c->e.render_error;
switch (o) {
CASESTRRET2(RENDER_PICT_FORMAT);
CASESTRRET2(RENDER_PICTURE);
@ -79,8 +77,8 @@ static const char *x_error_code_to_string(unsigned long serial, uint8_t major,
CASESTRRET2(RENDER_GLYPH);
}
if (ps->c.e.has_glx) {
o = error_code - ps->c.e.glx_error;
if (c->e.has_glx) {
o = error_code - c->e.glx_error;
switch (o) {
CASESTRRET2(GLX_BAD_CONTEXT);
CASESTRRET2(GLX_BAD_CONTEXT_STATE);
@ -99,8 +97,8 @@ static const char *x_error_code_to_string(unsigned long serial, uint8_t major,
}
}
if (ps->c.e.has_sync) {
o = error_code - ps->c.e.sync_error;
if (c->e.has_sync) {
o = error_code - c->e.sync_error;
switch (o) {
CASESTRRET(XSyncBadCounter);
CASESTRRET(XSyncBadAlarm);
@ -137,11 +135,11 @@ static const char *x_error_code_to_string(unsigned long serial, uint8_t major,
return buffer;
}
void x_print_error_impl(unsigned long serial, uint8_t major, uint16_t minor,
uint8_t error_code, const char *func) {
void x_print_error_impl(struct x_connection *c, unsigned long serial, uint8_t major,
uint16_t minor, uint8_t error_code, const char *func) {
if (unlikely(LOG_LEVEL_DEBUG >= log_get_level_tls())) {
log_printf(tls_logger, LOG_LEVEL_DEBUG, func, "%s",
x_error_code_to_string(serial, major, minor, error_code));
x_error_code_to_string(c, serial, major, minor, error_code));
}
}
@ -153,9 +151,9 @@ struct x_generic_async_request {
int line;
};
static void x_generic_async_callback(struct x_connection * /*c*/,
struct x_async_request_base *req_base,
const xcb_raw_generic_event_t *reply_or_error) {
static void
x_generic_async_callback(struct x_connection *c, struct x_async_request_base *req_base,
const xcb_raw_generic_event_t *reply_or_error) {
auto req = (struct x_generic_async_request *)req_base;
auto error_action = req->error_action;
auto func = req->func == NULL ? "(unknown)" : req->func;
@ -170,11 +168,11 @@ static void x_generic_async_callback(struct x_connection * /*c*/,
auto error = (xcb_generic_error_t *)reply_or_error;
if (error_action != PENDING_REPLY_ACTION_IGNORE) {
log_error("X error for request in %s at %s:%d: %s", func, file, line,
x_error_code_to_string(error->full_sequence, error->major_code,
x_error_code_to_string(c, error->full_sequence, error->major_code,
error->minor_code, error->error_code));
} else {
log_debug("Expected X error for request in %s at %s:%d: %s", func, file, line,
x_error_code_to_string(error->full_sequence, error->major_code,
x_error_code_to_string(c, error->full_sequence, error->major_code,
error->minor_code, error->error_code));
}
switch (error_action) {
@ -460,7 +458,7 @@ bool wid_get_text_prop(struct x_connection *c, struct atom *atoms, xcb_window_t
auto r = xcb_get_property_reply(
c->c, xcb_get_property(c->c, 0, wid, prop, XCB_ATOM_ANY, 0, UINT_MAX), &e);
if (!r) {
log_debug_x_error(e, "Failed to get window property for %#010x", wid);
log_debug_x_error(c, e, "Failed to get window property for %#010x", wid);
free(e);
return false;
}
@ -645,7 +643,7 @@ x_create_picture_with_pictfmt_and_pixmap(struct x_connection *c, xcb_render_pict
c->c, tmp_picture, pixmap, pictfmt, valuemask, buf));
free(buf);
if (e) {
log_error_x_error(e, "failed to create picture");
log_error_x_error(c, e, "failed to create picture");
free(e);
abort();
return XCB_NONE;
@ -719,7 +717,7 @@ bool x_fetch_region(struct x_connection *c, xcb_xfixes_region_t r, pixman_region
xcb_xfixes_fetch_region_reply_t *xr =
xcb_xfixes_fetch_region_reply(c->c, xcb_xfixes_fetch_region(c->c, r), &e);
if (!xr) {
log_error_x_error(e, "Failed to fetch rectangles");
log_error_x_error(c, e, "Failed to fetch rectangles");
return false;
}
@ -759,7 +757,7 @@ bool x_set_region(struct x_connection *c, xcb_xfixes_region_t dst, const region_
}
bool success =
XCB_AWAIT_VOID(xcb_xfixes_set_region, c->c, dst, to_u32_checked(nrects), xrects);
XCB_AWAIT_VOID(xcb_xfixes_set_region, c, dst, to_u32_checked(nrects), xrects);
free(xrects);
@ -786,8 +784,8 @@ uint32_t x_create_region(struct x_connection *c, const region_t *reg) {
}
xcb_xfixes_region_t ret = x_new_id(c);
bool success = XCB_AWAIT_VOID(xcb_xfixes_create_region, c->c, ret,
to_u32_checked(nrects), xrects);
bool success =
XCB_AWAIT_VOID(xcb_xfixes_create_region, c, ret, to_u32_checked(nrects), xrects);
free(xrects);
if (!success) {
return XCB_NONE;
@ -843,7 +841,7 @@ void x_set_picture_clip_region(struct x_connection *c, xcb_render_picture_t pict
c->c, pict, clip_x_origin, clip_y_origin,
to_u32_checked(nrects), xrects));
if (e) {
log_error_x_error(e, "Failed to set clip region");
log_error_x_error(c, e, "Failed to set clip region");
free(e);
}
free(xrects);
@ -855,7 +853,7 @@ void x_clear_picture_clip_region(struct x_connection *c, xcb_render_picture_t pi
xcb_generic_error_t *e = xcb_request_check(
c->c, xcb_render_change_picture_checked(c->c, pict, XCB_RENDER_CP_CLIP_MASK, &v));
if (e) {
log_error_x_error(e, "failed to clear clip region");
log_error_x_error(c, e, "failed to clear clip region");
free(e);
}
}
@ -877,11 +875,11 @@ void x_free_picture(struct x_connection *c, xcb_render_picture_t p) {
* @return a pointer to a string. this pointer shouldn NOT be freed, same buffer is used
* for multiple calls to this function,
*/
const char *x_strerror(const xcb_generic_error_t *e) {
const char *x_strerror(struct x_connection *c, const xcb_generic_error_t *e) {
if (!e) {
return "No error";
}
return x_error_code_to_string(e->full_sequence, e->major_code, e->minor_code,
return x_error_code_to_string(c, e->full_sequence, e->major_code, e->minor_code,
e->error_code);
}
@ -902,7 +900,7 @@ xcb_pixmap_t x_create_pixmap(struct x_connection *c, uint8_t depth, int width, i
return pix;
}
log_error_x_error(err, "Failed to create pixmap");
log_error_x_error(c, err, "Failed to create pixmap");
free(err);
return XCB_NONE;
}
@ -954,19 +952,19 @@ bool x_fence_sync(struct x_connection *c, xcb_sync_fence_t f) {
auto e = xcb_request_check(c->c, xcb_sync_trigger_fence_checked(c->c, f));
if (e) {
log_error_x_error(e, "Failed to trigger the fence");
log_error_x_error(c, e, "Failed to trigger the fence");
goto err;
}
e = xcb_request_check(c->c, xcb_sync_await_fence_checked(c->c, 1, &f));
if (e) {
log_error_x_error(e, "Failed to await on a fence");
log_error_x_error(c, e, "Failed to await on a fence");
goto err;
}
e = xcb_request_check(c->c, xcb_sync_reset_fence_checked(c->c, f));
if (e) {
log_error_x_error(e, "Failed to reset the fence");
log_error_x_error(c, e, "Failed to reset the fence");
goto err;
}
return true;
@ -1071,7 +1069,7 @@ struct x_update_monitors_request {
struct x_monitors *monitors;
};
static void x_handle_update_monitors_reply(struct x_connection * /*c*/,
static void x_handle_update_monitors_reply(struct x_connection *c,
struct x_async_request_base *req_base,
const xcb_raw_generic_event_t *reply_or_error) {
auto m = ((struct x_update_monitors_request *)req_base)->monitors;
@ -1084,7 +1082,7 @@ static void x_handle_update_monitors_reply(struct x_connection * /*c*/,
if (reply_or_error->response_type == 0) {
log_warn("Failed to get monitor information using RandR: %s",
x_strerror((xcb_generic_error_t *)reply_or_error));
x_strerror(c, (xcb_generic_error_t *)reply_or_error));
return;
}
@ -1188,7 +1186,7 @@ static bool x_feed_event(struct x_connection *c, xcb_generic_event_t *e) {
head->callback(c, head, (xcb_raw_generic_event_t *)e);
} else {
log_warn("Stray X error: %s",
x_error_code_to_string(error->full_sequence, error->major_code,
x_error_code_to_string(c, error->full_sequence, error->major_code,
error->minor_code, error->error_code));
}
return false;

56
src/x.h
View file

@ -132,38 +132,40 @@ struct x_monitors {
region_t *regions;
};
#define XCB_AWAIT_VOID(func, c, ...) \
/* NOLINTBEGIN(bugprone-assignment-in-if-condition) */ \
({ \
bool __success = true; \
__auto_type __e = xcb_request_check(c, func##_checked(c, __VA_ARGS__)); \
if (__e) { \
x_print_error(__e->sequence, __e->major_code, __e->minor_code, \
__e->error_code); \
free(__e); \
__success = false; \
} \
__success; \
#define XCB_AWAIT_VOID(func, conn, ...) \
/* NOLINTBEGIN(bugprone-assignment-in-if-condition) */ \
({ \
bool __success = true; \
__auto_type __e = \
xcb_request_check((conn)->c, func##_checked((conn)->c, __VA_ARGS__)); \
if (__e) { \
x_print_error(conn, __e->sequence, __e->major_code, \
__e->minor_code, __e->error_code); \
free(__e); \
__success = false; \
} \
__success; \
}) /* NOLINTEND(bugprone-assignment-in-if-condition) */
#define XCB_AWAIT(func, c, ...) \
#define XCB_AWAIT(func, conn, ...) \
({ \
xcb_generic_error_t *__e = NULL; \
__auto_type __r = func##_reply(c, func(c, __VA_ARGS__), &__e); \
__auto_type __r = \
func##_reply((conn)->c, func((conn)->c, __VA_ARGS__), &__e); \
if (__e) { \
x_print_error(__e->sequence, __e->major_code, __e->minor_code, \
__e->error_code); \
x_print_error(conn, __e->sequence, __e->major_code, \
__e->minor_code, __e->error_code); \
free(__e); \
} \
__r; \
})
#define log_debug_x_error(e, fmt, ...) \
LOG(DEBUG, fmt " (%s)", ##__VA_ARGS__, x_strerror(e))
#define log_error_x_error(e, fmt, ...) \
LOG(ERROR, fmt " (%s)", ##__VA_ARGS__, x_strerror(e))
#define log_fatal_x_error(e, fmt, ...) \
LOG(FATAL, fmt " (%s)", ##__VA_ARGS__, x_strerror(e))
#define log_debug_x_error(c, e, fmt, ...) \
LOG(DEBUG, fmt " (%s)", ##__VA_ARGS__, x_strerror(c, e))
#define log_error_x_error(c, e, fmt, ...) \
LOG(ERROR, fmt " (%s)", ##__VA_ARGS__, x_strerror(c, e))
#define log_fatal_x_error(c, e, fmt, ...) \
LOG(FATAL, fmt " (%s)", ##__VA_ARGS__, x_strerror(c, e))
// xcb-render specific macros
#define XFIXED_TO_DOUBLE(value) (((double)(value)) / 65536)
@ -377,10 +379,10 @@ void x_free_picture(struct x_connection *c, xcb_render_picture_t p);
/**
* Log a X11 error
*/
void x_print_error_impl(unsigned long serial, uint8_t major, uint16_t minor,
uint8_t error_code, const char *func);
#define x_print_error(serial, major, minor, error_code) \
x_print_error_impl(serial, major, minor, error_code, __func__)
void x_print_error_impl(struct x_connection *c, unsigned long serial, uint8_t major,
uint16_t minor, uint8_t error_code, const char *func);
#define x_print_error(c, serial, major, minor, error_code) \
x_print_error_impl(c, serial, major, minor, error_code, __func__)
/*
* Convert a xcb_generic_error_t to a string that describes the error
@ -388,7 +390,7 @@ void x_print_error_impl(unsigned long serial, uint8_t major, uint16_t minor,
* @return a pointer to a string. this pointer shouldn NOT be freed, same buffer is used
* for multiple calls to this function,
*/
const char *x_strerror(const xcb_generic_error_t *e);
const char *x_strerror(struct x_connection *c, const xcb_generic_error_t *e);
void x_flush(struct x_connection *c);