From dd488818a979f237c7642a5d4aa9e55c7c5ebbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Sat, 21 Mar 2015 21:33:38 +0100 Subject: [PATCH 1/3] Introduce the short_text property on blocks and parse it according to the documentation. --- i3bar/include/common.h | 1 + i3bar/src/child.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/i3bar/include/common.h b/i3bar/include/common.h index 997a429e..3744df27 100644 --- a/i3bar/include/common.h +++ b/i3bar/include/common.h @@ -35,6 +35,7 @@ typedef enum { * up one status line. */ struct status_block { i3String *full_text; + i3String *short_text; char *color; uint32_t min_width; diff --git a/i3bar/src/child.c b/i3bar/src/child.c index efe02884..521951f5 100644 --- a/i3bar/src/child.c +++ b/i3bar/src/child.c @@ -70,6 +70,7 @@ static void clear_statusline(struct statusline_head *head, bool free_resources) first = TAILQ_FIRST(head); if (free_resources) { I3STRING_FREE(first->full_text); + I3STRING_FREE(first->short_text); FREE(first->color); FREE(first->name); FREE(first->instance); @@ -188,6 +189,9 @@ static int stdin_string(void *context, const unsigned char *val, size_t len) { if (strcasecmp(ctx->last_map_key, "full_text") == 0) { ctx->block.full_text = i3string_from_markup_with_length((const char *)val, len); } + if (strcasecmp(ctx->last_map_key, "short_text") == 0) { + ctx->block.short_text = i3string_from_markup_with_length((const char *)val, len); + } if (strcasecmp(ctx->last_map_key, "color") == 0) { sasprintf(&(ctx->block.color), "%.*s", len, val); } @@ -261,6 +265,7 @@ static int stdin_end_array(void *context) { struct status_block *current; TAILQ_FOREACH(current, &statusline_head, blocks) { DLOG("full_text = %s\n", i3string_as_utf8(current->full_text)); + DLOG("short_text = %s\n", i3string_as_utf8(current->short_text)); DLOG("color = %s\n", current->color); } DLOG("end of dump\n"); From 827292411727f6e2e775380ea54566a703bdb10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Sat, 21 Mar 2015 21:33:53 +0100 Subject: [PATCH 2/3] Introduce a function to copy i3strings --- include/libi3.h | 6 ++++++ libi3/string.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/libi3.h b/include/libi3.h index c1a11dfc..b60dda5c 100644 --- a/include/libi3.h +++ b/include/libi3.h @@ -169,6 +169,12 @@ i3String *i3string_from_markup_with_length(const char *from_markup, size_t num_b */ i3String *i3string_from_ucs2(const xcb_char2b_t *from_ucs2, size_t num_glyphs); +/** + * Copies the given i3string. + * Note that this will not free the source string. + */ +i3String *i3string_copy(i3String *str); + /** * Free an i3String. * diff --git a/libi3/string.c b/libi3/string.c index afeca974..a28cc899 100644 --- a/libi3/string.c +++ b/libi3/string.c @@ -109,6 +109,17 @@ i3String *i3string_from_ucs2(const xcb_char2b_t *from_ucs2, size_t num_glyphs) { return str; } +/** + * Copies the given i3string. + * Note that this will not free the source string. + */ +i3String *i3string_copy(i3String *str) { + if (str->is_markup) + return i3string_from_markup(i3string_as_utf8(str)); + else + return i3string_from_utf8(i3string_as_utf8(str)); +} + /* * Free an i3String. * From c9019ada4e489402eff68b799c817c8c28ab6a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Sat, 21 Mar 2015 21:36:15 +0100 Subject: [PATCH 3/3] Add support for short_text When the statusline is too long, try to use the short_text property of each status block before falling back to truncating it. fixes #1092 --- i3bar/src/xcb.c | 23 ++++++++++++++++------- libi3/string.c | 7 +++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index 96fcb3fa..06eac7ea 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -159,7 +159,7 @@ int get_tray_width(struct tc_head *trayclients) { * Redraws the statusline to the buffer * */ -void refresh_statusline(void) { +void refresh_statusline(bool use_short_text) { struct status_block *block; uint32_t old_statusline_width = statusline_width; @@ -167,6 +167,12 @@ void refresh_statusline(void) { /* Predict the text width of all blocks (in pixels). */ TAILQ_FOREACH(block, &statusline_head, blocks) { + /* Try to use the shorter text if necessary and possible. */ + if (use_short_text && block->short_text != NULL) { + I3STRING_FREE(block->full_text); + block->full_text = i3string_copy(block->short_text); + } + if (i3string_get_num_bytes(block->full_text) == 0) continue; @@ -1760,7 +1766,7 @@ void draw_bars(bool unhide) { DLOG("Drawing bars...\n"); int workspace_width = 0; - refresh_statusline(); + refresh_statusline(false); i3_output *outputs_walk; SLIST_FOREACH(outputs_walk, outputs, slist) { @@ -1904,14 +1910,17 @@ void draw_bars(bool unhide) { if (!TAILQ_EMPTY(&statusline_head)) { DLOG("Printing statusline!\n"); + int tray_width = get_tray_width(outputs_walk->trayclients); + int max_statusline_width = outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px); + + /* If the statusline is too long, try to use short texts. */ + if (statusline_width > max_statusline_width) + refresh_statusline(true); + /* Luckily we already prepared a seperate pixmap containing the rendered * statusline, we just have to copy the relevant parts to the relevant * position */ - int tray_width = get_tray_width(outputs_walk->trayclients); - - int visible_statusline_width = MIN(statusline_width, - outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px)); - + int visible_statusline_width = MIN(statusline_width, max_statusline_width); xcb_copy_area(xcb_connection, statusline_pm, outputs_walk->buffer, diff --git a/libi3/string.c b/libi3/string.c index a28cc899..88fd1986 100644 --- a/libi3/string.c +++ b/libi3/string.c @@ -114,10 +114,9 @@ i3String *i3string_from_ucs2(const xcb_char2b_t *from_ucs2, size_t num_glyphs) { * Note that this will not free the source string. */ i3String *i3string_copy(i3String *str) { - if (str->is_markup) - return i3string_from_markup(i3string_as_utf8(str)); - else - return i3string_from_utf8(i3string_as_utf8(str)); + i3String *copy = i3string_from_utf8(i3string_as_utf8(str)); + copy->is_markup = str->is_markup; + return copy; } /*