1 files changed, 43 insertions, 38 deletions

diff --git a/swaybar/render.c b/swaybar/render.c
index 7e2f97b7..879a4e42 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <linux/input-event-codes.h>
 #include <limits.h>
@@ -62,7 +61,7 @@ static uint32_t render_status_line_error(struct render_context *ctx, double *x)
         int margin = 3;
         double ws_vertical_padding = output->bar->config->status_padding;
 
-        char *font = output->bar->config->font;
+        PangoFontDescription *font = output->bar->config->font_description;
         int text_width, text_height;
         get_text_size(cairo, font, &text_width, &text_height, NULL,
                         1, false, "%s", error);
@@ -97,7 +96,7 @@ static uint32_t render_status_line_text(struct render_context *ctx, double *x) {
         cairo_set_source_u32(cairo, fontcolor);
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
                         1, config->pango_markup, "%s", text);
 
         double ws_vertical_padding = config->status_padding;
@@ -115,7 +114,7 @@ static uint32_t render_status_line_text(struct render_context *ctx, double *x) {
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_move_to(cairo, *x, (int)floor(text_y));
         choose_text_aa_mode(ctx, fontcolor);
-        render_text(cairo, config->font, 1, config->pango_markup, "%s", text);
+        render_text(cairo, config->font_description, 1, config->pango_markup, "%s", text);
         *x -= margin;
         return output->height;
 }
