nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extract cairo_clear_surface. 

This commit refactors the i3bar drawing code to also define an abstraction
function for clearing a surface. This is needed to fully abstract i3bar/xcb.c's
drawing code so that we can introduce a switch to easily exchange the
underlying drawing mechanism.
This commit is contained in:
Ingo Bürk 2015-10-14 19:03:05 +02:00
parent 8178910f16
commit 46bcc55f6f
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
i3bar/include/cairo_util.h
View File

@ -89,6 +89,13 @@ void cairo_draw_text(i3String *text, surface_t *surface, color_t fg_color, color
*/ */
void cairo_draw_rectangle(surface_t *surface, color_t color, double x, double y, double w, double h); void cairo_draw_rectangle(surface_t *surface, color_t color, double x, double y, double w, double h);
/**
* Clears a surface with the given color.
* Note that the drawing is done using CAIRO_OPERATOR_SOURCE.
*
*/
void cairo_clear_surface(surface_t *surface, color_t color);
/** /**
* Copies a surface onto another surface. * Copies a surface onto another surface.
* Note that the drawing is done using CAIRO_OPERATOR_SOURCE. * Note that the drawing is done using CAIRO_OPERATOR_SOURCE.

23
i3bar/src/cairo_util.c
View File

@ -114,6 +114,29 @@ void cairo_draw_rectangle(surface_t *surface, color_t color, double x, double y,
cairo_restore(surface->cr); cairo_restore(surface->cr);
} }
/**
* Clears a surface with the given color.
* Note that the drawing is done using CAIRO_OPERATOR_SOURCE.
*
*/
void cairo_clear_surface(surface_t *surface, color_t color) {
cairo_save(surface->cr);
/* Using the SOURCE operator will copy both color and alpha information directly
* onto the surface rather than blending it. This is a bit more efficient and
* allows better color control for the user when using opacity. */
cairo_set_operator(surface->cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_color(surface, color);
cairo_paint(surface->cr);
/* Make sure we flush the surface for any text drawing operations that could follow.
* Since we support drawing text via XCB, we need this. */
CAIRO_SURFACE_FLUSH(surface->surface);
cairo_restore(surface->cr);
}
/** /**
* Copies a surface onto another surface. * Copies a surface onto another surface.
* Note that the drawing is done using CAIRO_OPERATOR_SOURCE. * Note that the drawing is done using CAIRO_OPERATOR_SOURCE.

14
i3bar/src/xcb.c
View File

@ -244,12 +244,7 @@ void refresh_statusline(bool use_short_text) {
realloc_sl_buffer(); realloc_sl_buffer();
/* Clear the statusline pixmap. */ /* Clear the statusline pixmap. */
cairo_save(statusline_surface.cr); cairo_clear_surface(&statusline_surface, colors.bar_bg);
cairo_set_source_color(&statusline_surface, colors.bar_bg);
cairo_set_operator(statusline_surface.cr, CAIRO_OPERATOR_SOURCE);
cairo_paint(statusline_surface.cr);
CAIRO_SURFACE_FLUSH(statusline_surface.surface);
cairo_restore(statusline_surface.cr);
/* Draw the text of each block. */ /* Draw the text of each block. */
uint32_t x = 0; uint32_t x = 0;
@ -1797,12 +1792,7 @@ void draw_bars(bool unhide) {
} }
/* First things first: clear the backbuffer */ /* First things first: clear the backbuffer */
cairo_save(outputs_walk->buffer.cr); cairo_clear_surface(&(outputs_walk->buffer), colors.bar_bg);
cairo_set_source_color(&(outputs_walk->buffer), colors.bar_bg);
cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
cairo_paint(outputs_walk->buffer.cr);
CAIRO_SURFACE_FLUSH(outputs_walk->buffer.surface);
cairo_restore(outputs_walk->buffer.cr);
if (!config.disable_ws) { if (!config.disable_ws) {
i3_ws *ws_walk; i3_ws *ws_walk;