circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-08 02:56:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	cmd-server-info.c
	cmd-start-server.c
This commit is contained in:
Thomas Adam
2014-01-31 21:39:56 +00:00
parent cbf9224c5f 9f02feb9d0
commit d50e47fc4a
35 changed files with 1414 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
window-choose.c
View File

@ -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);