@@ -160,7 +159,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
 
 static enum hotspot_event_handling block_hotspot_callback(
                 struct swaybar_output *output, struct swaybar_hotspot *hotspot,
-                double x, double y, uint32_t button, void *data) {
+                double x, double y, uint32_t button, bool released, void *data) {
         struct i3bar_block *block = data;
         struct status_line *status = output->bar->status;
         return i3bar_block_send_click(status, block, x, y,
@@ -168,7 +167,7 @@ static enum hotspot_event_handling block_hotspot_callback(
                         y - (double)hotspot->y,
                         (double)hotspot->width,
                         (double)hotspot->height,
-                        output->scale, button);
+                        output->scale, button, released);
 }
 
 static void i3bar_block_unref_callback(void *data) {
@@ -190,7 +189,7 @@ static uint32_t render_status_block(struct render_context *ctx,
         struct swaybar_output *output = ctx->output;
         struct swaybar_config *config = output->bar->config;
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL, 1,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
                         block->markup, "%s", text);
 
         int margin = 3;
@@ -199,7 +198,7 @@ static uint32_t render_status_block(struct render_context *ctx,
         int width = text_width;
         if (block->min_width_str) {
                 int w;
-                get_text_size(cairo, config->font, &w, NULL, NULL, 1, block->markup,
+                get_text_size(cairo, config->font_description, &w, NULL, NULL, 1, block->markup,
                                 "%s", block->min_width_str);
                 block->min_width = w;
         }
@@ -229,7 +228,7 @@ static uint32_t render_status_block(struct render_context *ctx,
         int sep_block_width = block->separator_block_width;
         if (!edge) {
                 if (config->sep_symbol) {
-                        get_text_size(cairo, config->font, &sep_width, &sep_height, NULL,
+                        get_text_size(cairo, config->font_description, &sep_width, &sep_height, NULL,
                                         1, false, "%s", config->sep_symbol);
                         uint32_t _ideal_height = sep_height + ws_vertical_padding * 2;
                         uint32_t _ideal_surface_height = _ideal_height;
@@ -292,7 +291,7 @@ static uint32_t render_status_block(struct render_context *ctx,
         }
 
         double offset = 0;
-        if (strncmp(block->align, "left", 5) == 0) {
+        if (strncmp(block->align, "left", 4) == 0) {
                 offset = x_pos;
         } else if (strncmp(block->align, "right", 5) == 0) {
                 offset = x_pos + width - text_width;
@@ -307,7 +306,7 @@ static uint32_t render_status_block(struct render_context *ctx,
         color = block->urgent ? config->colors.urgent_workspace.text : color;
         cairo_set_source_u32(cairo, color);
         choose_text_aa_mode(ctx, color);
-        render_text(cairo, config->font, 1, block->markup, "%s", text);
+        render_text(cairo, config->font_description, 1, block->markup, "%s", text);
         x_pos += width;
 
         if (block->border_set || block->urgent) {
@@ -331,7 +330,7 @@ static uint32_t render_status_block(struct render_context *ctx,
                         double sep_y = height / 2.0 - sep_height / 2.0;
                         cairo_move_to(cairo, offset, (int)floor(sep_y));
                         choose_text_aa_mode(ctx, color);
-                        render_text(cairo, config->font, 1, false,
+                        render_text(cairo, config->font_description, 1, false,
                                         "%s", config->sep_symbol);
                 } else {
                         cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
@@ -354,7 +353,7 @@ static void predict_status_block_pos(cairo_t *cairo,
         struct swaybar_config *config = output->bar->config;
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL, 1,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
                         block->markup, "%s", block->full_text);
 
         int margin = 3;
@@ -364,7 +363,7 @@ static void predict_status_block_pos(cairo_t *cairo,
 
         if (block->min_width_str) {
                 int w;
-                get_text_size(cairo, config->font, &w, NULL, NULL,
+                get_text_size(cairo, config->font_description, &w, NULL, NULL,
                                 1, block->markup, "%s", block->min_width_str);
                 block->min_width = w;
         }
@@ -391,7 +390,7 @@ static void predict_status_block_pos(cairo_t *cairo,
         int sep_block_width = block->separator_block_width;
         if (!edge) {
                 if (config->sep_symbol) {
-                        get_text_size(cairo, config->font, &sep_width, &sep_height, NULL,
+                        get_text_size(cairo, config->font_description, &sep_width, &sep_height, NULL,
                                         1, false, "%s", config->sep_symbol);
                         uint32_t _ideal_height = sep_height + ws_vertical_padding * 2;
                         uint32_t _ideal_surface_height = _ideal_height;
@@ -426,7 +425,7 @@ static uint32_t predict_workspace_button_length(cairo_t *cairo,
         struct swaybar_config *config = output->bar->config;
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL, 1,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
                         config->pango_markup, "%s", ws->label);
 
         int ws_vertical_padding = WS_VERTICAL_PADDING;
@@ -474,7 +473,7 @@ static uint32_t predict_binding_mode_indicator_length(cairo_t *cairo,
         }
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
                         1, output->bar->mode_pango_markup,
                         "%s", mode);
 
@@ -551,7 +550,7 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx,
         cairo_t *cairo = ctx->cairo;
         struct swaybar_config *config = output->bar->config;
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
                         1, output->bar->mode_pango_markup,
                         "%s", mode);
 
@@ -592,17 +591,22 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx,
         cairo_set_source_u32(cairo, config->colors.binding_mode.text);
         cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y));
         choose_text_aa_mode(ctx, config->colors.binding_mode.text);
-        render_text(cairo, config->font, 1, output->bar->mode_pango_markup,
+        render_text(cairo, config->font_description, 1, output->bar->mode_pango_markup,
                         "%s", mode);
         return output->height;
 }
 
 static enum hotspot_event_handling workspace_hotspot_callback(
                 struct swaybar_output *output, struct swaybar_hotspot *hotspot,
-                double x, double y, uint32_t button, void *data) {
+                double x, double y, uint32_t button, bool released, void *data) {
         if (button != BTN_LEFT) {
                 return HOTSPOT_PROCESS;
         }
+        if (released) {
+                // Since we handle the pressed event, also handle the released event
+                // to block it from falling through to a binding in the bar
+                return HOTSPOT_IGNORE;
+        }
         ipc_send_workspace_command(output->bar, (const char *)data);
         return HOTSPOT_IGNORE;
 }
@@ -626,7 +630,7 @@ static uint32_t render_workspace_button(struct render_context *ctx,
 
         cairo_t *cairo = ctx->cairo;
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
                         1, config->pango_markup, "%s", ws->label);
 
         int ws_vertical_padding = WS_VERTICAL_PADDING;
@@ -666,7 +670,7 @@ static uint32_t render_workspace_button(struct render_context *ctx,
         cairo_set_source_u32(cairo, box_colors.text);
         cairo_move_to(cairo, *x + width / 2 - text_width / 2, (int)floor(text_y));
         choose_text_aa_mode(ctx, box_colors.text);
-        render_text(cairo, config->font, 1, config->pango_markup,
+        render_text(cairo, config->font_description, 1, config->pango_markup,
                         "%s", ws->label);
 
         struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
@@ -688,18 +692,9 @@ static uint32_t render_to_cairo(struct render_context *ctx) {
         struct swaybar_output *output = ctx->output;
         struct swaybar *bar = output->bar;
         struct swaybar_config *config = bar->config;
-        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
-        if (output->focused) {
-                ctx->background_color = config->colors.focused_background;
-        } else {
-                ctx->background_color = config->colors.background;
-        }
-
-        cairo_set_source_u32(cairo, ctx->background_color);
-        cairo_paint(cairo);
 
         int th;
-        get_text_size(cairo, config->font, NULL, &th, NULL, 1, false, "");
+        get_text_size(cairo, config->font_description, NULL, &th, NULL, 1, false, "");
         uint32_t max_height = (th + WS_VERTICAL_PADDING * 4);
         /*
          * Each render_* function takes the actual height of the bar, and returns
@@ -758,8 +753,17 @@ void render_frame(struct swaybar_output *output) {
 
         free_hotspots(&output->hotspots);
 
+        uint32_t background_color;
+        if (output->focused) {
+                background_color = output->bar->config->colors.focused_background;
+        } else {
+                background_color = output->bar->config->colors.background;
+        }
+
         struct render_context ctx = { 0 };
         ctx.output = output;
+        // initial background color used for deciding the best way to antialias text
+        ctx.background_color = background_color;
 
         cairo_surface_t *recorder = cairo_recording_surface_create(
                         CAIRO_CONTENT_COLOR_ALPHA, NULL);
@@ -769,24 +773,23 @@ void render_frame(struct swaybar_output *output) {
         ctx.cairo = cairo;
 
         cairo_font_options_t *fo = cairo_font_options_create();
-        cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
         cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
         ctx.textaa_safe = fo;
         if (output->subpixel == WL_OUTPUT_SUBPIXEL_NONE) {
                 ctx.textaa_sharp = ctx.textaa_safe;
         } else {
                 fo = cairo_font_options_create();
-                cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
                 cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL);
                 cairo_font_options_set_subpixel_order(fo,
                         to_cairo_subpixel_order(output->subpixel));
                 ctx.textaa_sharp = fo;
         }
 
-        cairo_save(cairo);
-        cairo_set_operator(cairo, CAIRO_OPERATOR_CLEAR);
+
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
+        cairo_set_source_u32(cairo, background_color);
         cairo_paint(cairo);
-        cairo_restore(cairo);
+
         uint32_t height = render_to_cairo(&ctx);
         int config_height = output->bar->config->height;
         if (config_height > 0) {
@@ -831,13 +834,15 @@ void render_frame(struct swaybar_output *output) {
                 wl_surface_damage(output->surface, 0, 0,
                                 output->width, output->height);
 
-                uint32_t bg_alpha = ctx.background_color & 0xFF;
+                uint32_t bg_alpha = background_color & 0xFF;
                 if (bg_alpha == 0xFF) {
                         struct wl_region *region =
                                 wl_compositor_create_region(output->bar->compositor);
                         wl_region_add(region, 0, 0, INT32_MAX, INT32_MAX);
                         wl_surface_set_opaque_region(output->surface, region);
                         wl_region_destroy(region);
+                } else {
+                        wl_surface_set_opaque_region(output->surface, NULL);
                 }
 
                 struct wl_callback *frame_callback = wl_surface_frame(output->surface);