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

Calculate the space available for the prompt buffer and the cursor position

Browse Source 
correctly, and make it work when the screen is not wide enough.

Noticed by Kalle Olavi Niemitalo.
This commit is contained in:
Nicholas Marriott
2009-07-26 21:13:47 +00:00
parent 6b3b852ebc
commit 55d8c01c33
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
status.c
View File

@ -645,7 +645,7 @@ status_prompt_redraw(struct client *c)
struct screen_write_ctx ctx;
struct session *s = c->session;
struct screen old_status;
size_t i, size, left, len, offset, n;
size_t i, size, left, len, off, n;
char ch;
struct grid_cell gc;
@ -653,7 +653,7 @@ status_prompt_redraw(struct client *c)
return (0);
memcpy(&old_status, &c->status, sizeof old_status);
screen_init(&c->status, c->tty.sx, 1, 0);
offset = 0;
off = 0;
len = strlen(c->prompt_string);
if (len > c->tty.sx)
@ -674,7 +674,7 @@ status_prompt_redraw(struct client *c)
if (c->prompt_index < left)
size = strlen(c->prompt_buffer);
else {
offset = c->prompt_index - left - 1;
off = c->prompt_index - left + 1;
if (c->prompt_index == strlen(c->prompt_buffer))
left--;
size = left;
@ -687,27 +687,27 @@ status_prompt_redraw(struct client *c)
screen_write_putc(&ctx, &gc, '*');
} else {
screen_write_puts(&ctx, &gc,
"%.*s", (int) left, c->prompt_buffer + offset);
"%.*s", (int) left, c->prompt_buffer + off);
}
for (i = len + size; i < c->tty.sx; i++)
screen_write_putc(&ctx, &gc, ' ');
}
/* Draw a fake cursor. */
screen_write_cursormove(&ctx, len + c->prompt_index - offset, 0);
if (c->prompt_index == strlen(c->prompt_buffer))
ch = ' ';
else {
if (c->prompt_flags & PROMPT_HIDDEN)
ch = '*';
else
ch = c->prompt_buffer[c->prompt_index];
/* Draw a fake cursor. */
screen_write_cursormove(&ctx, len + c->prompt_index - off, 0);
if (c->prompt_index == strlen(c->prompt_buffer))
ch = ' ';
else {
if (c->prompt_flags & PROMPT_HIDDEN)
ch = '*';
else
ch = c->prompt_buffer[c->prompt_index];
}
if (ch == '\0')
ch = ' ';
gc.attr ^= GRID_ATTR_REVERSE;
screen_write_putc(&ctx, &gc, ch);
}
if (ch == '\0')
ch = ' ';
gc.attr ^= GRID_ATTR_REVERSE;
screen_write_putc(&ctx, &gc, ch);
screen_write_stop(&ctx);