From 0e2cc0af3049c6d1b91bda3081238e2e723e81b7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 15 May 2018 13:14:18 +1000 Subject: Implement show_marks --- sway/tree/view.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index 833345c5..e26159d2 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -746,6 +746,7 @@ bool view_find_and_unmark(char *mark) { if (strcmp(view_mark, mark) == 0) { free(view_mark); list_del(view->marks, i); + view_update_marks_textures(view); return true; } } @@ -769,3 +770,80 @@ bool view_has_mark(struct sway_view *view, char *mark) { } return false; } + +static void update_marks_texture(struct sway_view *view, + struct wlr_texture **texture, struct border_colors *class) { + struct sway_container *output = container_parent(view->swayc, C_OUTPUT); + if (!output) { + return; + } + if (*texture) { + wlr_texture_destroy(*texture); + } + if (!view->marks->length) { + return; + } + + size_t len = 0; + for (int i = 0; i < view->marks->length; ++i) { + len += strlen((char *)view->marks->items[i]) + 2; + } + char *buffer = calloc(len + 1, 1); + char *part = malloc(len + 1); + + for (int i = 0; i < view->marks->length; ++i) { + char *mark = view->marks->items[i]; + sprintf(part, "[%s]", mark); + strcat(buffer, part); + } + free(part); + + double scale = output->sway_output->wlr_output->scale; + int width = 0; + int height = config->font_height * scale; + + cairo_t *c = cairo_create(NULL); + get_text_size(c, config->font, &width, NULL, scale, false, "%s", buffer); + cairo_destroy(c); + + cairo_surface_t *surface = cairo_image_surface_create( + CAIRO_FORMAT_ARGB32, width, height); + cairo_t *cairo = cairo_create(surface); + cairo_set_source_rgba(cairo, class->background[0], class->background[1], + class->background[2], class->background[3]); + cairo_paint(cairo); + PangoContext *pango = pango_cairo_create_context(cairo); + 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, scale, false, "%s", buffer); + + cairo_surface_flush(surface); + unsigned char *data = cairo_image_surface_get_data(surface); + int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width); + struct wlr_renderer *renderer = wlr_backend_get_renderer( + output->sway_output->wlr_output->backend); + *texture = wlr_texture_from_pixels( + renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data); + cairo_surface_destroy(surface); + g_object_unref(pango); + cairo_destroy(cairo); + free(buffer); +} + +void view_update_marks_textures(struct sway_view *view) { + if (!config->show_marks) { + return; + } + update_marks_texture(view, &view->marks_focused, + &config->border_colors.focused); + update_marks_texture(view, &view->marks_focused_inactive, + &config->border_colors.focused_inactive); + update_marks_texture(view, &view->marks_unfocused, + &config->border_colors.unfocused); + update_marks_texture(view, &view->marks_urgent, + &config->border_colors.urgent); + container_damage_whole(view->swayc); +} -- cgit v1.2.3 From 5384fdcbc64c90be01dcfe4067dd9a2a9328f053 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 15 May 2018 14:35:25 +1000 Subject: Don't show marks which start with an underscore --- sway/tree/view.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index e26159d2..8db5c9d5 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -786,15 +786,20 @@ static void update_marks_texture(struct sway_view *view, size_t len = 0; for (int i = 0; i < view->marks->length; ++i) { - len += strlen((char *)view->marks->items[i]) + 2; + char *mark = view->marks->items[i]; + if (mark[0] != '_') { + len += strlen(mark) + 2; + } } char *buffer = calloc(len + 1, 1); char *part = malloc(len + 1); for (int i = 0; i < view->marks->length; ++i) { char *mark = view->marks->items[i]; - sprintf(part, "[%s]", mark); - strcat(buffer, part); + if (mark[0] != '_') { + sprintf(part, "[%s]", mark); + strcat(buffer, part); + } } free(part); -- cgit v1.2.3 From b351d0a64a9d545cdfe1fe1821858cbda1f5fa4e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 15 May 2018 14:35:54 +1000 Subject: Set textures to null when destroying --- sway/tree/view.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index 8db5c9d5..aaca8753 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -779,6 +779,7 @@ static void update_marks_texture(struct sway_view *view, } if (*texture) { wlr_texture_destroy(*texture); + *texture = NULL; } if (!view->marks->length) { return; -- cgit v1.2.3 From 69ac7f73e74a8c6c40991ef8ad3e90c6a35f7fa7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 15 May 2018 14:48:19 +1000 Subject: Destroy marks textures when view destroyed --- sway/tree/view.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index aaca8753..c0984ca4 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -43,6 +43,14 @@ void view_destroy(struct sway_view *view) { } list_free(view->marks); + if (view->marks_focused) { + // If one is set then all of these are set + wlr_texture_destroy(view->marks_focused); + wlr_texture_destroy(view->marks_focused_inactive); + wlr_texture_destroy(view->marks_unfocused); + wlr_texture_destroy(view->marks_urgent); + } + container_destroy(view->swayc); if (view->impl->destroy) { -- cgit v1.2.3 From ebb0d051db2f73fd13a4e844a51e70f09703372a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 15 May 2018 23:29:54 +1000 Subject: Fix many border opacity issues --- sway/tree/view.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index c0984ca4..648c1655 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -43,13 +43,10 @@ void view_destroy(struct sway_view *view) { } list_free(view->marks); - if (view->marks_focused) { - // If one is set then all of these are set - wlr_texture_destroy(view->marks_focused); - wlr_texture_destroy(view->marks_focused_inactive); - wlr_texture_destroy(view->marks_unfocused); - wlr_texture_destroy(view->marks_urgent); - } + wlr_texture_destroy(view->marks_focused); + wlr_texture_destroy(view->marks_focused_inactive); + wlr_texture_destroy(view->marks_unfocused); + wlr_texture_destroy(view->marks_urgent); container_destroy(view->swayc); @@ -803,6 +800,11 @@ static void update_marks_texture(struct sway_view *view, char *buffer = calloc(len + 1, 1); char *part = malloc(len + 1); + if (!sway_assert(buffer && part, "Unable to allocate memory")) { + free(buffer); + return; + } + for (int i = 0; i < view->marks->length; ++i) { char *mark = view->marks->items[i]; if (mark[0] != '_') { -- cgit v1.2.3