diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-11-25 22:25:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-25 22:25:12 -0500 |
commit | 0e6e5af9833bcfac30d4a19d7fa5b88e81ce67cd (patch) | |
tree | e9adc86b8fda0667758e48f56da13a67ba1b1ba4 | |
parent | Merge pull request #3184 from kupospelov/fix-resize (diff) | |
parent | Fix pango title escaping (diff) | |
download | sway-0e6e5af9833bcfac30d4a19d7fa5b88e81ce67cd.tar.gz sway-0e6e5af9833bcfac30d4a19d7fa5b88e81ce67cd.tar.zst sway-0e6e5af9833bcfac30d4a19d7fa5b88e81ce67cd.zip |
Merge pull request #3183 from emersion/fix-escape-pango
Fix pango title escaping
-rw-r--r-- | sway/tree/view.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 63bb8e26..febba3b9 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -835,11 +835,10 @@ static size_t append_prop(char *buffer, const char *value) { | |||
835 | if (!value) { | 835 | if (!value) { |
836 | return 0; | 836 | return 0; |
837 | } | 837 | } |
838 | // if using pango_markup in font, we need to escape all markup char | 838 | // If using pango_markup in font, we need to escape all markup chars |
839 | // from values to avoid messing with pango markup | 839 | // from values to make sure tags are not inserted by clients |
840 | if (!config->pango_markup) { | 840 | if (config->pango_markup) { |
841 | char *escaped_value = escape_pango_markup(value); | 841 | char *escaped_value = escape_pango_markup(value); |
842 | |||
843 | lenient_strcat(buffer, escaped_value); | 842 | lenient_strcat(buffer, escaped_value); |
844 | size_t len = strlen(escaped_value); | 843 | size_t len = strlen(escaped_value); |
845 | free(escaped_value); | 844 | free(escaped_value); |
@@ -856,11 +855,7 @@ static size_t append_prop(char *buffer, const char *value) { | |||
856 | */ | 855 | */ |
857 | static size_t parse_title_format(struct sway_view *view, char *buffer) { | 856 | static size_t parse_title_format(struct sway_view *view, char *buffer) { |
858 | if (!view->title_format || strcmp(view->title_format, "%title") == 0) { | 857 | if (!view->title_format || strcmp(view->title_format, "%title") == 0) { |
859 | const char *title = view_get_title(view); | 858 | return append_prop(buffer, view_get_title(view)); |
860 | if (buffer && title) { | ||
861 | strcpy(buffer, title); | ||
862 | } | ||
863 | return title ? strlen(title) : 0; | ||
864 | } | 859 | } |
865 | 860 | ||
866 | size_t len = 0; | 861 | size_t len = 0; |