mirror of
https://github.com/i3/i3.git
synced 2025-10-30 03:42:37 +00:00
Share graphics context globally (#4376)
Instead of creating a graphics context for every surface_t, this commit adds a cache that allows to "remember" up to two GCs. Thus, the code uses less GCs. When a GC from the cache can be used, this also gets rid of a round-trip to the X11 server. Both of these are tiny, insignificant savings, but so what? Since GCs are per-depth, this code needs access to get_visual_depth(). To avoid a code duplication, this function is moved to libi3. Fixes: https://github.com/i3/i3/issues/3478 Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
parent
6fe98f7847
commit
d6e2a38b5c
@ -572,6 +572,7 @@ typedef struct surface_t {
|
||||
|
||||
/* A classic XCB graphics context. */
|
||||
xcb_gcontext_t gc;
|
||||
bool owns_gc;
|
||||
|
||||
int width;
|
||||
int height;
|
||||
@ -686,3 +687,9 @@ bool is_background_set(xcb_connection_t *conn, xcb_screen_t *screen);
|
||||
*
|
||||
*/
|
||||
bool boolstr(const char *str);
|
||||
|
||||
/**
|
||||
* Get depth of visual specified by visualid
|
||||
*
|
||||
*/
|
||||
uint16_t get_visual_depth(xcb_visualid_t visual_id);
|
||||
|
||||
@ -98,12 +98,6 @@ xcb_atom_t xcb_get_preferred_window_type(xcb_get_property_reply_t *reply);
|
||||
*/
|
||||
bool xcb_reply_contains_atom(xcb_get_property_reply_t *prop, xcb_atom_t atom);
|
||||
|
||||
/**
|
||||
* Get depth of visual specified by visualid
|
||||
*
|
||||
*/
|
||||
uint16_t get_visual_depth(xcb_visualid_t visual_id);
|
||||
|
||||
/**
|
||||
* Get visual type specified by visualid
|
||||
*
|
||||
|
||||
@ -28,6 +28,78 @@ static bool surface_initialized(surface_t *surface) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get a GC for the given depth. The given drawable must have this depth.
|
||||
*
|
||||
* Per the X11 protocol manual for "CreateGC":
|
||||
* > The gcontext can be used with any destination drawable having the same root
|
||||
* > and depth as the specified drawable;
|
||||
*/
|
||||
static xcb_gcontext_t get_gc(xcb_connection_t *conn, uint8_t depth, xcb_drawable_t drawable, bool *should_free) {
|
||||
static struct {
|
||||
uint8_t depth;
|
||||
xcb_gcontext_t gc;
|
||||
} gc_cache[2] = {
|
||||
0,
|
||||
};
|
||||
|
||||
size_t index = 0;
|
||||
bool cache = false;
|
||||
|
||||
*should_free = false;
|
||||
for (; index < sizeof(gc_cache) / sizeof(gc_cache[0]); index++) {
|
||||
if (gc_cache[index].depth == depth) {
|
||||
return gc_cache[index].gc;
|
||||
}
|
||||
if (gc_cache[index].depth == 0) {
|
||||
cache = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
xcb_gcontext_t gc = xcb_generate_id(conn);
|
||||
/* The drawable is only used to get the root and depth, thus the GC is not
|
||||
* tied to the drawable and it can be re-used with different drawables. */
|
||||
xcb_void_cookie_t gc_cookie = xcb_create_gc_checked(conn, gc, drawable, 0, NULL);
|
||||
|
||||
xcb_generic_error_t *error = xcb_request_check(conn, gc_cookie);
|
||||
if (error != NULL) {
|
||||
ELOG("Could not create graphical context. Error code: %d. Please report this bug.\n", error->error_code);
|
||||
free(error);
|
||||
return gc;
|
||||
}
|
||||
|
||||
if (cache) {
|
||||
gc_cache[index].depth = depth;
|
||||
gc_cache[index].gc = gc;
|
||||
} else {
|
||||
*should_free = true;
|
||||
}
|
||||
|
||||
return gc;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get depth of visual specified by visualid
|
||||
*
|
||||
*/
|
||||
uint16_t get_visual_depth(xcb_visualid_t visual_id) {
|
||||
xcb_depth_iterator_t depth_iter;
|
||||
|
||||
depth_iter = xcb_screen_allowed_depths_iterator(root_screen);
|
||||
for (; depth_iter.rem; xcb_depth_next(&depth_iter)) {
|
||||
xcb_visualtype_iterator_t visual_iter;
|
||||
|
||||
visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
|
||||
for (; visual_iter.rem; xcb_visualtype_next(&visual_iter)) {
|
||||
if (visual_id == visual_iter.data->visual_id) {
|
||||
return depth_iter.data->depth;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize the surface to represent the given drawable.
|
||||
*
|
||||
@ -41,15 +113,7 @@ void draw_util_surface_init(xcb_connection_t *conn, surface_t *surface, xcb_draw
|
||||
if (visual == NULL)
|
||||
visual = visual_type;
|
||||
|
||||
surface->gc = xcb_generate_id(conn);
|
||||
xcb_void_cookie_t gc_cookie = xcb_create_gc_checked(conn, surface->gc, surface->id, 0, NULL);
|
||||
|
||||
xcb_generic_error_t *error = xcb_request_check(conn, gc_cookie);
|
||||
if (error != NULL) {
|
||||
ELOG("Could not create graphical context. Error code: %d. Please report this bug.\n", error->error_code);
|
||||
free(error);
|
||||
}
|
||||
|
||||
surface->gc = get_gc(conn, get_visual_depth(visual->visual_id), drawable, &surface->owns_gc);
|
||||
surface->surface = cairo_xcb_surface_create(conn, surface->id, visual, width, height);
|
||||
surface->cr = cairo_create(surface->surface);
|
||||
}
|
||||
@ -68,11 +132,9 @@ void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) {
|
||||
status, cairo_status_to_string(status));
|
||||
}
|
||||
|
||||
/* NOTE: This function is also called on uninitialised surface_t instances.
|
||||
* The x11 error from xcb_free_gc(conn, XCB_NONE) is silently ignored
|
||||
* elsewhere.
|
||||
*/
|
||||
xcb_free_gc(conn, surface->gc);
|
||||
if (surface->owns_gc) {
|
||||
xcb_free_gc(conn, surface->gc);
|
||||
}
|
||||
cairo_surface_destroy(surface->surface);
|
||||
cairo_destroy(surface->cr);
|
||||
|
||||
|
||||
21
src/xcb.c
21
src/xcb.c
@ -163,27 +163,6 @@ bool xcb_reply_contains_atom(xcb_get_property_reply_t *prop, xcb_atom_t atom) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get depth of visual specified by visualid
|
||||
*
|
||||
*/
|
||||
uint16_t get_visual_depth(xcb_visualid_t visual_id) {
|
||||
xcb_depth_iterator_t depth_iter;
|
||||
|
||||
depth_iter = xcb_screen_allowed_depths_iterator(root_screen);
|
||||
for (; depth_iter.rem; xcb_depth_next(&depth_iter)) {
|
||||
xcb_visualtype_iterator_t visual_iter;
|
||||
|
||||
visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
|
||||
for (; visual_iter.rem; xcb_visualtype_next(&visual_iter)) {
|
||||
if (visual_id == visual_iter.data->visual_id) {
|
||||
return depth_iter.data->depth;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get visual type specified by visualid
|
||||
*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user