KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also clean-up selection extend for line select

Browse Source
This commit is contained in:
Kovid Goyal 2018-04-09 10:43:05 +05:30
parent 74dcf8800d
commit 1ce50fb6f0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kitty/screen.c
View File

@ -1776,14 +1776,13 @@ screen_update_selection(Screen *self, index_type x, index_type y, bool ended) {
if (ended) self->selection.in_progress = false; if (ended) self->selection.in_progress = false;
index_type start, end; index_type start, end;
bool found = false; bool found = false;
bool extending_leftwards = self->selection.end_y < self->selection.start_y || (self->selection.end_y == self->selection.start_y && self->selection.end_x < self->selection.start_x);
switch(self->selection.extend_mode) { switch(self->selection.extend_mode) {
case EXTEND_WORD: { case EXTEND_WORD: {
index_type y1 = y, y2; index_type y1 = y, y2;
found = screen_selection_range_for_word(self, x, &y1, &y2, &start, &end); found = screen_selection_range_for_word(self, x, &y1, &y2, &start, &end);
if (found) { if (found) {
#define SMALLER(x1, y1, x2, y2) (y1 < y2 || (y1 == y2 && x1 < x2)) if (extending_leftwards) {
if (SMALLER(self->selection.end_x, self->selection.end_y, self->selection.start_x, self->selection.start_y)) {
// extend leftwards
self->selection.end_x = start; self->selection.end_y = y1; self->selection.end_x = start; self->selection.end_y = y1;
y1 = self->selection.start_y; y1 = self->selection.start_y;
found = screen_selection_range_for_word(self, self->selection.start_x, &y1, &y2, &start, &end); found = screen_selection_range_for_word(self, self->selection.start_x, &y1, &y2, &start, &end);
@ -1791,7 +1790,6 @@ screen_update_selection(Screen *self, index_type x, index_type y, bool ended) {
self->selection.start_x = end; self->selection.start_y = y2; self->selection.start_x = end; self->selection.start_y = y2;
} }
} else { } else {
// extend rightwards
self->selection.end_x = end; self->selection.end_y = y2; self->selection.end_x = end; self->selection.end_y = y2;
y1 = self->selection.start_y; y1 = self->selection.start_y;
found = screen_selection_range_for_word(self, self->selection.start_x, &y1, &y2, &start, &end); found = screen_selection_range_for_word(self, self->selection.start_x, &y1, &y2, &start, &end);
@ -1800,13 +1798,21 @@ screen_update_selection(Screen *self, index_type x, index_type y, bool ended) {
} }
} }
#undef SMALLER
} }
break; break;
} }
case EXTEND_LINE: case EXTEND_LINE:
found = screen_selection_range_for_line(self, y, &start, &end); if (extending_leftwards) {
if (found) self->selection.end_x = end; found = screen_selection_range_for_line(self, self->selection.end_y, &start, &end);
if (found) { self->selection.end_x = start; }
found = screen_selection_range_for_line(self, self->selection.start_y, &start, &end);
if (found) { self->selection.start_x = end; }
} else {
found = screen_selection_range_for_line(self, self->selection.start_y, &start, &end);
if (found) { self->selection.start_x = start; }
found = screen_selection_range_for_line(self, self->selection.end_y, &start, &end);
if (found) { self->selection.end_x = end; }
}
break; break;
case EXTEND_CELL: case EXTEND_CELL:
break; break;