1 files changed, 32 insertions, 11 deletions

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);