From b667298a0a1efead7949715a31ec86fe3b8b1cda Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 2 May 2018 23:07:52 +1000 Subject: Render titles --- include/sway/config.h | 4 +++- include/sway/tree/container.h | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/sway/config.h b/include/sway/config.h index a0113e98..02ae3b63 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -206,7 +206,7 @@ struct bar_config { struct border_colors { float border[4]; float background[4]; - float text[4]; + uint32_t text; /**< uint32_t because that's the format that cairo uses */ float indicator[4]; float child_border[4]; }; @@ -461,6 +461,8 @@ struct bar_config *default_bar_config(void); void free_bar_config(struct bar_config *bar); +int get_font_text_height(char *font); + /* Global config singleton. */ extern struct sway_config *config; diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index d092af49..b508f310 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -85,6 +85,11 @@ struct sway_container { float alpha; + struct wlr_texture *title_focused; + struct wlr_texture *title_focused_inactive; + struct wlr_texture *title_unfocused; + struct wlr_texture *title_urgent; + struct { struct wl_signal destroy; // Raised after the tree updates, but before arrange_windows @@ -191,4 +196,6 @@ struct sway_container *container_reap_empty_recursive( struct sway_container *container_flatten(struct sway_container *container); +void container_update_title_textures(struct sway_container *container); + #endif -- cgit v1.2.3 From 55b307cddfa453fc003350a642a68735bc36e50e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 3 May 2018 15:02:16 +1000 Subject: Calculate config->font_height based on existing container titles --- include/sway/config.h | 9 ++++++-- include/sway/tree/container.h | 9 ++++++++ sway/commands/font.c | 6 ++++- sway/config.c | 30 ++++++++++++++---------- sway/tree/container.c | 53 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 91 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/sway/config.h b/include/sway/config.h index 02ae3b63..345f26a0 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -304,7 +304,7 @@ struct sway_config { enum sway_container_layout default_orientation; enum sway_container_layout default_layout; char *font; - int font_height; + size_t font_height; // Flags bool focus_follows_mouse; @@ -461,7 +461,12 @@ struct bar_config *default_bar_config(void); void free_bar_config(struct bar_config *bar); -int get_font_text_height(char *font); +/** + * Updates the value of config->font_height based on the max title height + * reported by each container. If recalculate is true, the containers will + * recalculate their heights before reporting. + */ +void config_find_font_height(bool recalculate); /* Global config singleton. */ extern struct sway_config *config; diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index b508f310..b07af72c 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -89,6 +89,7 @@ struct sway_container { struct wlr_texture *title_focused_inactive; struct wlr_texture *title_unfocused; struct wlr_texture *title_urgent; + size_t title_height; struct { struct wl_signal destroy; @@ -198,4 +199,12 @@ struct sway_container *container_flatten(struct sway_container *container); void container_update_title_textures(struct sway_container *container); +/** + * Calculate the container's title_height property. + */ +void container_calculate_title_height(struct sway_container *container); + +void container_update_title(struct sway_container *container, + const char *new_title); + #endif diff --git a/sway/commands/font.c b/sway/commands/font.c index 96127055..38ad8880 100644 --- a/sway/commands/font.c +++ b/sway/commands/font.c @@ -2,6 +2,7 @@ #include #include "sway/commands.h" #include "sway/config.h" +#include "sway/tree/arrange.h" #include "log.h" #include "stringop.h" @@ -13,6 +14,9 @@ struct cmd_results *cmd_font(int argc, char **argv) { char *font = join_args(argv, argc); free(config->font); config->font = strdup(font); - config->font_height = get_font_text_height(font); + config_find_font_height(true); + if (!config->reading) { + arrange_root(); + } return cmd_results_new(CMD_SUCCESS, NULL, NULL); } diff --git a/sway/config.c b/sway/config.c index 60b62bbc..0ad9c3a2 100644 --- a/sway/config.c +++ b/sway/config.c @@ -132,17 +132,6 @@ static void destroy_removed_seats(struct sway_config *old_config, } } -int get_font_text_height(char *font) { - cairo_t *cairo = cairo_create(NULL); - int text_height; - get_text_size(cairo, font, NULL, &text_height, 1, false, - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "!@#$%^&*([{|"); - cairo_destroy(cairo); - return text_height; -} - static void set_color(float dest[static 4], uint32_t color) { dest[0] = ((color >> 16) & 0xff) / 255.0; dest[1] = ((color >> 8) & 0xff) / 255.0; @@ -182,7 +171,7 @@ static void config_defaults(struct sway_config *config) { config->default_layout = L_NONE; config->default_orientation = L_NONE; if (!(config->font = strdup("monospace 10"))) goto cleanup; - config->font_height = get_font_text_height(config->font); + config->font_height = 0; // floating view config->floating_maximum_width = 0; @@ -740,3 +729,20 @@ int workspace_output_cmp_workspace(const void *a, const void *b) { const struct workspace_output *wsa = a, *wsb = b; return lenient_strcmp(wsa->workspace, wsb->workspace); } + +static void find_font_height_iterator(struct sway_container *container, + void *data) { + bool *recalculate = data; + if (*recalculate) { + container_calculate_title_height(container); + } + if (container->title_height > config->font_height) { + config->font_height = container->title_height; + } +} + +void config_find_font_height(bool recalculate) { + config->font_height = 0; + container_for_each_descendant_dfs(&root_container, + find_font_height_iterator, &recalculate); +} diff --git a/sway/tree/container.c b/sway/tree/container.c index b33985af..d19f13ae 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -348,7 +348,7 @@ struct sway_container *container_view_create(struct sway_container *sibling, swayc, title, sibling, sibling ? sibling->type : 0, sibling->name); // Setup values swayc->sway_view = sway_view; - swayc->name = title ? strdup(title) : NULL; + container_update_title(swayc, title); swayc->width = 0; swayc->height = 0; @@ -611,3 +611,54 @@ void container_update_title_textures(struct sway_container *container) { update_title_texture(container, &container->title_urgent, &config->border_colors.urgent); } + +void container_calculate_title_height(struct sway_container *container) { + if (!container->name) { + container->title_height = 0; + return; + } + cairo_t *cairo = cairo_create(NULL); + int height; + get_text_size(cairo, config->font, NULL, &height, 1, false, + "%s", container->name); + cairo_destroy(cairo); + container->title_height = height; +} + +static void container_notify_child_title_changed( + struct sway_container *container) { + if (!container || container->type != C_CONTAINER) { + return; + } + if (container->layout != L_TABBED && container->layout != L_STACKED) { + return; + } + if (container->name) { + free(container->name); + } + // TODO: iterate children and concatenate their titles + container->name = strdup(""); + container_calculate_title_height(container); + container_update_title_textures(container); + container_notify_child_title_changed(container->parent); +} + +void container_update_title(struct sway_container *container, + const char *new_title) { + if (container->name && strcmp(container->name, new_title) == 0) { + return; + } + if (container->name) { + free(container->name); + } + container->name = strdup(new_title); + container_calculate_title_height(container); + container_update_title_textures(container); + container_notify_child_title_changed(container->parent); + + size_t prev_max_height = config->font_height; + config_find_font_height(false); + if (config->font_height != prev_max_height) { + arrange_root(); + } +} -- cgit v1.2.3 From d3d1e38c1b39fdbe0357e62cadb2fe57f9cf71a4 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 3 May 2018 15:03:01 +1000 Subject: Change comment format --- include/sway/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/sway/config.h b/include/sway/config.h index 345f26a0..3fb820f0 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -206,7 +206,7 @@ struct bar_config { struct border_colors { float border[4]; float background[4]; - uint32_t text; /**< uint32_t because that's the format that cairo uses */ + uint32_t text; // uint32_t because that's the format that cairo uses float indicator[4]; float child_border[4]; }; -- cgit v1.2.3 From 58a033d8163c922eff8577b34523418c2c2ab432 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 3 May 2018 08:14:17 -0400 Subject: Convert border_colors.text to float[4] --- include/sway/config.h | 2 +- sway/commands/client.c | 2 +- sway/config.c | 10 +++++----- sway/tree/container.c | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/sway/config.h b/include/sway/config.h index 3fb820f0..db942c3f 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -206,7 +206,7 @@ struct bar_config { struct border_colors { float border[4]; float background[4]; - uint32_t text; // uint32_t because that's the format that cairo uses + float text[4]; float indicator[4]; float child_border[4]; }; diff --git a/sway/commands/client.c b/sway/commands/client.c index 0abd0167..d6b7de1a 100644 --- a/sway/commands/client.c +++ b/sway/commands/client.c @@ -64,7 +64,7 @@ static struct cmd_results *handle_command(int argc, char **argv, "Unable to parse background color"); } - if (!parse_color_int(argv[2], &class->text)) { + if (!parse_color_float(argv[2], class->text)) { return cmd_results_new(CMD_INVALID, cmd_name, "Unable to parse text color"); } diff --git a/sway/config.c b/sway/config.c index 0ad9c3a2..5efa0d48 100644 --- a/sway/config.c +++ b/sway/config.c @@ -210,31 +210,31 @@ static void config_defaults(struct sway_config *config) { set_color(config->border_colors.focused.border, 0x4C7899); set_color(config->border_colors.focused.border, 0x4C7899); set_color(config->border_colors.focused.background, 0x285577); - config->border_colors.focused.text = 0xFFFFFFFF; + set_color(config->border_colors.focused.text, 0xFFFFFFFF); set_color(config->border_colors.focused.indicator, 0x2E9EF4); set_color(config->border_colors.focused.child_border, 0x285577); set_color(config->border_colors.focused_inactive.border, 0x333333); set_color(config->border_colors.focused_inactive.background, 0x5F676A); - config->border_colors.focused_inactive.text = 0xFFFFFFFF; + set_color(config->border_colors.focused_inactive.text, 0xFFFFFFFF); set_color(config->border_colors.focused_inactive.indicator, 0x484E50); set_color(config->border_colors.focused_inactive.child_border, 0x5F676A); set_color(config->border_colors.unfocused.border, 0x333333); set_color(config->border_colors.unfocused.background, 0x222222); - config->border_colors.unfocused.text = 0x888888FF; + set_color(config->border_colors.unfocused.text, 0xFFFFFFFF); set_color(config->border_colors.unfocused.indicator, 0x292D2E); set_color(config->border_colors.unfocused.child_border, 0x222222); set_color(config->border_colors.urgent.border, 0x2F343A); set_color(config->border_colors.urgent.background, 0x900000); - config->border_colors.urgent.text = 0xFFFFFFFF; + set_color(config->border_colors.urgent.text, 0xFFFFFFFF); set_color(config->border_colors.urgent.indicator, 0x900000); set_color(config->border_colors.urgent.child_border, 0x900000); set_color(config->border_colors.placeholder.border, 0x000000); set_color(config->border_colors.placeholder.background, 0x0C0C0C); - config->border_colors.placeholder.text = 0xFFFFFFFF; + set_color(config->border_colors.placeholder.text, 0xFFFFFFFF); set_color(config->border_colors.placeholder.indicator, 0x000000); set_color(config->border_colors.placeholder.child_border, 0x0C0C0C); diff --git a/sway/tree/container.c b/sway/tree/container.c index d89019a3..90ca9b2c 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -585,9 +585,10 @@ static void update_title_texture(struct sway_container *con, cairo_set_source_rgba(cairo, class->background[0], class->background[1], class->background[2], class->background[3]); cairo_paint(cairo); - cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); PangoContext *pango = pango_cairo_create_context(cairo); - cairo_set_source_u32(cairo, class->text); + cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); + cairo_set_source_rgba(cairo, class->text[0], class->text[1], + class->text[2], class->text[3]); cairo_move_to(cairo, 0, 0); pango_printf(cairo, config->font, output->sway_output->wlr_output->scale, -- cgit v1.2.3