Merge pull request #1722 from swaywm/swaybar-hidpi

Add hidpi support to swaybar

3 files changed, 185 insertions, 80 deletions

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 74292519..503b961c 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -58,6 +58,7 @@ struct swaybar_output {
         bool focused;
 
         uint32_t width, height;
+        int32_t scale;
         struct pool_buffer buffers[2];
         struct pool_buffer *current_buffer;
 };
diff --git a/swaybar/bar.c b/swaybar/bar.c
index fb417095..ea0141cc 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -69,11 +69,19 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                         break;
                 }
         }
+        int max_scale = 1;
+        struct swaybar_output *_output;
+        wl_list_for_each(_output, &bar->outputs, link) {
+                if (_output->scale > max_scale) {
+                        max_scale = _output->scale;
+                }
+        }
+        wl_surface_set_buffer_scale(pointer->cursor_surface, max_scale);
         wl_surface_attach(pointer->cursor_surface,
                         wl_cursor_image_get_buffer(pointer->cursor_image), 0, 0);
         wl_pointer_set_cursor(wl_pointer, serial, pointer->cursor_surface,
-                        pointer->cursor_image->hotspot_x,
-                        pointer->cursor_image->hotspot_y);
+                        pointer->cursor_image->hotspot_x / max_scale,
+                        pointer->cursor_image->hotspot_y / max_scale);
         wl_surface_commit(pointer->cursor_surface);
 }
 
