circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Add prompt-cursor-colour and prompt-cursor-style to set the style of the

Browse Source 
cursor in the command prompt and remove the emulated cursor, from
Alexander Arch in GitHub issue 4170.
This commit is contained in:
nicm
2024-10-07 12:58:36 +00:00
parent a3dea81b49
commit 735082b7c2
4 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
server-client.c
View File

@ -2473,7 +2473,7 @@ server_client_reset_state(struct client *c)
/* Move cursor to pane cursor and offset. */
if (c->prompt_string != NULL) {
n = options_get_number(c->session->options, "status-position");
n = options_get_number(oo, "status-position");
if (n == 0)
cy = 0;
else {
@ -2484,22 +2484,37 @@ server_client_reset_state(struct client *c)
cy = tty->sy - n;
}
cx = c->prompt_cursor;
mode &= ~MODE_CURSOR;
} else if (c->overlay_draw == NULL) {
cursor = 0;
tty_window_offset(tty, &ox, &oy, &sx, &sy);
if (wp->xoff + s->cx >= ox && wp->xoff + s->cx <= ox + sx &&
wp->yoff + s->cy >= oy && wp->yoff + s->cy <= oy + sy) {
cursor = 1;
cx = wp->xoff + s->cx - ox;
cy = wp->yoff + s->cy - oy;
n = options_get_number(oo, "prompt-cursor-colour");
s->default_ccolour = n;
n = options_get_number(oo, "prompt-cursor-style");
screen_set_cursor_style(n, &s->default_cstyle,
&s->default_mode);
} else {
n = options_get_number(wp->options, "cursor-colour");
s->default_ccolour = n;
n = options_get_number(wp->options, "cursor-style");
screen_set_cursor_style(n, &s->default_cstyle,
&s->default_mode);
if (status_at_line(c) == 0)
cy += status_line_size(c);
if (c->overlay_draw == NULL) {
cursor = 0;
tty_window_offset(tty, &ox, &oy, &sx, &sy);
if (wp->xoff + s->cx >= ox &&
wp->xoff + s->cx <= ox + sx &&
wp->yoff + s->cy >= oy &&
wp->yoff + s->cy <= oy + sy) {
cursor = 1;
cx = wp->xoff + s->cx - ox;
cy = wp->yoff + s->cy - oy;
if (status_at_line(c) == 0)
cy += status_line_size(c);
}
if (!cursor)
mode &= ~MODE_CURSOR;
}
if (!cursor)
mode &= ~MODE_CURSOR;
}
log_debug("%s: cursor to %u,%u", __func__, cx, cy);
tty_cursor(tty, cx, cy);