15 files changed, 437 insertions, 268 deletions

diff --git a/swaybar/bar.c b/swaybar/bar.c
index 15eab782..5b1213a8 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -51,10 +50,6 @@ static void swaybar_output_free(struct swaybar_output *output) {
         if (output->surface != NULL) {
                 wl_surface_destroy(output->surface);
         }
-        if (output->input_region != NULL) {
-                wl_region_destroy(output->input_region);
-        }
-        zxdg_output_v1_destroy(output->xdg_output);
         wl_output_destroy(output->output);
         destroy_buffer(&output->buffers[0]);
         destroy_buffer(&output->buffers[1]);
@@ -114,10 +109,9 @@ static void add_layer_surface(struct swaybar_output *output) {
 
         if (overlay) {
                 // Empty input region
-                output->input_region = wl_compositor_create_region(bar->compositor);
-                assert(output->input_region);
-
-                wl_surface_set_input_region(output->surface, output->input_region);
+                struct wl_region *region = wl_compositor_create_region(bar->compositor);
+                wl_surface_set_input_region(output->surface, region);
+                wl_region_destroy(region);
         }
 
         zwlr_layer_surface_v1_set_anchor(output->layer_surface, config->position);
@@ -172,7 +166,7 @@ bool determine_bar_visibility(struct swaybar *bar, bool moving_layer) {
                 if (bar->status) {
                         sway_log(SWAY_DEBUG, "Sending %s signal to status command",
                                         visible ? "cont" : "stop");
-                        kill(bar->status->pid, visible ?
+                        kill(-bar->status->pid, visible ?
                                         bar->status->cont_signal : bar->status->stop_signal);
                 }
         }
@@ -367,6 +361,9 @@ static void handle_global(void *data, struct wl_registry *registry,
         } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
                 bar->xdg_output_manager = wl_registry_bind(registry, name,
                         &zxdg_output_manager_v1_interface, 2);
+        } else if (strcmp(interface, wp_cursor_shape_manager_v1_interface.name) == 0) {
+                bar->cursor_shape_manager = wl_registry_bind(registry, name,
+                        &wp_cursor_shape_manager_v1_interface, 1);
         }
 }
 
@@ -430,15 +427,17 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
         // Second roundtrip for xdg-output
         wl_display_roundtrip(bar->display);
 
-        struct swaybar_seat *seat;
-        wl_list_for_each(seat, &bar->seats, link) {
-                struct swaybar_pointer *pointer = &seat->pointer;
-                if (!pointer) {
-                        continue;
+        if (!bar->cursor_shape_manager) {
+                struct swaybar_seat *seat;
+                wl_list_for_each(seat, &bar->seats, link) {
+                        struct swaybar_pointer *pointer = &seat->pointer;
+                        if (!pointer) {
+                                continue;
+                        }
+                        pointer->cursor_surface =
+                                wl_compositor_create_surface(bar->compositor);
+                        assert(pointer->cursor_surface);
                 }
-                pointer->cursor_surface =
-                        wl_compositor_create_surface(bar->compositor);
-                assert(pointer->cursor_surface);
         }
 
         if (bar->config->status_command) {
diff --git a/swaybar/config.c b/swaybar/config.c
index abedaec0..55bfcb72 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include "swaybar/config.h"
@@ -26,7 +25,7 @@ struct swaybar_config *init_config(void) {
         config->status_command = NULL;
         config->pango_markup = false;
         config->position = parse_position("bottom");
-        config->font = strdup("monospace 10");
+        config->font_description = pango_font_description_from_string("monospace 10");
         config->mode = strdup("dock");
         config->hidden_state = strdup("hide");
         config->sep_symbol = NULL;
@@ -105,7 +104,7 @@ void free_tray_binding(struct tray_binding *binding) {
 
 void free_config(struct swaybar_config *config) {
         free(config->status_command);
-        free(config->font);
+        pango_font_description_free(config->font_description);
         free(config->mode);
         free(config->hidden_state);
         free(config->sep_symbol);
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 4bcd5843..62c22d43 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <json.h>
 #include <linux/input-event-codes.h>
 #include <ctype.h>
@@ -28,6 +27,19 @@ void i3bar_block_unref(struct i3bar_block *block) {
         }
 }
 
+static bool i3bar_parse_json_color(json_object *json, uint32_t *color) {
+        if (!json) {
+                return false;
+        }
+
+        const char *hexstring = json_object_get_string(json);
+        bool color_set = parse_color(hexstring, color);
+        if (!color_set) {
+                sway_log(SWAY_ERROR, "Ignoring invalid block hexadecimal color string: %s", hexstring);
+        }
+        return color_set;
+}
+
 static void i3bar_parse_json(struct status_line *status,
                 struct json_object *json_array) {
         struct i3bar_block *block, *tmp;
@@ -68,13 +80,7 @@ static void i3bar_parse_json(struct status_line *status,
                         strdup(json_object_get_string(full_text)) : NULL;
                 block->short_text = short_text ?
                         strdup(json_object_get_string(short_text)) : NULL;
-                if (color) {
-                        const char *hexstring = json_object_get_string(color);
-                        block->color_set = parse_color(hexstring, &block->color);
-                        if (!block->color_set) {
-                                sway_log(SWAY_ERROR, "Invalid block color: %s", hexstring);
-                        }
-                }
+                block->color_set = i3bar_parse_json_color(color, &block->color);
                 if (min_width) {
                         json_type type = json_object_get_type(min_width);
                         if (type == json_type_int) {
@@ -100,14 +106,8 @@ static void i3bar_parse_json(struct status_line *status,
                 block->separator_block_width = separator_block_width ?
                         json_object_get_int(separator_block_width) : 9;
                 // Airblader features
-                const char *hex = background ? json_object_get_string(background) : NULL;
-                if (hex && !parse_color(hex, &block->background)) {
-                        sway_log(SWAY_ERROR, "Ignoring invalid block background: %s", hex);
-                }
-                hex = border ? json_object_get_string(border) : NULL;
-                if (hex && !parse_color(hex, &block->border)) {
-                        sway_log(SWAY_ERROR, "Ignoring invalid block border: %s", hex);
-                }
+                i3bar_parse_json_color(background, &block->background);
+                block->border_set = i3bar_parse_json_color(border, &block->border);
                 block->border_top = border_top ? json_object_get_int(border_top) : 1;
                 block->border_bottom = border_bottom ?
                         json_object_get_int(border_bottom) : 1;
@@ -268,11 +268,16 @@ bool i3bar_handle_readable(struct status_line *status) {
 
 enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
                 struct i3bar_block *block, double x, double y, double rx, double ry,
-                double w, double h, int scale, uint32_t button) {
+                double w, double h, int scale, uint32_t button, bool released) {
         sway_log(SWAY_DEBUG, "block %s clicked", block->name);
         if (!block->name || !status->click_events) {
                 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;
+        }
 
         struct json_object *event_json = json_object_new_object();
         json_object_object_add(event_json, "name",
diff --git a/swaybar/image.c b/swaybar/image.c
new file mode 100644
index 00000000..ed24b9f9
--- /dev/null
+++ b/swaybar/image.c
@@ -0,0 +1,136 @@
+#include <assert.h>
+#include "config.h"
+#include "log.h"
+#include "swaybar/image.h"
+
+#if HAVE_GDK_PIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#endif
+
+#if HAVE_GDK_PIXBUF
+static cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(
+                const GdkPixbuf *gdkbuf) {
+        int chan = gdk_pixbuf_get_n_channels(gdkbuf);
+        if (chan < 3) {
+                return NULL;
+        }
+
+        const guint8* gdkpix = gdk_pixbuf_read_pixels(gdkbuf);
+        if (!gdkpix) {
+                return NULL;
+        }
+        gint w = gdk_pixbuf_get_width(gdkbuf);
+        gint h = gdk_pixbuf_get_height(gdkbuf);
+        int stride = gdk_pixbuf_get_rowstride(gdkbuf);
+
+        cairo_format_t fmt = (chan == 3) ? CAIRO_FORMAT_RGB24 : CAIRO_FORMAT_ARGB32;
+        cairo_surface_t * cs = cairo_image_surface_create (fmt, w, h);
+        cairo_surface_flush (cs);
+        if ( !cs || cairo_surface_status(cs) != CAIRO_STATUS_SUCCESS) {
+                return NULL;
+        }
+
+        int cstride = cairo_image_surface_get_stride(cs);
+        unsigned char * cpix = cairo_image_surface_get_data(cs);
+
+        if (chan == 3) {
+                int i;
+                for (i = h; i; --i) {
+                        const guint8 *gp = gdkpix;
+                        unsigned char *cp = cpix;
+                        const guint8* end = gp + 3*w;
+                        while (gp < end) {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                                cp[0] = gp[2];
+                                cp[1] = gp[1];
+                                cp[2] = gp[0];
+#else
+                                cp[1] = gp[0];
+                                cp[2] = gp[1];
+                                cp[3] = gp[2];
+#endif
+                                gp += 3;
+                                cp += 4;
+                        }
+                        gdkpix += stride;
+                        cpix += cstride;
+                }
+        } else {
+                /* premul-color = alpha/255 * color/255 * 255 = (alpha*color)/255
+                 * (z/255) = z/256 * 256/255     = z/256 (1 + 1/255)
+                 *         = z/256 + (z/256)/255 = (z + z/255)/256
+                 *         # recurse once
+                 *         = (z + (z + z/255)/256)/256
+                 *         = (z + z/256 + z/256/255) / 256
+                 *         # only use 16bit uint operations, loose some precision,
+                 *         # result is floored.
+                 *       ->  (z + z>>8)>>8
+                 *         # add 0x80/255 = 0.5 to convert floor to round
+                 *       =>  (z+0x80 + (z+0x80)>>8 ) >> 8
+                 * ------
+                 * tested as equal to lround(z/255.0) for uint z in [0..0xfe02]
+                 */
+#define PREMUL_ALPHA(x,a,b,z) \
+                G_STMT_START { z = a * b + 0x80; x = (z + (z >> 8)) >> 8; } \
+                G_STMT_END
+                int i;
+                for (i = h; i; --i) {
+                        const guint8 *gp = gdkpix;
+                        unsigned char *cp = cpix;
+                        const guint8* end = gp + 4*w;
+                        guint z1, z2, z3;
+                        while (gp < end) {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                                PREMUL_ALPHA(cp[0], gp[2], gp[3], z1);
+                                PREMUL_ALPHA(cp[1], gp[1], gp[3], z2);
+                                PREMUL_ALPHA(cp[2], gp[0], gp[3], z3);
+                                cp[3] = gp[3];
+#else
+                                PREMUL_ALPHA(cp[1], gp[0], gp[3], z1);
+                                PREMUL_ALPHA(cp[2], gp[1], gp[3], z2);
+                                PREMUL_ALPHA(cp[3], gp[2], gp[3], z3);
+                                cp[0] = gp[3];
+#endif
+                                gp += 4;
+                                cp += 4;
+                        }
+                        gdkpix += stride;
+                        cpix += cstride;
+                }
+#undef PREMUL_ALPHA
+        }
+        cairo_surface_mark_dirty(cs);
+        return cs;
+}
+#endif // HAVE_GDK_PIXBUF
+
+cairo_surface_t *load_image(const char *path) {
+        cairo_surface_t *image;
+#if HAVE_GDK_PIXBUF
+        GError *err = NULL;
+        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &err);
+        if (!pixbuf) {
+                sway_log(SWAY_ERROR, "Failed to load background image (%s).",
+                                err->message);
+                return NULL;
+        }
+        image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf);
+        g_object_unref(pixbuf);
+#else
+        image = cairo_image_surface_create_from_png(path);
+#endif // HAVE_GDK_PIXBUF
+        if (!image) {
+                sway_log(SWAY_ERROR, "Failed to read background image.");
+                return NULL;
+        }
+        if (cairo_surface_status(image) != CAIRO_STATUS_SUCCESS) {
+                sway_log(SWAY_ERROR, "Failed to read background image: %s."
+#if !HAVE_GDK_PIXBUF
+                                "\nSway was compiled without gdk_pixbuf support, so only"
+                                "\nPNG images can be loaded. This is the likely cause."
+#endif // !HAVE_GDK_PIXBUF
+                                , cairo_status_to_string(cairo_surface_status(image)));
+                return NULL;
+        }
+        return image;
+}
diff --git a/swaybar/input.c b/swaybar/input.c
index 6e13f177..ada4bc86 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -81,8 +81,16 @@ void update_cursor(struct swaybar_seat *seat) {
         int scale = pointer->current ? pointer->current->scale : 1;
         pointer->cursor_theme = wl_cursor_theme_load(
                 cursor_theme, cursor_size * scale, seat->bar->shm);
+        if (!pointer->cursor_theme) {
+                sway_log(SWAY_ERROR, "Failed to load cursor theme");
+                return;
+        }
         struct wl_cursor *cursor;
-        cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr");
+        cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
+        if (!cursor) {
+                sway_log(SWAY_ERROR, "Failed to get default cursor from theme");
+                return;
+        }
         pointer->cursor_image = cursor->images[0];
         wl_surface_set_buffer_scale(pointer->cursor_surface, scale);
         wl_surface_attach(pointer->cursor_surface,
@@ -103,7 +111,7 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
         struct swaybar_pointer *pointer = &seat->pointer;
         seat->pointer.x = wl_fixed_to_double(surface_x);
         seat->pointer.y = wl_fixed_to_double(surface_y);
-        pointer->serial = serial;
+
         struct swaybar_output *output;
         wl_list_for_each(output, &seat->bar->outputs, link) {
                 if (output->surface == surface) {
@@ -111,7 +119,18 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                         break;
                 }
         }
-        update_cursor(seat);
+
+        if (seat->bar->cursor_shape_manager) {
+                struct wp_cursor_shape_device_v1 *device =
+                        wp_cursor_shape_manager_v1_get_pointer(
+                                seat->bar->cursor_shape_manager, wl_pointer);
+                wp_cursor_shape_device_v1_set_shape(device, serial,
+                        WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT);
+                wp_cursor_shape_device_v1_destroy(device);
+        } else {
+                pointer->serial = serial;
+                update_cursor(seat);
+        }
 }
 
 static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
@@ -141,16 +160,15 @@ static bool check_bindings(struct swaybar *bar, uint32_t button,
 }
 
 static bool process_hotspots(struct swaybar_output *output,
-                double x, double y, uint32_t button) {
-        double px = x * output->scale;
-        double py = y * output->scale;
+                double x, double y, uint32_t button, uint32_t state) {
+        bool released = state == WL_POINTER_BUTTON_STATE_RELEASED;
         struct swaybar_hotspot *hotspot;
         wl_list_for_each(hotspot, &output->hotspots, link) {
-                if (px >= hotspot->x && py >= hotspot->y
-                                && px < hotspot->x + hotspot->width
-                                && py < hotspot->y + hotspot->height) {
+                if (x >= hotspot->x && y >= hotspot->y
+                                && x < hotspot->x + hotspot->width
+                                && y < hotspot->y + hotspot->height) {
                         if (HOTSPOT_IGNORE == hotspot->callback(output, hotspot, x, y,
-                                        button, hotspot->data)) {
+                                        button, released, hotspot->data)) {
                                 return true;
                         }
                 }
@@ -168,14 +186,11 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                 return;
         }
 
-        if (check_bindings(seat->bar, button, state)) {
+        if (process_hotspots(output, pointer->x, pointer->y, button, state)) {
                 return;
         }
 
-        if (state != WL_POINTER_BUTTON_STATE_PRESSED) {
-                return;
-        }
-        process_hotspots(output, pointer->x, pointer->y, button);
+        check_bindings(seat->bar, button, state);
 }
 
 static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
@@ -211,7 +226,7 @@ static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
                 }
         }
 
-        if (new) {
+        if (new && new != active) {
                 ipc_send_workspace_command(bar, new->name);
 
                 // Since we're asking Sway to switch to 'new', it should become visible.
@@ -224,15 +239,15 @@ static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
 static void process_discrete_scroll(struct swaybar_seat *seat,
                 struct swaybar_output *output, struct swaybar_pointer *pointer,
                 uint32_t axis, wl_fixed_t value) {
-        // If there is a button press binding, execute it, skip default behavior,
-        // and check button release bindings
         uint32_t button = wl_axis_to_button(axis, value);
-        if (check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
-                check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
+        if (process_hotspots(output, pointer->x, pointer->y, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
+                // (Currently hotspots don't do anything on release events, so no need to emit one)
                 return;
         }
 
-        if (process_hotspots(output, pointer->x, pointer->y, button)) {
+        // If there is a button press binding, execute it, and check button release bindings
+        if (check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
+                check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
                 return;
         }
 
@@ -405,7 +420,8 @@ static void wl_touch_up(void *data, struct wl_touch *wl_touch,
         }
         if (time - slot->time < 500) {
                 // Tap, treat it like a pointer click
-                process_hotspots(slot->output, slot->x, slot->y, BTN_LEFT);
+                process_hotspots(slot->output, slot->x, slot->y, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
+                // (Currently hotspots don't do anything on release events, so no need to emit one)
         }
         slot->output = NULL;
 }
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index a64aa1ab..03500bdf 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <limits.h>
 #include <poll.h>
 #include <stdio.h>
@@ -147,8 +146,10 @@ static bool ipc_parse_config(
 
         json_object *font = json_object_object_get(bar_config, "font");
         if (font) {
-                free(config->font);
-                config->font = parse_font(json_object_get_string(font));
+                pango_font_description_free(config->font_description);
+                char *font_value = parse_font(json_object_get_string(font));
+                config->font_description = pango_font_description_from_string(font_value);
+                free(font_value);
         }
 
         json_object *gaps = json_object_object_get(bar_config, "gaps");
@@ -424,12 +425,9 @@ bool ipc_initialize(struct swaybar *bar) {
         }
         free(res);
 
-        struct swaybar_config *config = bar->config;
-        char subscribe[128]; // suitably large buffer
-        len = snprintf(subscribe, 128,
-                        "[ \"barconfig_update\" , \"bar_state_update\" %s %s ]",
-                        config->binding_mode_indicator ? ", \"mode\"" : "",
-                        config->workspace_buttons ? ", \"workspace\"" : "");
+        char *subscribe =
+                "[ \"barconfig_update\", \"bar_state_update\", \"mode\", \"workspace\" ]";
+        len = strlen(subscribe);
         free(ipc_single_command(bar->ipc_event_socketfd,
                         IPC_SUBSCRIBE, subscribe, &len));
         return true;
@@ -485,8 +483,7 @@ static bool handle_barconfig_update(struct swaybar *bar, const char *payload,
                         destroy_layer_surface(output);
                         wl_list_remove(&output->link);
                         wl_list_insert(&bar->unused_outputs, &output->link);
-                } else if (!oldcfg->font || !newcfg->font ||
-                                strcmp(oldcfg->font, newcfg->font) != 0) {
+                } else if (!pango_font_description_equal(oldcfg->font_description, newcfg->font_description)) {
                         output->height = 0;  // force update height
                 }
         }
@@ -550,7 +547,7 @@ bool handle_ipc_readable(struct swaybar *bar) {
         // The default depth of 32 is too small to represent some nested layouts, but
         // we can't pass INT_MAX here because json-c (as of this writing) prefaults
         // all the memory for its stack.
-        json_tokener *tok = json_tokener_new_ex(256);
+        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
         if (!tok) {
                 sway_log_errno(SWAY_ERROR, "failed to create tokener");
                 free_ipc_response(resp);
diff --git a/swaybar/main.c b/swaybar/main.c
index a44c1e63..3dc67233 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/swaybar/meson.build b/swaybar/meson.build
index 9feb3cd2..34bbdeea 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -8,7 +8,6 @@ tray_files = have_tray ? [
 
 swaybar_deps = [
         cairo,
-        client_protos,
         gdk_pixbuf,
         jsonc,
         math,
@@ -27,12 +26,14 @@ executable(
                 'bar.c',
                 'config.c',
                 'i3bar.c',
+                'image.c',
                 'input.c',
                 'ipc.c',
                 'main.c',
                 'render.c',
                 'status_line.c',
-                tray_files
+                tray_files,
+                wl_protos_src,
         ],
         include_directories: [sway_inc],
         dependencies: swaybar_deps,
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);
         }
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index ecd91032..e542e606 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -117,11 +116,11 @@ bool status_handle_readable(struct status_line *status) {
                 status->text = status->buffer;
                 // intentional fall-through
         case PROTOCOL_TEXT:
-                errno = 0;
                 while (true) {
                         if (status->buffer[read_bytes - 1] == '\n') {
                                 status->buffer[read_bytes - 1] = '\0';
                         }
+                        errno = 0;
                         read_bytes = getline(&status->buffer,
                                         &status->buffer_size, status->read);
                         if (errno == EAGAIN) {
@@ -157,7 +156,12 @@ struct status_line *status_line_init(char *cmd) {
         assert(!getenv("WAYLAND_SOCKET") && "display must be initialized before "
                 " starting `status-command`; WAYLAND_SOCKET should not be set");
         status->pid = fork();
-        if (status->pid == 0) {
+        if (status->pid < 0) {
+                sway_log_errno(SWAY_ERROR, "fork failed");
+                exit(1);
+        } else if (status->pid == 0) {
+                setpgid(0, 0);
+
                 dup2(pipe_read_fd[1], STDOUT_FILENO);
                 close(pipe_read_fd[0]);
                 close(pipe_read_fd[1]);
@@ -185,8 +189,8 @@ struct status_line *status_line_init(char *cmd) {
 
 void status_line_free(struct status_line *status) {
         status_line_close_fds(status);
-        kill(status->pid, status->cont_signal);
-        kill(status->pid, SIGTERM);
+        kill(-status->pid, status->cont_signal);
+        kill(-status->pid, SIGTERM);
         waitpid(status->pid, NULL, 0);
         if (status->protocol == PROTOCOL_I3BAR) {
                 struct i3bar_block *block, *tmp;
diff --git a/swaybar/tray/host.c b/swaybar/tray/host.c
index ddf2416d..79b54606 100644
--- a/swaybar/tray/host.c
+++ b/swaybar/tray/host.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -10,6 +9,7 @@
 #include "swaybar/tray/tray.h"
 #include "list.h"
 #include "log.h"
+#include "stringop.h"
 
 static const char *watcher_path = "/StatusNotifierWatcher";
 
@@ -138,12 +138,10 @@ static int handle_new_watcher(sd_bus_message *msg,
 
 bool init_host(struct swaybar_host *host, char *protocol,
                 struct swaybar_tray *tray) {
-        size_t len = snprintf(NULL, 0, "org.%s.StatusNotifierWatcher", protocol) + 1;
-        host->watcher_interface = malloc(len);
+        host->watcher_interface = format_str("org.%s.StatusNotifierWatcher", protocol);
         if (!host->watcher_interface) {
                 return false;
         }
-        snprintf(host->watcher_interface, len, "org.%s.StatusNotifierWatcher", protocol);
 
         sd_bus_slot *reg_slot = NULL, *unreg_slot = NULL, *watcher_slot = NULL;
         int ret = sd_bus_match_signal(tray->bus, &reg_slot, host->watcher_interface,
@@ -173,13 +171,10 @@ bool init_host(struct swaybar_host *host, char *protocol,
         }
 
         pid_t pid = getpid();
-        size_t service_len = snprintf(NULL, 0, "org.%s.StatusNotifierHost-%d",
-                        protocol, pid) + 1;
-        host->service = malloc(service_len);
+        host->service = format_str("org.%s.StatusNotifierHost-%d", protocol, pid);
         if (!host->service) {
                 goto error;
         }
-        snprintf(host->service, service_len, "org.%s.StatusNotifierHost-%d", protocol, pid);
         ret = sd_bus_request_name(tray->bus, host->service, 0);
         if (ret < 0) {
                 sway_log(SWAY_DEBUG, "Failed to acquire service name: %s", strerror(-ret));
diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c
index c426c3d4..659edd86 100644
--- a/swaybar/tray/icon.c
+++ b/swaybar/tray/icon.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <dirent.h>
 #include <stdbool.h>
@@ -40,9 +39,7 @@ static list_t *get_basedirs(void) {
         data_dirs = strdup(data_dirs);
         char *dir = strtok(data_dirs, ":");
         do {
-                size_t path_len = snprintf(NULL, 0, "%s/icons", dir) + 1;
-                char *path = malloc(path_len);
-                snprintf(path, path_len, "%s/icons", dir);
+                char *path = format_str("%s/icons", dir);
                 list_add(basedirs, path);
         } while ((dir = strtok(NULL, ":")));
         free(data_dirs);
@@ -206,13 +203,7 @@ static const char *entry_handler(char *group, char *key, char *value,
  */
 static struct icon_theme *read_theme_file(char *basedir, char *theme_name) {
         // look for index.theme file
-        size_t path_len = snprintf(NULL, 0, "%s/%s/index.theme", basedir,
-                        theme_name) + 1;
-        char *path = malloc(path_len);
-        if (!path) {
-                return NULL;
-        }
-        snprintf(path, path_len, "%s/%s/index.theme", basedir, theme_name);
+        char *path = format_str("%s/%s/index.theme", basedir, theme_name);
         FILE *theme_file = fopen(path, "r");
         free(path);
         if (!theme_file) {
@@ -416,26 +407,20 @@ static char *find_icon_in_subdir(char *name, char *basedir, char *theme,
 #endif
         };
 
-        size_t path_len = snprintf(NULL, 0, "%s/%s/%s/%s.EXT", basedir, theme,
-                        subdir, name) + 1;
-        char *path = malloc(path_len);
-
         for (size_t i = 0; i < sizeof(extensions) / sizeof(*extensions); ++i) {
-                snprintf(path, path_len, "%s/%s/%s/%s.%s", basedir, theme, subdir,
-                                name, extensions[i]);
+                char *path = format_str("%s/%s/%s/%s.%s",
+                        basedir, theme, subdir, name, extensions[i]);
                 if (access(path, R_OK) == 0) {
                         return path;
                 }
+                free(path);
         }
 
-        free(path);
         return NULL;
 }
 
 static bool theme_exists_in_basedir(char *theme, char *basedir) {
-        size_t path_len = snprintf(NULL, 0, "%s/%s", basedir, theme) + 1;
-        char *path = malloc(path_len);
-        snprintf(path, path_len, "%s/%s", basedir, theme);
+        char *path = format_str("%s/%s", basedir, theme);
         bool ret = dir_exists(path);
         free(path);
         return ret;
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c
index 19f4beac..ca6c03ad 100644
--- a/swaybar/tray/item.c
+++ b/swaybar/tray/item.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <arpa/inet.h>
 #include <cairo.h>
 #include <limits.h>
@@ -7,12 +6,12 @@
 #include <string.h>
 #include "swaybar/bar.h"
 #include "swaybar/config.h"
+#include "swaybar/image.h"
 #include "swaybar/input.h"
 #include "swaybar/tray/host.h"
 #include "swaybar/tray/icon.h"
 #include "swaybar/tray/item.h"
 #include "swaybar/tray/tray.h"
-#include "background-image.h"
 #include "cairo_util.h"
 #include "list.h"
 #include "log.h"
@@ -385,13 +384,18 @@ static int cmp_sni_id(const void *item, const void *cmp_to) {
 
 static enum hotspot_event_handling icon_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) {
         sway_log(SWAY_DEBUG, "Clicked on %s", (char *)data);
 
         struct swaybar_tray *tray = output->bar->tray;
         int idx = list_seq_find(tray->items, cmp_sni_id, data);
 
         if (idx != -1) {
+                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;
+                }
                 struct swaybar_sni *sni = tray->items->items[idx];
                 // guess global position since wayland doesn't expose it
                 struct swaybar_config *config = tray->bar->config;
@@ -426,7 +430,7 @@ static void reload_sni(struct swaybar_sni *sni, char *icon_theme,
                 list_free(icon_search_paths);
                 if (icon_path) {
                         cairo_surface_destroy(sni->icon);
-                        sni->icon = load_background_image(icon_path);
+                        sni->icon = load_image(icon_path);
                         free(icon_path);
                         return;
                 }
@@ -466,6 +470,11 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
                 sni->target_size = target_size;
         }
 
+        // Passive
+        if (sni->status && sni->status[0] == 'P') {
+                return 0;
+        }
+
         int icon_size;
         cairo_surface_t *icon;
         if (sni->icon) {
@@ -493,24 +502,36 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
                 cairo_destroy(cairo_icon);
         }
 
-        int padded_size = icon_size + 2*padding;
-        *x -= padded_size;
-        int y = floor((height - padded_size) / 2.0);
+        double descaled_padding = (double)padding / output->scale;
+        double descaled_icon_size = (double)icon_size / output->scale;
+
+        int size = descaled_icon_size + 2 * descaled_padding;
+        *x -= size;
+        int icon_y = floor((output->height - size) / 2.0);
 
         cairo_operator_t op = cairo_get_operator(cairo);
         cairo_set_operator(cairo, CAIRO_OPERATOR_OVER);
-        cairo_set_source_surface(cairo, icon, *x + padding, y + padding);
-        cairo_rectangle(cairo, *x, y, padded_size, padded_size);
+
+        cairo_matrix_t scale_matrix;
+        cairo_pattern_t *icon_pattern = cairo_pattern_create_for_surface(icon);
+        // TODO: check cairo_pattern_status for "ENOMEM"
+        cairo_matrix_init_scale(&scale_matrix, output->scale, output->scale);
+        cairo_matrix_translate(&scale_matrix, -(*x + descaled_padding), -(icon_y + descaled_padding));
+        cairo_pattern_set_matrix(icon_pattern, &scale_matrix);
+        cairo_set_source(cairo, icon_pattern);
+        cairo_rectangle(cairo, *x, icon_y, size, size);
         cairo_fill(cairo);
+
         cairo_set_operator(cairo, op);
 
+        cairo_pattern_destroy(icon_pattern);
         cairo_surface_destroy(icon);
 
         struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
         hotspot->x = *x;
         hotspot->y = 0;
-        hotspot->width = height;
-        hotspot->height = height;
+        hotspot->width = size;
+        hotspot->height = output->height;
         hotspot->callback = icon_hotspot_callback;
         hotspot->destroy = free;
         hotspot->data = strdup(sni->watcher_id);
diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c
index 5fe6f9c3..b0545f4a 100644
--- a/swaybar/tray/tray.c
+++ b/swaybar/tray/tray.c
@@ -116,8 +116,8 @@ uint32_t render_tray(cairo_t *cairo, struct swaybar_output *output, double *x) {
                 }
         } // else display on all
 
-        if ((int) output->height*output->scale <= 2*config->tray_padding) {
-                return 2*config->tray_padding + 1;
+        if ((int)(output->height * output->scale) <= 2 * config->tray_padding) {
+                return (2 * config->tray_padding + 1) / output->scale;
         }
 
         uint32_t max_height = 0;
diff --git a/swaybar/tray/watcher.c b/swaybar/tray/watcher.c
index 16afc27c..3cfea8d8 100644
--- a/swaybar/tray/watcher.c
+++ b/swaybar/tray/watcher.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -6,6 +5,7 @@
 #include <string.h>
 #include "list.h"
 #include "log.h"
+#include "stringop.h"
 #include "swaybar/tray/watcher.h"
 
 static const char *obj_path = "/StatusNotifierWatcher";
@@ -76,9 +76,7 @@ static int register_sni(sd_bus_message *msg, void *data, sd_bus_error *error) {
                         service = service_or_path;
                         path = "/StatusNotifierItem";
                 }
-                size_t id_len = snprintf(NULL, 0, "%s%s", service, path) + 1;
-                id = malloc(id_len);
-                snprintf(id, id_len, "%s%s", service, path);
+                id = format_str("%s%s", service, path);
         }
 
         if (list_seq_find(watcher->items, cmp_id, id) == -1) {
@@ -107,7 +105,7 @@ static int register_host(sd_bus_message *msg, void *data, sd_bus_error *error) {
                 sway_log(SWAY_DEBUG, "Registering Status Notifier Host '%s'", service);
                 list_add(watcher->hosts, strdup(service));
                 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface,
-                                "StatusNotifierHostRegistered", "s", service);
+                                "StatusNotifierHostRegistered", "");
         } else {
                 sway_log(SWAY_DEBUG, "Status Notifier Host '%s' already registered", service);
         }
@@ -159,9 +157,7 @@ struct swaybar_watcher *create_watcher(char *protocol, sd_bus *bus) {
                 return NULL;
         }
 
-        size_t len = snprintf(NULL, 0, "org.%s.StatusNotifierWatcher", protocol) + 1;
-        watcher->interface = malloc(len);
-        snprintf(watcher->interface, len, "org.%s.StatusNotifierWatcher", protocol);
+        watcher->interface = format_str("org.%s.StatusNotifierWatcher", protocol);
 
         sd_bus_slot *signal_slot = NULL, *vtable_slot = NULL;
         int ret = sd_bus_add_object_vtable(bus, &vtable_slot, obj_path,