Merge and fix conflicts.

This commit is contained in:
Michael Grant
2026-10-10 10:16:38 +02:00
150 changed files with 8083 additions and 1084 deletions

View File

@@ -252,7 +252,7 @@ tty_kitty_function(u_int number, char final)
int
tty_keys_kitty_query(struct tty *tty, const char *buf, size_t len,
size_t *size)
size_t *size, int apply)
{
struct client *c = tty->client;
size_t i;
@@ -286,6 +286,9 @@ tty_keys_kitty_query(struct tty *tty, const char *buf, size_t len,
return (-1);
*size = i + 1;
if (!apply)
return (0);
tty->kitty_keys = flags;
tty->flags |= TTY_HAVEKKB;
log_debug("%s: received Kitty keyboard flags %u", c->name, flags);