Fix moving windows to a marked workspace by mark.

[i3/i3] / i3bar / src / cairo_util.c

diff --git a/i3bar/src/cairo_util.c b/i3bar/src/cairo_util.c
index 288969c965fd9d9957f86e1f6ea4cdc97244aaf8..52181aee667b98f9826ee5dc33ccf1360067a72a 100644 (file)
--- a/i3bar/src/cairo_util.c
+++ b/i3bar/src/cairo_util.c
@@ -51,25 +51,15 @@ void cairo_surface_free(surface_t *surface) {
  *
  */
 color_t cairo_hex_to_color(const char *color) {
-    char alpha[2];
-    if (strlen(color) == strlen("#rrggbbaa")) {
-        alpha[0] = color[7];
-        alpha[1] = color[8];
-    } else {
-        alpha[0] = alpha[1] = 'F';
-    }
-
-    char groups[4][3] = {
+    char groups[3][3] = {
         {color[1], color[2], '\0'},
         {color[3], color[4], '\0'},
-        {color[5], color[6], '\0'},
-        {alpha[0], alpha[1], '\0'}};
+        {color[5], color[6], '\0'}};
 
     return (color_t){
         .red = strtol(groups[0], NULL, 16) / 255.0,
         .green = strtol(groups[1], NULL, 16) / 255.0,
         .blue = strtol(groups[2], NULL, 16) / 255.0,
-        .alpha = strtol(groups[3], NULL, 16) / 255.0,
         .colorpixel = get_colorpixel(color)};
 }
 
@@ -78,5 +68,68 @@ color_t cairo_hex_to_color(const char *color) {
  *
  */
 void cairo_set_source_color(surface_t *surface, color_t color) {
-    cairo_set_source_rgba(surface->cr, color.red, color.green, color.blue, color.alpha);
+    cairo_set_source_rgb(surface->cr, color.red, color.green, color.blue);
+}
+
+/**
+ * Draw the given text using libi3.
+ * This function also marks the surface dirty which is needed if other means of
+ * drawing are used. This will be the case when using XCB to draw text.
+ *
+ */
+void cairo_draw_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width) {
+    set_font_colors(surface->gc, fg_color.colorpixel, bg_color.colorpixel);
+    draw_text(text, surface->id, surface->gc, visual_type, x, y, max_width);
+
+    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);
 }