CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-05-13 16:37:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Support a special key mode for moving cursor at marked prompts

Browse source 
Needed for fish integration because the arrow keys cause auto-complete
to trigger.
This commit is contained in:
Kovid Goyal 2024-03-31 11:19:35 +05:30
parent 0c6fa47789
commit f4fe015261
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kitty/screen.c
View file

@ -1806,11 +1806,17 @@ screen_fake_move_cursor_to_position(Screen *self, index_type start_x, index_type
x = 0;
}
if (count) {
GLFWkeyevent ev = { .key = key, .action = GLFW_PRESS };
char output[KEY_BUFFER_SIZE+1] = {0};
int num = encode_glfw_key_event(&ev, false, 0, output);
if (num != SEND_TEXT_TO_CHILD) {
if (self->prompt_settings.uses_special_keys_for_cursor_movement) {
const char *k = key == GLFW_FKEY_RIGHT ? "0" : "0;1";
int num = snprintf(output, KEY_BUFFER_SIZE, "\x1b[%su", k);
for (unsigned i = 0; i < count; i++) write_to_child(self, output, num);
} else {
GLFWkeyevent ev = { .key = key, .action = GLFW_PRESS };
int num = encode_glfw_key_event(&ev, false, 0, output);
if (num != SEND_TEXT_TO_CHILD) {
for (unsigned i = 0; i < count; i++) write_to_child(self, output, num);
}
}
}
return count > 0;
@ -2279,6 +2285,7 @@ parse_prompt_mark(Screen *self, char *buf, PromptKind *pk) {
if (token == NULL) return;
if (strcmp(token, "k=s") == 0) *pk = SECONDARY_PROMPT;
else if (strcmp(token, "redraw=0") == 0) self->prompt_settings.redraws_prompts_at_all = 0;
else if (strcmp(token, "special_key=1") == 0) self->prompt_settings.uses_special_keys_for_cursor_movement = 1;
}
}
@ -2290,6 +2297,7 @@ shell_prompt_marking(Screen *self, char *buf) {
case 'A': {
PromptKind pk = PROMPT_START;
self->prompt_settings.redraws_prompts_at_all = 1;
self->prompt_settings.uses_special_keys_for_cursor_movement = 0;
parse_prompt_mark(self, buf+1, &pk);
self->linebuf->line_attrs[self->cursor->y].prompt_kind = pk;
if (pk == PROMPT_START)

1
kitty/screen.h
View file

@ -132,6 +132,7 @@ typedef struct {
union {
struct {
unsigned int redraws_prompts_at_all: 1;
unsigned int uses_special_keys_for_cursor_movement: 1;
};
unsigned int val;
} prompt_settings;