mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-02 12:44:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reduce-checks' of https://github.com/rivenirvana/kitty

Browse Source
This commit is contained in:
Kovid Goyal
2026-01-23 09:27:36 +05:30
parent dbcd31f22e 6ae68b793c
commit 6f268bc04b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kitty/screen.c
View File

@@ -4403,7 +4403,7 @@ find_cmd_output(Screen *self, OutputOffset *oo, index_type start_screen_y, unsig
found_prompt = true;
// change direction to downwards to find command output
direction = 1;
} else if (line && line->attrs.prompt_kind == OUTPUT_START && !range_line_is_continued(self, y1)) {
} else if (line && line->attrs.prompt_kind == OUTPUT_START) {
found_output = true; start = y1;
found_prompt = true;
direction = 1;
@@ -4417,13 +4417,13 @@ find_cmd_output(Screen *self, OutputOffset *oo, index_type start_screen_y, unsig
// find upwards: find prompt after the output, and the first output
while (y1 >= upward_limit) {
line = checked_range_line(self, y1);
if (line && line->attrs.prompt_kind == PROMPT_START && !range_line_is_continued(self, y1)) {
if (line && line->attrs.prompt_kind == PROMPT_START) {
if (direction == 0) {
found_prompt = true;
break;
}
found_next_prompt = true; end = y1;
} else if (line && line->attrs.prompt_kind == OUTPUT_START && !range_line_is_continued(self, y1)) {
} else if (line && line->attrs.prompt_kind == OUTPUT_START) {
found_output = true; start = y1;
found_prompt = true;
break;
@@ -4449,12 +4449,12 @@ find_cmd_output(Screen *self, OutputOffset *oo, index_type start_screen_y, unsig
break;
}
found_prompt = true;
} else if (found_prompt && !found_output) {
} else if (!found_output) {
// skip fetching wrapped prompt lines
while (range_line_is_continued(self, y2)) {
y2++;
}
} else if (found_output && !found_next_prompt) {
} else if (!found_next_prompt) {
found_next_prompt = true; end = y2;
break;
}
@@ -4532,7 +4532,7 @@ cmd_output(Screen *self, PyObject *args) {
bool reached_upper_limit = false;
while (!found && !reached_upper_limit) {
line = checked_range_line(self, y);
if (!line || (line->attrs.prompt_kind == OUTPUT_START && !range_line_is_continued(self, y))) {
if (!line || (line->attrs.prompt_kind == OUTPUT_START)) {
int start = line ? y : y + 1; reached_upper_limit = !line;
int y2 = start; unsigned int num_lines = 0;
bool found_content = false;