CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-10-20 20:22:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Dont clear selections on erase in screen commands unless the erased region intersects a selection

Browse source 
Fixes #7408
This commit is contained in:
Kovid Goyal 2024-05-02 19:37:59 +05:30
parent 814412b8ac
commit e84d67170c
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog.rst
View file

@ -66,6 +66,8 @@ Detailed list of changes
- kitten @ send-key: Fix some keys being sent in kitty keyboard protocol encoding when not using socket for remote control
- Dont clear selections on erase in screen commands unless the erased region intersects a selection (:iss:`7408`)
0.34.1 [2024-04-19]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

19
kitty/screen.c
View file

@ -542,6 +542,23 @@ selection_has_screen_line(const Selections *selections, const int y) {
return false;
}
static bool
selection_intersects_screen_lines(const Selections *selections, int a, int b) {
if (a > b) SWAP(a, b);
for (size_t i = 0; i < selections->count; i++) {
const Selection *s = selections->items + i;
if (!is_selection_empty(s)) {
int start = (int)s->start.y - s->start_scrolled_by;
int end = (int)s->end.y - s->end_scrolled_by;
int top = MIN(start, end);
int bottom = MAX(start, end);
if ((top <= a && bottom >= a) || (top >= a && top <= b)) return true;
}
}
return false;
}
static void
init_text_loop_line(Screen *self, text_loop_state *s) {
if (self->modes.mIRM) {
@ -1968,7 +1985,7 @@ screen_erase_in_display(Screen *self, unsigned int how, bool private) {
}
} else linebuf_clear_lines(self->linebuf, self->cursor, a, b);
self->is_dirty = true;
clear_selection(&self->selections);
if (selection_intersects_screen_lines(&self->selections, a, b)) clear_selection(&self->selections);
}
if (how < 2) {
screen_erase_in_line(self, how, private);