1 files changed, 154 insertions, 138 deletions

diff --git a/swaybar/render.c b/swaybar/render.c
index fcc8be1d..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>
@@ -14,6 +13,7 @@
 #include "swaybar/ipc.h"
 #include "swaybar/render.h"
 #include "swaybar/status_line.h"
+#include "log.h"
 #if HAVE_TRAY
 #include "swaybar/tray/tray.h"
 #endif
@@ -53,22 +53,21 @@ static uint32_t render_status_line_error(struct render_context *ctx, double *x)
                 return 0;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
 
         cairo_t *cairo = ctx->cairo;
         cairo_set_source_u32(cairo, 0xFF0000FF);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding =
-                output->bar->config->status_padding * output->scale;
+        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,
-                        output->scale, false, "%s", error);
+                        1, false, "%s", error);
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
@@ -78,7 +77,7 @@ static uint32_t render_status_line_error(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, 0xFF0000FF);
-        pango_printf(cairo, font, output->scale, false, "%s", error);
+        render_text(cairo, font, 1, false, "%s", error);
         *x -= margin;
         return output->height;
 }
@@ -97,26 +96,25 @@ 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,
-                        output->scale, config->pango_markup, "%s", text);
+        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 * output->scale;
-        int margin = 3 * output->scale;
+        double ws_vertical_padding = config->status_padding;
+        int margin = 3;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         *x -= text_width + margin;
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
         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);
-        pango_printf(cairo, config->font, output->scale,
-                        config->pango_markup, "%s", text);
+        render_text(cairo, config->font_description, 1, config->pango_markup, "%s", text);
         *x -= margin;
         return output->height;
 }
