diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-01-31 21:39:56 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-01-31 21:39:56 +0000 |
| commit | d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987 (patch) | |
| tree | 397f4999444c2eef367f884b815bec2a14697c3c /window-choose.c | |
| parent | cbf9224c5f7bcf07352f6ea128c90c12cb0af22e (diff) | |
| parent | 9f02feb9d089b1a4639afb52ab0e8212eeb55a7c (diff) | |
| download | rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.gz rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.bz2 rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-server-info.c
cmd-start-server.c
Diffstat (limited to 'window-choose.c')
| -rw-r--r-- | window-choose.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/window-choose.c b/window-choose.c index 572581a5..7b2b32b9 100644 --- a/window-choose.c +++ b/window-choose.c @@ -345,8 +345,7 @@ window_choose_collapse(struct window_pane *wp, struct session *s) * assign the actual result we want to render and copy the new one over * the top of it. */ - for (i = 0; i < ARRAY_LENGTH(&data->list); i++) - { + for (i = 0; i < ARRAY_LENGTH(&data->list); i++) { item = &ARRAY_ITEM(&data->list, i); wcd = item->wcd; @@ -737,7 +736,7 @@ window_choose_write_line( utf8flag = options_get_number(&wp->window->options, "utf8"); memcpy(&gc, &grid_default_cell, sizeof gc); if (data->selected == data->top + py) - window_mode_attrs(&gc, oo); + style_apply(&gc, oo, "mode-style"); screen_write_cursormove(ctx, 0, py); if (data->top + py < ARRAY_LENGTH(&data->list)) { @@ -764,7 +763,7 @@ window_choose_write_line( screen_write_putc(ctx, &gc, ' '); if (data->input_type != WINDOW_CHOOSE_NORMAL) { - window_mode_attrs(&gc, oo); + style_apply(&gc, oo, "mode-style"); xoff = xsnprintf(hdr, sizeof hdr, "%s: %s", data->input_prompt, data->input_str); |