Refactor cairo drawing of rectangles into utility functions.

diff --git a/i3bar/include/cairo_util.h b/i3bar/include/cairo_util.h
index de3fa80591828ba04feb5cf6848537e91aa037b1..ce1d3180df4fd00163933bfa65e4471ca2dda742 100644 (file)
--- a/i3bar/include/cairo_util.h
+++ b/i3bar/include/cairo_util.h
@@ -72,3 +72,20 @@ void cairo_set_source_color(surface_t *surface, color_t color);
  *
  */
 void cairo_draw_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width);
+
+/**
+ * Draws a filled rectangle.
+ * This function is a convenience wrapper and takes care of flushing the
+ * surface as well as restoring the cairo state.
+ * Note that the drawing is done using CAIRO_OPERATOR_SOURCE.
+ *
+ */
+void cairo_draw_rectangle(surface_t *surface, color_t color, double x, double y, double w, double h);
+
+/**
+ * Copies a surface onto another surface.
+ * Note that the drawing is done using CAIRO_OPERATOR_SOURCE.
+ *
+ */
+void cairo_copy_surface(surface_t *src, surface_t *dest, double src_x, double src_y,
+                        double dest_x, double dest_y, double dest_w, double dest_h);

diff --git a/i3bar/src/cairo_util.c b/i3bar/src/cairo_util.c
index 75a99d2fa04fe8f043bf99d20a0110780e0ae8fb..e17287863cf218925dcac8b762346d0263151c78 100644 (file)
--- a/i3bar/src/cairo_util.c
+++ b/i3bar/src/cairo_util.c
@@ -93,3 +93,53 @@ void cairo_draw_text(i3String *text, surface_t *surface, color_t fg_color, color
 
     cairo_surface_mark_dirty(surface->surface);
 }