@@ -161,15 +159,15 @@ 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,
-                        x - (double)hotspot->x / output->scale,
-                        y - (double)hotspot->y / output->scale,
-                        (double)hotspot->width / output->scale,
-                        (double)hotspot->height / output->scale,
-                        output->scale, button);
+                        x - (double)hotspot->x,
+                        y - (double)hotspot->y,
+                        (double)hotspot->width,
+                        (double)hotspot->height,
+                        output->scale, button, released);
 }
 
 static void i3bar_block_unref_callback(void *data) {
@@ -191,17 +189,17 @@ 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,
-                        output->scale, block->markup, "%s", text);
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
+                        block->markup, "%s", text);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding = config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = config->status_padding;
 
         int width = text_width;
         if (block->min_width_str) {
                 int w;
-                get_text_size(cairo, config->font, &w, NULL, NULL,
-                                output->scale, block->markup, "%s", block->min_width_str);
+                get_text_size(cairo, config->font_description, &w, NULL, NULL, 1, block->markup,
+                                "%s", block->min_width_str);
                 block->min_width = w;
         }
         if (width < block->min_width) {
@@ -210,30 +208,30 @@ static uint32_t render_status_block(struct render_context *ctx,
 
         double block_width = width;
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         *x -= width;
-        if ((block->border || block->urgent) && block->border_left > 0) {
-                *x -= (block->border_left * output->scale + margin);
-                block_width += block->border_left * output->scale + margin;
+        if ((block->border_set || block->urgent) && block->border_left > 0) {
+                *x -= (block->border_left + margin);
+                block_width += block->border_left + margin;
         }
-        if ((block->border || block->urgent) && block->border_right > 0) {
-                *x -= (block->border_right * output->scale + margin);
-                block_width += block->border_right * output->scale + margin;
+        if ((block->border_set || block->urgent) && block->border_right > 0) {
+                *x -= (block->border_right + margin);
+                block_width += block->border_right + margin;
         }
 
         int sep_width, sep_height;
         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,
-                                        output->scale, false, "%s", config->sep_symbol);
+                        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 / output->scale;
+                        uint32_t _ideal_surface_height = _ideal_height;
                         if (!output->bar->config->height &&
                                         output->height < _ideal_surface_height) {
                                 return _ideal_surface_height;
@@ -244,10 +242,10 @@ static uint32_t render_status_block(struct render_context *ctx,
                 }
                 *x -= sep_block_width;
         } else if (config->status_edge_padding) {
-                *x -= config->status_edge_padding * output->scale;
+                *x -= config->status_edge_padding;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
         if (output->bar->status->click_events) {
                 struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
                 hotspot->x = *x;
@@ -275,23 +273,25 @@ static uint32_t render_status_block(struct render_context *ctx,
 
         uint32_t border_color = block->urgent
                 ? config->colors.urgent_workspace.border : block->border;
-        if (border_color && block->border_top > 0) {
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block_width, block->border_top * output->scale);
-        }
-        if (border_color && block->border_bottom > 0) {
-                render_sharp_line(cairo, border_color, x_pos,
-                                y_pos + render_height - block->border_bottom * output->scale,
-                                block_width, block->border_bottom * output->scale);
-        }
-        if (border_color && block->border_left > 0) {
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block->border_left * output->scale, render_height);
-                x_pos += block->border_left * output->scale + margin;
+        if (block->border_set || block->urgent) {
+                if (block->border_top > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block_width, block->border_top);
+                }
+                if (block->border_bottom > 0) {
+                        render_sharp_line(cairo, border_color, x_pos,
+                                        y_pos + render_height - block->border_bottom,
+                                        block_width, block->border_bottom);
+                }
+                if (block->border_left > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block->border_left, render_height);
+                }
+                x_pos += block->border_left + margin;
         }
 
         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;
@@ -306,15 +306,16 @@ 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);
-        pango_printf(cairo, config->font, output->scale,
-                        block->markup, "%s", text);
+        render_text(cairo, config->font_description, 1, block->markup, "%s", text);
         x_pos += width;
 
-        if (block->border && block->border_right > 0) {
+        if (block->border_set || block->urgent) {
                 x_pos += margin;
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block->border_right * output->scale, render_height);
-                x_pos += block->border_right * output->scale;
+                if (block->border_right > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block->border_right, render_height);
+                }
+                x_pos += block->border_right;
         }
 
         if (!edge && block->separator) {
@@ -329,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);
-                        pango_printf(cairo, config->font, output->scale, false,
+                        render_text(cairo, config->font_description, 1, false,
                                         "%s", config->sep_symbol);
                 } else {
                         cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
@@ -352,18 +353,18 @@ 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,
-                        output->scale, block->markup, "%s", block->full_text);
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
+                        block->markup, "%s", block->full_text);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding = config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = config->status_padding;
 
         int width = text_width;
 
         if (block->min_width_str) {
                 int w;
-                get_text_size(cairo, config->font, &w, NULL, NULL,
-                                output->scale, block->markup, "%s", block->min_width_str);
+                get_text_size(cairo, config->font_description, &w, NULL, NULL,
+                                1, block->markup, "%s", block->min_width_str);
                 block->min_width = w;
         }
         if (width < block->min_width) {
@@ -371,28 +372,28 @@ static void predict_status_block_pos(cairo_t *cairo,
         }
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return;
         }
 
         *x -= width;
-        if ((block->border || block->urgent) && block->border_left > 0) {
-                *x -= (block->border_left * output->scale + margin);
+        if ((block->border_set || block->urgent) && block->border_left > 0) {
+                *x -= (block->border_left + margin);
         }
-        if ((block->border || block->urgent) && block->border_right > 0) {
-                *x -= (block->border_right * output->scale + margin);
+        if ((block->border_set || block->urgent) && block->border_right > 0) {
+                *x -= (block->border_right + margin);
         }
 
         int sep_width, sep_height;
         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,
-                                        output->scale, false, "%s", config->sep_symbol);
+                        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 / output->scale;
+                        uint32_t _ideal_surface_height = _ideal_height;
                         if (!output->bar->config->height &&
                                         output->height < _ideal_surface_height) {
                                 return;
@@ -403,13 +404,13 @@ static void predict_status_block_pos(cairo_t *cairo,
                 }
                 *x -= sep_block_width;
         } else if (config->status_edge_padding) {
-                *x -= config->status_edge_padding * output->scale;
+                *x -= config->status_edge_padding;
         }
 }
 
 static double predict_status_line_pos(cairo_t *cairo,
                 struct swaybar_output *output, double x) {
-        bool edge = x == output->width * output->scale;
+        bool edge = x == output->width;
         struct i3bar_block *block;
         wl_list_for_each(block, &output->bar->status->blocks, link) {
                 predict_status_block_pos(cairo, output, block, &x, edge);
@@ -424,24 +425,24 @@ 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,
-                        output->scale, config->pango_markup, "%s", ws->label);
+        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 * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = ws_vertical_padding * 2 + text_height
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return 0;
         }
 
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
         return width;
 }