@@ -103,10 +111,12 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
         }
         struct swaybar_hotspot *hotspot;
         wl_list_for_each(hotspot, &output->hotspots, link) {
-                if (pointer->x >= hotspot->x
-                                && pointer->y >= hotspot->y
-                                && pointer->x < hotspot->x + hotspot->width
-                                && pointer->y < hotspot->y + hotspot->height) {
+                double x = pointer->x * output->scale;
+                double y = pointer->y * output->scale;
+                if (x >= hotspot->x
+                                && y >= hotspot->y
+                                && x < hotspot->x + hotspot->width
+                                && y < hotspot->y + hotspot->height) {
                         hotspot->callback(output, pointer->x, pointer->y,
                                         button, hotspot->data);
                 }
@@ -197,12 +207,43 @@ const struct wl_seat_listener seat_listener = {
         .name = seat_handle_name,
 };
 
+static void output_geometry(void *data, struct wl_output *output, int32_t x,
+                int32_t y, int32_t width_mm, int32_t height_mm, int32_t subpixel,
+                const char *make, const char *model, int32_t transform) {
+        // Who cares
+}
+
+static void output_mode(void *data, struct wl_output *output, uint32_t flags,
+                int32_t width, int32_t height, int32_t refresh) {
+        // Who cares
+}
+
+static void output_done(void *data, struct wl_output *output) {
+        // Who cares
+}
+
+static void output_scale(void *data, struct wl_output *wl_output,
+                int32_t factor) {
+        struct swaybar_output *output = data;
+        output->scale = factor;
+        if (output->surface) {
+                render_frame(output->bar, output);
+        }
+}
+
+struct wl_output_listener output_listener = {
+        .geometry = output_geometry,
+        .mode = output_mode,
+        .done = output_done,
+        .scale = output_scale,
+};
+
 static void handle_global(void *data, struct wl_registry *registry,
                 uint32_t name, const char *interface, uint32_t version) {
         struct swaybar *bar = data;
         if (strcmp(interface, wl_compositor_interface.name) == 0) {
                 bar->compositor = wl_registry_bind(registry, name,
-                                &wl_compositor_interface, 1);
+                                &wl_compositor_interface, 3);
         } else if (strcmp(interface, wl_seat_interface.name) == 0) {
                 bar->seat = wl_registry_bind(registry, name,
                                 &wl_seat_interface, 1);
@@ -216,7 +257,9 @@ static void handle_global(void *data, struct wl_registry *registry,
                         calloc(1, sizeof(struct swaybar_output));
                 output->bar = bar;
                 output->output = wl_registry_bind(registry, name,
-                                &wl_output_interface, 1);
+                                &wl_output_interface, 3);
+                wl_output_add_listener(output->output, &output_listener, output);
+                output->scale = 1;
                 output->index = index++;
                 wl_list_init(&output->workspaces);
                 wl_list_init(&output->hotspots);
@@ -256,24 +299,36 @@ void bar_setup(struct swaybar *bar,
                 bar->status = status_line_init(bar->config->status_command);
         }
 
-        assert(bar->display = wl_display_connect(NULL));
+        bar->display = wl_display_connect(NULL);
+        assert(bar->display);
 
         struct wl_registry *registry = wl_display_get_registry(bar->display);
         wl_registry_add_listener(registry, &registry_listener, bar);
         wl_display_roundtrip(bar->display);
         assert(bar->compositor && bar->layer_shell && bar->shm);
+        wl_display_roundtrip(bar->display);
+
         struct swaybar_pointer *pointer = &bar->pointer;
 
-        assert(pointer->cursor_theme = wl_cursor_theme_load(NULL, 16, bar->shm));
+        int max_scale = 1;
+        struct swaybar_output *output;
+        wl_list_for_each(output, &bar->outputs, link) {
+                if (output->scale > max_scale) {
+                        max_scale = output->scale;
+                }
+        }
+
+        pointer->cursor_theme = wl_cursor_theme_load(
+                                NULL, 24 * max_scale, bar->shm);
+        assert(pointer->cursor_theme);
         struct wl_cursor *cursor;
-        assert(cursor = wl_cursor_theme_get_cursor(
-                                pointer->cursor_theme, "left_ptr"));
+        cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr");
+        assert(cursor);
         pointer->cursor_image = cursor->images[0];
-        assert(pointer->cursor_surface =
-                        wl_compositor_create_surface(bar->compositor));
+        pointer->cursor_surface = wl_compositor_create_surface(bar->compositor);
+        assert(pointer->cursor_surface);
 
         // TODO: we might not necessarily be meant to do all of the outputs
-        struct swaybar_output *output;
         wl_list_for_each(output, &bar->outputs, link) {
                 struct config_output *coutput;
                 wl_list_for_each(coutput, &bar->config->outputs, link) {
@@ -281,8 +336,8 @@ void bar_setup(struct swaybar *bar,
                                 continue;
                         }
                         output->name = strdup(coutput->name);
-                        assert(output->surface = wl_compositor_create_surface(
-                                        bar->compositor));
+                        output->surface = wl_compositor_create_surface(bar->compositor);
+                        assert(output->surface);
                         output->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
                                         bar->layer_shell, output->surface, output->output,
                                         ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "panel");
diff --git a/swaybar/render.c b/swaybar/render.c
index 6f3b0788..be58301d 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -14,55 +14,72 @@
 #include "swaybar/status_line.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
-static const int ws_horizontal_padding = 5;
-static const double ws_vertical_padding = 1.5;
-static const double border_width = 1;
+static const int WS_HORIZONTAL_PADDING = 5;
+static const double WS_VERTICAL_PADDING = 1.5;
+static const double BORDER_WIDTH = 1;
 
 static uint32_t render_status_line_error(cairo_t *cairo,
-                struct swaybar_config *config, const char *error,
-                double *x, uint32_t width, uint32_t height) {
+                struct swaybar_output *output, struct swaybar_config *config,
+                const char *error, double *x, uint32_t surface_height) {
         if (!error) {
                 return 0;
         }
+
+        uint32_t height = surface_height * output->scale;
+
         cairo_set_source_u32(cairo, 0xFF0000FF);
-        static const int margin = 3;
+
+        int margin = 3 * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
+
         int text_width, text_height;
         get_text_size(cairo, config->font,
-                        &text_width, &text_height, 1, false, "%s", error);
+                        &text_width, &text_height, output->scale, false, "%s", error);
+
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
         if (height < ideal_height) {
-                return ideal_height;
+                return ideal_height / output->scale;
         }
         *x -= text_width + margin;
+
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_move_to(cairo, *x, (int)floor(text_y));
-        pango_printf(cairo, config->font, 1, false, "%s", error);
+        pango_printf(cairo, config->font, output->scale, false, "%s", error);
         *x -= margin;
-        return ideal_height;
+        return ideal_height / output->scale;
 }
 
 static uint32_t render_status_line_text(cairo_t *cairo,
-                struct swaybar_config *config, const char *text,
-                bool focused, double *x, uint32_t width, uint32_t height) {
+                struct swaybar_output *output, struct swaybar_config *config,
+                const char *text, bool focused, double *x, uint32_t surface_height) {
         if (!text) {
                 return 0;
         }
+
+        uint32_t height = surface_height * output->scale;
+
         cairo_set_source_u32(cairo, focused ?
                         config->colors.focused_statusline : config->colors.statusline);
-        static const int margin = 3;
+
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height,
-                        1, config->pango_markup, "%s", text);
+                        output->scale, config->pango_markup, "%s", text);
+
+        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
+        int margin = 3 * output->scale;
+
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
         if (height < ideal_height) {
-                return ideal_height;
+                return ideal_height / output->scale;
         }
+
         *x -= text_width + margin;
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_move_to(cairo, *x, (int)floor(text_y));
-        pango_printf(cairo, config->font, 1, config->pango_markup, "%s", text);
+        pango_printf(cairo, config->font, output->scale,
+                        config->pango_markup, "%s", text);
         *x -= margin;
-        return ideal_height;
+        return ideal_height / output->scale;
 }
 
 static void render_sharp_line(cairo_t *cairo, uint32_t color,
@@ -99,23 +116,29 @@ static void block_hotspot_callback(struct swaybar_output *output,
 static uint32_t render_status_block(cairo_t *cairo,
                 struct swaybar_config *config, struct swaybar_output *output,
                 struct i3bar_block *block, double *x,
-                uint32_t height, bool focused, bool edge) {
-        static const int margin = 3;
+                uint32_t surface_height, bool focused, bool edge) {
         if (!block->full_text || !*block->full_text) {
                 return 0;
         }
 
+        uint32_t height = surface_height * output->scale;
+
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height,
-                        1, block->markup, "%s", block->full_text);
+                        output->scale, block->markup, "%s", block->full_text);
+
+        int margin = 3 * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING * 2;
+
         int width = text_width;
         if (width < block->min_width) {
                 width = block->min_width;
         }
+
         double block_width = width;
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
         if (height < ideal_height) {
-                return ideal_height;
+                return ideal_height / output->scale;
         }
 
         *x -= width;
@@ -133,10 +156,10 @@ static uint32_t render_status_block(cairo_t *cairo,
                 if (config->sep_symbol) {
                         int _height;
                         get_text_size(cairo, config->font, &sep_width, &_height,
-                                        1, false, "%s", config->sep_symbol);
+                                        output->scale, false, "%s", config->sep_symbol);
                         uint32_t _ideal_height = _height + ws_vertical_padding * 2;
-                        if (height < _ideal_height) {
-                                return _height;
+                        if ((uint32_t)_height < _ideal_height / output->scale) {
+                                return _height / output->scale;
                         }
                         if (sep_width > block->separator_block_width) {
                                 block->separator_block_width = sep_width + margin * 2;
@@ -160,22 +183,26 @@ static uint32_t render_status_block(cairo_t *cairo,
         double pos = *x;
         if (block->background) {
                 cairo_set_source_u32(cairo, block->background);
-                cairo_rectangle(cairo, pos - 0.5, 1, block_width, height);
+                cairo_rectangle(cairo, pos - 0.5 * output->scale,
+                                output->scale, block_width, height);
                 cairo_fill(cairo);
         }
 
         if (block->border && block->border_top > 0) {
                 render_sharp_line(cairo, block->border,
-                                pos - 0.5, 1, block_width, block->border_top);
+                                pos - 0.5 * output->scale, output->scale,
+                                block_width, block->border_top);
         }
         if (block->border && block->border_bottom > 0) {
                 render_sharp_line(cairo, block->border,
-                                pos - 0.5, height - 1 - block->border_bottom,
+                                pos - 0.5 * output->scale,
+                                height - output->scale - block->border_bottom,
                                 block_width, block->border_bottom);
         }
         if (block->border != 0 && block->border_left > 0) {
                 render_sharp_line(cairo, block->border,
-                                pos - 0.5, 1, block->border_left, height);
+                                pos - 0.5 * output->scale, output->scale,
+                                block->border_left, height);
                 pos += block->border_left + margin;
         }
 
@@ -190,13 +217,15 @@ static uint32_t render_status_block(cairo_t *cairo,
         cairo_move_to(cairo, offset, height / 2.0 - text_height / 2.0);
         uint32_t color = block->color ?  *block->color : config->colors.statusline;
         cairo_set_source_u32(cairo, color);
-        pango_printf(cairo, config->font, 1, block->markup, "%s", block->full_text);
+        pango_printf(cairo, config->font, output->scale,
+                        block->markup, "%s", block->full_text);
         pos += width;
 
         if (block->border && block->border_right > 0) {
                 pos += margin;
                 render_sharp_line(cairo, block->border,
-                                pos - 0.5, 1, block->border_right, height);
+                                pos - 0.5 * output->scale, output->scale,
+                                block->border_right, height);
                 pos += block->border_right;
         }
 
@@ -209,7 +238,7 @@ static uint32_t render_status_block(cairo_t *cairo,
                 if (config->sep_symbol) {
                         offset = pos + (block->separator_block_width - sep_width) / 2;
                         cairo_move_to(cairo, offset, margin);
-                        pango_printf(cairo, config->font, 1, false,
+                        pango_printf(cairo, config->font, output->scale, false,
                                         "%s", config->sep_symbol);
                 } else {
                         cairo_set_line_width(cairo, 1);
@@ -220,19 +249,19 @@ static uint32_t render_status_block(cairo_t *cairo,
                         cairo_stroke(cairo);
                 }
         }
-        return ideal_height;
+        return ideal_height / output->scale;
 }
 
 static uint32_t render_status_line_i3bar(cairo_t *cairo,
                 struct swaybar_config *config, struct swaybar_output *output,
                 struct status_line *status, bool focused,
-                double *x, uint32_t width, uint32_t height) {
+                double *x, uint32_t surface_height) {
         uint32_t max_height = 0;
         bool edge = true;
         struct i3bar_block *block;
         wl_list_for_each(block, &status->blocks, link) {
                 uint32_t h = render_status_block(cairo, config, output,
-                                block, x, height, focused, edge);
+                                block, x, surface_height, focused, edge);
                 max_height = h > max_height ? h : max_height;
                 edge = false;
         }
@@ -242,17 +271,17 @@ static uint32_t render_status_line_i3bar(cairo_t *cairo,
 static uint32_t render_status_line(cairo_t *cairo,
                 struct swaybar_config *config, struct swaybar_output *output,
                 struct status_line *status, bool focused,
-                double *x, uint32_t width, uint32_t height) {
+                double *x, uint32_t surface_height) {
         switch (status->protocol) {
         case PROTOCOL_ERROR:
-                return render_status_line_error(cairo,
-                                config, status->text, x, width, height);
+                return render_status_line_error(cairo, output, config,
+                                status->text, x, surface_height);
         case PROTOCOL_TEXT:
-                return render_status_line_text(cairo,
-                                config, status->text, focused, x, width, height);
+                return render_status_line_text(cairo, output, config,
+                                status->text, focused, x, surface_height);
         case PROTOCOL_I3BAR:
-                return render_status_line_i3bar(cairo, config, output, status,
-                                focused, x, width, height);
+                return render_status_line_i3bar(cairo, config, output,
+                                status, focused, x, surface_height);
         case PROTOCOL_UNDEF:
                 return 0;
         }
@@ -260,15 +289,23 @@ static uint32_t render_status_line(cairo_t *cairo,
 }
 
 static uint32_t render_binding_mode_indicator(cairo_t *cairo,
-                struct swaybar_config *config, const char *mode, double x,
-                uint32_t height) {
+                struct swaybar_output *output, struct swaybar_config *config,
+                const char *mode, double x, uint32_t surface_height) {
+
+        uint32_t height = surface_height * output->scale;
+
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height,
-                        1, true, "%s", mode);
+                        output->scale, true, "%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;
+
         uint32_t ideal_height = text_height + ws_vertical_padding * 2
                 + border_width * 2;
         if (height < ideal_height) {
-                return ideal_height;
+                return ideal_height / output->scale;
         }
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
 
@@ -289,8 +326,8 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo,
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_set_source_u32(cairo, config->colors.binding_mode.text);
         cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y));
-        pango_printf(cairo, config->font, 1, true, "%s", mode);
-        return ideal_height;
+        pango_printf(cairo, config->font, output->scale, true, "%s", mode);
+        return ideal_height / output->scale;
 }
 
 static const char *strip_workspace_number(const char *ws_name) {
@@ -313,7 +350,7 @@ static void workspace_hotspot_callback(struct swaybar_output *output,
 
 static uint32_t render_workspace_button(cairo_t *cairo,
                 struct swaybar_output *output, struct swaybar_config *config,
-                struct swaybar_workspace *ws, double *x, uint32_t height) {
+                struct swaybar_workspace *ws, double *x, uint32_t surface_height) {
         const char *name = ws->name;
         if (config->strip_workspace_numbers) {
                 name = strip_workspace_number(ws->name);
@@ -330,14 +367,22 @@ static uint32_t render_workspace_button(cairo_t *cairo,
                 box_colors = config->colors.inactive_workspace;
         }
 
+        uint32_t height = surface_height * output->scale;
+
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height,
-                        1, true, "%s", name);
+                        output->scale, true, "%s", name);
+
+        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;
+
         uint32_t ideal_height = ws_vertical_padding * 2 + text_height
                 + border_width * 2;
         if (height < ideal_height) {
-                return ideal_height;
+                return ideal_height / output->scale;
         }
+
         uint32_t width = ws_horizontal_padding * 2 + text_width + border_width * 2;
 
         cairo_set_source_u32(cairo, box_colors.background);
@@ -357,7 +402,7 @@ static uint32_t render_workspace_button(cairo_t *cairo,
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_set_source_u32(cairo, box_colors.text);
         cairo_move_to(cairo, *x + width / 2 - text_width / 2, (int)floor(text_y));
-        pango_printf(cairo, config->font, 1, true, "%s", name);
+        pango_printf(cairo, config->font, output->scale, true, "%s", name);
 
         struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
         hotspot->x = *x;
@@ -370,7 +415,7 @@ static uint32_t render_workspace_button(cairo_t *cairo,
         wl_list_insert(&output->hotspots, &hotspot->link);
 
         *x += width;
-        return height;
+        return height / output->scale;
 }
 
 static uint32_t render_to_cairo(cairo_t *cairo,
@@ -394,7 +439,13 @@ static uint32_t render_to_cairo(cairo_t *cairo,
          * height is too tall, the render function should adapt its drawing to
          * utilize the available space.
          */
-        double x = 0;
+        double x = output->width * output->scale;
+        if (bar->status) {
+                uint32_t h = render_status_line(cairo, config, output,
+                                bar->status, output->focused, &x, output->height);
+                max_height = h > max_height ? h : max_height;
+        }
+        x = 0;
         if (config->workspace_buttons) {
                 struct swaybar_workspace *ws;
                 wl_list_for_each_reverse(ws, &output->workspaces, link) {
@@ -404,14 +455,8 @@ static uint32_t render_to_cairo(cairo_t *cairo,
                 }
         }
         if (config->binding_mode_indicator && config->mode) {
-                uint32_t h = render_binding_mode_indicator(
-                                cairo, config, config->mode, x, output->height);
-                max_height = h > max_height ? h : max_height;
-        }
-        x = output->width;
-        if (bar->status) {
-                uint32_t h = render_status_line(cairo, config, output, bar->status,
-                                output->focused, &x, output->width, output->height);
+                uint32_t h = render_binding_mode_indicator(cairo,
+                                output, config, config->mode, x, output->height);
                 max_height = h > max_height ? h : max_height;
         }
 
@@ -451,7 +496,9 @@ void render_frame(struct swaybar *bar, struct swaybar_output *output) {
         } else {
                 // Replay recording into shm and send it off
                 output->current_buffer = get_next_buffer(bar->shm,
-                                output->buffers, output->width, output->height);
+                                output->buffers,
+                                output->width * output->scale,
+                                output->height * output->scale);
                 cairo_t *shm = output->current_buffer->cairo;
 
                 cairo_save(shm);
@@ -462,9 +509,11 @@ void render_frame(struct swaybar *bar, struct swaybar_output *output) {
                 cairo_set_source_surface(shm, recorder, 0.0, 0.0);
                 cairo_paint(shm);
 
+                wl_surface_set_buffer_scale(output->surface, output->scale);
                 wl_surface_attach(output->surface,
                                 output->current_buffer->buffer, 0, 0);
-                wl_surface_damage(output->surface, 0, 0, output->width, output->height);
+                wl_surface_damage(output->surface, 0, 0,
+                                output->width, output->height);
                 wl_surface_commit(output->surface);
                 wl_display_roundtrip(bar->display);
         }