+
+/**
+ * Draws a filled rectangle.
+ * This function is a convenience wrapper and takes care of flushing the
+ * surface as well as restoring the cairo state.
+ * Note that the drawing is done using CAIRO_OPERATOR_SOURCE.
+ *
+ */
+void cairo_draw_rectangle(surface_t *surface, color_t color, double x, double y, double w, double h) {
+    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_rectangle(surface->cr, x, y, w, h);
+    cairo_fill(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.
+ * Note that the drawing is done using CAIRO_OPERATOR_SOURCE.
+ *
+ */
+void cairo_copy_surface(surface_t *src, surface_t *dest, double src_x, double src_y,
+                        double dest_x, double dest_y, double dest_w, double dest_h) {
+    cairo_save(dest->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(dest->cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_source_surface(dest->cr, src->surface, src_x, src_y);
+
+    cairo_rectangle(dest->cr, dest_x, dest_y, dest_w, dest_h);
+    cairo_fill(dest->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(dest->surface);
+    cairo_restore(dest->cr);
+}

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 8f9c94b09ef650ab13299f92d5516849e42bec47..2cd3bd6efbcc829b829e0bdd671b8dc5d6c1bc2c 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -174,13 +174,11 @@ static void draw_separator(uint32_t x, struct status_block *block) {
     uint32_t center_x = x - sep_offset;
     if (config.separator_symbol == NULL) {
         /* Draw a classic one pixel, vertical separator. */
-        cairo_save(statusline_surface.cr);
-        cairo_set_operator(statusline_surface.cr, CAIRO_OPERATOR_SOURCE);
-        cairo_set_source_color(&statusline_surface, colors.sep_fg);
-        cairo_rectangle(statusline_surface.cr, center_x, logical_px(sep_voff_px), logical_px(1), bar_height - 2 * logical_px(sep_voff_px));
-        cairo_fill(statusline_surface.cr);
-        cairo_surface_flush(statusline_surface.surface);
-        cairo_restore(statusline_surface.cr);
+        cairo_draw_rectangle(&statusline_surface, colors.sep_fg,
+                             center_x,
+                             logical_px(sep_voff_px),
+                             logical_px(1),
+                             bar_height - 2 * logical_px(sep_voff_px));
     } else {
         /* Draw a custom separator. */
         uint32_t separator_x = MAX(x - block->sep_block_width, center_x - separator_symbol_width / 2);
@@ -265,10 +263,11 @@ void refresh_statusline(bool use_short_text) {
             fg_color = colors.urgent_ws_fg;
 
             /* Draw the background */
-            cairo_set_source_color(&statusline_surface, colors.urgent_ws_bg);
-            cairo_rectangle(statusline_surface.cr, x - logical_px(2), logical_px(1), block->width + logical_px(4), bar_height - logical_px(2));
-            cairo_fill(statusline_surface.cr);
-            cairo_surface_flush(statusline_surface.surface);
+            cairo_draw_rectangle(&statusline_surface, colors.urgent_ws_bg,
+                                 x - logical_px(2),
+                                 logical_px(1),
+                                 block->width + logical_px(4),
+                                 bar_height - logical_px(2));
         } else {
             fg_color = (block->color ? cairo_hex_to_color(block->color) : colors.bar_fg);
         }
@@ -1847,26 +1846,18 @@ void draw_bars(bool unhide) {
                 }
 
                 /* Draw the border of the button. */
-                cairo_save(outputs_walk->buffer.cr);
-                cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
-                cairo_set_source_color(&(outputs_walk->buffer), border_color);
-                cairo_rectangle(outputs_walk->buffer.cr, workspace_width, logical_px(1),
-                                ws_walk->name_width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1),
-                                font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1));
-                cairo_fill(outputs_walk->buffer.cr);
-                cairo_surface_flush(outputs_walk->buffer.surface);
-                cairo_restore(outputs_walk->buffer.cr);
+                cairo_draw_rectangle(&(outputs_walk->buffer), border_color,
+                                     workspace_width,
+                                     logical_px(1),
+                                     ws_walk->name_width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1),
+                                     font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1));
 
                 /* Draw the inside of the button. */
-                cairo_save(outputs_walk->buffer.cr);
-                cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
-                cairo_set_source_color(&(outputs_walk->buffer), bg_color);
-                cairo_rectangle(outputs_walk->buffer.cr, workspace_width + logical_px(1), 2 * logical_px(1),
-                                ws_walk->name_width + 2 * logical_px(ws_hoff_px),
-                                font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1));
-                cairo_fill(outputs_walk->buffer.cr);
-                cairo_surface_flush(outputs_walk->buffer.surface);
-                cairo_restore(outputs_walk->buffer.cr);
+                cairo_draw_rectangle(&(outputs_walk->buffer), bg_color,
+                                     workspace_width + logical_px(1),
+                                     2 * logical_px(1),
+                                     ws_walk->name_width + 2 * logical_px(ws_hoff_px),
+                                     font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1));
 
                 cairo_draw_text(ws_walk->name, &(outputs_walk->buffer), fg_color, bg_color,
                                 workspace_width + logical_px(ws_hoff_px) + logical_px(1),
@@ -1885,25 +1876,17 @@ void draw_bars(bool unhide) {
             color_t fg_color = colors.binding_mode_fg;
             color_t bg_color = colors.binding_mode_bg;
 
-            cairo_save(outputs_walk->buffer.cr);
-            cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
-            cairo_set_source_color(&(outputs_walk->buffer), colors.binding_mode_border);
-            cairo_rectangle(outputs_walk->buffer.cr, workspace_width, logical_px(1),
-                            binding.width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1),
-                            font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1));
-            cairo_fill(outputs_walk->buffer.cr);
-            cairo_surface_flush(outputs_walk->buffer.surface);
-            cairo_restore(outputs_walk->buffer.cr);
-
-            cairo_save(outputs_walk->buffer.cr);
-            cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
-            cairo_set_source_color(&(outputs_walk->buffer), bg_color);
-            cairo_rectangle(outputs_walk->buffer.cr, workspace_width + logical_px(1), 2 * logical_px(1),
-                            binding.width + 2 * logical_px(ws_hoff_px),
-                            font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1));
-            cairo_fill(outputs_walk->buffer.cr);
-            cairo_surface_flush(outputs_walk->buffer.surface);
-            cairo_restore(outputs_walk->buffer.cr);
+            cairo_draw_rectangle(&(outputs_walk->buffer), colors.binding_mode_border,
+                                 workspace_width,
+                                 logical_px(1),
+                                 binding.width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1),
+                                 font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1));
+
+            cairo_draw_rectangle(&(outputs_walk->buffer), bg_color,
+                                 workspace_width + logical_px(1),
+                                 2 * logical_px(1),
+                                 binding.width + 2 * logical_px(ws_hoff_px),
+                                 font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1));
 
             cairo_draw_text(binding.name, &(outputs_walk->buffer), fg_color, bg_color,
                             workspace_width + logical_px(ws_hoff_px) + logical_px(1),
@@ -1938,13 +1921,8 @@ void draw_bars(bool unhide) {
             int x_src = (int16_t)(statusline_width - visible_statusline_width);
             int x_dest = (int16_t)(outputs_walk->rect.w - tray_width - logical_px(sb_hoff_px) - visible_statusline_width);
 
-            cairo_save(outputs_walk->buffer.cr);
-            cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
-            cairo_set_source_surface(outputs_walk->buffer.cr, statusline_surface.surface, x_dest - x_src, 0);
-            cairo_rectangle(outputs_walk->buffer.cr, x_dest, 0, (int16_t)visible_statusline_width, (int16_t)bar_height);
-            cairo_fill(outputs_walk->buffer.cr);
-            cairo_surface_flush(outputs_walk->buffer.surface);
-            cairo_restore(outputs_walk->buffer.cr);
+            cairo_copy_surface(&statusline_surface, &(outputs_walk->buffer), x_dest - x_src, 0,
+                               x_dest, 0, (int16_t)visible_statusline_width, (int16_t)bar_height);
         }
 
         workspace_width = 0;
@@ -1973,14 +1951,8 @@ void redraw_bars(void) {
             continue;
         }
 
-        cairo_save(outputs_walk->bar.cr);
-        cairo_set_operator(outputs_walk->bar.cr, CAIRO_OPERATOR_SOURCE);
-        cairo_set_source_surface(outputs_walk->bar.cr, outputs_walk->buffer.surface, 0, 0);
-        cairo_rectangle(outputs_walk->bar.cr, 0, 0, outputs_walk->rect.w, outputs_walk->rect.h);
-        cairo_fill(outputs_walk->bar.cr);
-        cairo_surface_flush(outputs_walk->bar.surface);
-        cairo_restore(outputs_walk->bar.cr);
-
+        cairo_copy_surface(&(outputs_walk->buffer), &(outputs_walk->bar), 0, 0,
+                           0, 0, outputs_walk->rect.w, outputs_walk->rect.h);
         xcb_flush(xcb_connection);
     }
 }