nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Ingo Bürk 2015-03-21 21:36:15 +01:00
parent 8272924117
commit c9019ada4e
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
i3bar/src/xcb.c
View File

@ -159,7 +159,7 @@ int get_tray_width(struct tc_head *trayclients) {
* Redraws the statusline to the buffer * Redraws the statusline to the buffer
* *
*/ */
void refresh_statusline(void) { void refresh_statusline(bool use_short_text) {
struct status_block *block; struct status_block *block;
uint32_t old_statusline_width = statusline_width; uint32_t old_statusline_width = statusline_width;
@ -167,6 +167,12 @@ void refresh_statusline(void) {
/* Predict the text width of all blocks (in pixels). */ /* Predict the text width of all blocks (in pixels). */
TAILQ_FOREACH(block, &statusline_head, blocks) { 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) if (i3string_get_num_bytes(block->full_text) == 0)
continue; continue;
@ -1760,7 +1766,7 @@ void draw_bars(bool unhide) {
DLOG("Drawing bars...\n"); DLOG("Drawing bars...\n");
int workspace_width = 0; int workspace_width = 0;
refresh_statusline(); refresh_statusline(false);
i3_output *outputs_walk; i3_output *outputs_walk;
SLIST_FOREACH(outputs_walk, outputs, slist) { SLIST_FOREACH(outputs_walk, outputs, slist) {
@ -1904,14 +1910,17 @@ void draw_bars(bool unhide) {
if (!TAILQ_EMPTY(&statusline_head)) { if (!TAILQ_EMPTY(&statusline_head)) {
DLOG("Printing statusline!\n"); 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 /* Luckily we already prepared a seperate pixmap containing the rendered
* statusline, we just have to copy the relevant parts to the relevant * statusline, we just have to copy the relevant parts to the relevant
* position */ * position */
int tray_width = get_tray_width(outputs_walk->trayclients); int visible_statusline_width = MIN(statusline_width, max_statusline_width);
int visible_statusline_width = MIN(statusline_width,
outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px));
xcb_copy_area(xcb_connection, xcb_copy_area(xcb_connection,
statusline_pm, statusline_pm,
outputs_walk->buffer, outputs_walk->buffer,

7
libi3/string.c
View File

@ -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. * Note that this will not free the source string.
*/ */
i3String *i3string_copy(i3String *str) { i3String *i3string_copy(i3String *str) {
if (str->is_markup) i3String *copy = i3string_from_utf8(i3string_as_utf8(str));
return i3string_from_markup(i3string_as_utf8(str)); copy->is_markup = str->is_markup;
else return copy;
return i3string_from_utf8(i3string_as_utf8(str));
} }
/* /*