@@ -472,24 +473,24 @@ 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,
-                        output->scale, output->bar->mode_pango_markup,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
+                        1, output->bar->mode_pango_markup,
                         "%s", mode);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return 0;
         }
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
         return width;
 }
@@ -497,7 +498,7 @@ static uint32_t predict_binding_mode_indicator_length(cairo_t *cairo,
 static uint32_t render_status_line_i3bar(struct render_context *ctx, double *x) {
         struct swaybar_output *output = ctx->output;
         uint32_t max_height = 0;
-        bool edge = *x == output->width * output->scale;
+        bool edge = *x == output->width;
         struct i3bar_block *block;
         bool use_short_text = false;
 
@@ -505,7 +506,7 @@ static uint32_t render_status_line_i3bar(struct render_context *ctx, double *x)
         double reserved_width =
                         predict_workspace_buttons_length(cairo, output) +
                         predict_binding_mode_indicator_length(cairo, output) +
-                        3 * output->scale; // require a bit of space for margin
+                        3; // require a bit of space for margin
 
         double predicted_full_pos =
                         predict_status_line_pos(cairo, output, *x);
@@ -549,27 +550,27 @@ 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,
-                        output->scale, output->bar->mode_pango_markup,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
+                        1, output->bar->mode_pango_markup,
                         "%s", mode);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
         cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_u32(cairo, config->colors.binding_mode.background);
         ctx->background_color = config->colors.binding_mode.background;
@@ -590,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);
-        pango_printf(cairo, config->font, output->scale,
-                        output->bar->mode_pango_markup, "%s", mode);
+        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;
 }
@@ -620,28 +626,28 @@ static uint32_t render_workspace_button(struct render_context *ctx,
                 box_colors = config->colors.inactive_workspace;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
 
         cairo_t *cairo = ctx->cairo;
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, config->pango_markup, "%s", ws->label);
+        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 * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = ws_vertical_padding * 2 + text_height
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
 
         cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
@@ -664,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);
-        pango_printf(cairo, config->font, output->scale, 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));
@@ -686,19 +692,10 @@ 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, output->scale, false, "");
-        uint32_t max_height = (th + WS_VERTICAL_PADDING * 4) / output->scale;
+        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
          * the ideal height. If the actual height is too short, the render function
@@ -706,7 +703,7 @@ static uint32_t render_to_cairo(struct render_context *ctx) {
          * height is too tall, the render function should adapt its drawing to
          * utilize the available space.
          */
-        double x = output->width * output->scale;
+        double x = output->width;
 #if HAVE_TRAY
         if (bar->tray) {
                 uint32_t h = render_tray(cairo, output, &x);
@@ -756,34 +753,43 @@ 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);
         cairo_t *cairo = cairo_create(recorder);
+        cairo_scale(cairo, output->scale, output->scale);
         cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
         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) {
@@ -810,9 +816,7 @@ void render_frame(struct swaybar_output *output) {
                                 output->width * output->scale,
                                 output->height * output->scale);
                 if (!output->current_buffer) {
-                        cairo_surface_destroy(recorder);
-                        cairo_destroy(cairo);
-                        return;
+                        goto cleanup;
                 }
                 cairo_t *shm = output->current_buffer->cairo;
 
@@ -830,6 +834,17 @@ void render_frame(struct swaybar_output *output) {
                 wl_surface_damage(output->surface, 0, 0,
                                 output->width, output->height);
 
+                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);
                 wl_callback_add_listener(frame_callback, &output_frame_listener, output);
                 output->frame_scheduled = true;
@@ -837,6 +852,7 @@ void render_frame(struct swaybar_output *output) {
                 wl_surface_commit(output->surface);
         }
 
+cleanup:
         if (ctx.textaa_sharp != ctx.textaa_safe) {
                 cairo_font_options_destroy(ctx.textaa_sharp);
         }