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

More word selection direction change fixes

Browse Source
This commit is contained in:
Kovid Goyal 2021-09-27 20:42:22 +05:30
parent c71d8fe1cc
commit 7d41aca0e4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/screen.c
View File

@ -3114,6 +3114,7 @@ screen_update_selection(Screen *self, index_type x, index_type y, bool in_left_h
set_abs(abs_start, s->start, s->start_scrolled_by); set_abs(abs_start, s->start, s->start_scrolled_by);
set_abs(abs_end, s->end, s->end_scrolled_by); set_abs(abs_end, s->end, s->end_scrolled_by);
set_abs(abs_current_input, s->input_current, self->scrolled_by); set_abs(abs_current_input, s->input_current, self->scrolled_by);
bool return_word_sel_to_start_line = false;
if (upd.set_as_nearest_extend || self->selections.extension_in_progress) { if (upd.set_as_nearest_extend || self->selections.extension_in_progress) {
self->selections.extension_in_progress = true; self->selections.extension_in_progress = true;
bool start_is_nearer = false; bool start_is_nearer = false;
@ -3131,8 +3132,15 @@ screen_update_selection(Screen *self, index_type x, index_type y, bool in_left_h
set_abs(abs_initial_start, s->initial_extent.start, s->initial_extent.scrolled_by); set_abs(abs_initial_start, s->initial_extent.start, s->initial_extent.scrolled_by);
set_abs(abs_initial_end, s->initial_extent.end, s->initial_extent.scrolled_by); set_abs(abs_initial_end, s->initial_extent.end, s->initial_extent.scrolled_by);
if (self->selections.extend_mode == EXTEND_WORD) { if (self->selections.extend_mode == EXTEND_WORD) {
if (s->adjusting_start) s->adjusting_start = selection_boundary_less_than(&abs_current_input, &abs_initial_end); if (abs_current_input.y == abs_initial_start.y && abs_start.y != abs_end.y) {
else s->adjusting_start = selection_boundary_less_than(&abs_current_input, &abs_initial_start); if (abs_start.y != abs_initial_start.y) s->adjusting_start = true;
else if (abs_end.y != abs_initial_start.y) s->adjusting_start = false;
else s->adjusting_start = selection_boundary_less_than(&abs_current_input, &abs_initial_end);
return_word_sel_to_start_line = true;
} else {
if (s->adjusting_start) s->adjusting_start = selection_boundary_less_than(&abs_current_input, &abs_initial_end);
else s->adjusting_start = selection_boundary_less_than(&abs_current_input, &abs_initial_start);
}
} else { } else {
const unsigned int initial_line = abs_initial_start.y; const unsigned int initial_line = abs_initial_start.y;
if (initial_line == abs_current_input.y) { if (initial_line == abs_current_input.y) {
@ -3155,7 +3163,11 @@ screen_update_selection(Screen *self, index_type x, index_type y, bool in_left_h
if (!s->adjusting_start) { a = &s->end; b = &s->start; } if (!s->adjusting_start) { a = &s->end; b = &s->start; }
const bool word_found_at_cursor = screen_selection_range_for_word(self, s->input_current.x, s->input_current.y, &start.y, &end.y, &start.x, &end.x, true); const bool word_found_at_cursor = screen_selection_range_for_word(self, s->input_current.x, s->input_current.y, &start.y, &end.y, &start.x, &end.x, true);
bool adjust_both_ends = is_selection_empty(s); bool adjust_both_ends = is_selection_empty(s);
if (word_found_at_cursor) { if (return_word_sel_to_start_line) {
index_type ox = a->x;
if (s->adjusting_start) { *a = s->initial_extent.start; if (ox < a->x) a->x = ox; }
else { *a = s->initial_extent.end; if (ox > a->x) a->x = ox; }
} else if (word_found_at_cursor) {
if (adjusted_boundary_is_before) { if (adjusted_boundary_is_before) {
*a = start; a->in_left_half_of_cell = true; *a = start; a->in_left_half_of_cell = true;
if (adjust_both_ends) { *b = end; b->in_left_half_of_cell = false; } if (adjust_both_ends) { *b = end; b->in_left_half_of_cell = false; }

17
kitty_tests/mouse.py
View File

@ -169,6 +169,23 @@ class TestMouse(BaseTest):
move(x=4.4, y=1) move(x=4.4, y=1)
self.ae(sel(), 'gh') self.ae(sel(), 'gh')
release() release()
multi_click(x=4.4)
self.ae(sel(), 'cd')
move()
self.ae(sel(), 'ab cd')
move(x=1, y=1)
self.ae(sel(), 'ab cd f')
move()
self.ae(sel(), 'ab cd')
release()
multi_click(x=1.4)
self.ae(sel(), 'ab')
move(x=4.4)
self.ae(sel(), 'ab cd')
move(x=4.4, y=1)
self.ae(sel(), 'ab cd f gh')
move(x=4.4)
self.ae(sel(), 'ab cd')
# Line select with drag # Line select with drag
s.reset() s.reset()