Archives
/
lnav
mirror of https://github.com/tstack/lnav
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[listview] when making big moves, put the focused row in the middle

Browse Source 
Related to #1088 and #1149
pull/1170/head
Tim Stack 1 year ago
parent 7bf42e7d2f
commit 8da3dcc01c
7 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
src/hotkeys.cc
Unescape Escape View File

@ -324,7 +324,7 @@ handle_paging_key(int ch)
case 'f': case 'f':
if (tc == &lnav_data.ld_views[LNV_LOG]) { if (tc == &lnav_data.ld_views[LNV_LOG]) {
bm[&logfile_sub_source::BM_FILES].next(tc->get_selection()) | bm[&logfile_sub_source::BM_FILES].next(tc->get_selection()) |
[&tc](auto vl) { tc->set_top(vl); }; [&tc](auto vl) { tc->set_selection(vl); };
} else if (tc == &lnav_data.ld_views[LNV_TEXT]) { } else if (tc == &lnav_data.ld_views[LNV_TEXT]) {
textfile_sub_source& tss = lnav_data.ld_text_source; textfile_sub_source& tss = lnav_data.ld_text_source;

27
src/listview_curses.cc
Unescape Escape View File

@ -207,10 +207,29 @@ listview_curses::do_update()
} else if (this->lv_selection } else if (this->lv_selection
>= (this->lv_top + height - this->lv_tail_space - 1_vl)) >= (this->lv_top + height - this->lv_tail_space - 1_vl))
{ {
this->set_top( auto diff = this->lv_selection
this->lv_selection - height + 1_vl + this->lv_tail_space, true); - (this->lv_top + height - this->lv_tail_space - 1_vl);
} else if (this->lv_selection < this->lv_top) {
this->set_top(this->lv_selection, true); if (diff < (height / 8_vl)) {
// for small differences between the bottom and the selection,
// just move a little bit.
this->set_top(
this->lv_selection - height + 1_vl + this->lv_tail_space,
true);
} else {
// for large differences, put the focus in the middle
this->set_top(this->lv_selection - height / 2_vl, true);
}
} else if (this->lv_selection <= this->lv_top) {
auto diff = this->lv_top - this->lv_selection;
if (this->lv_selection > 0 && diff < (height / 8_vl)) {
this->set_top(this->lv_selection - 1_vl);
} else if (this->lv_selection < height) {
this->set_top(0_vl);
} else {
this->set_top(this->lv_selection - height / 2_vl, true);
}
} }
} }

10
src/readline_callbacks.cc
Unescape Escape View File

@ -676,10 +676,14 @@ rl_callback_int(readline_curses* rc, bool is_alt)
} }
if (first_hit) { if (first_hit) {
auto first_hit_vl = first_hit.value(); auto first_hit_vl = first_hit.value();
if (first_hit_vl > 0_vl) { if (tc->is_selectable()) {
--first_hit_vl; tc->set_selection(first_hit_vl);
} else {
if (first_hit_vl > 0_vl) {
--first_hit_vl;
}
tc->set_top(first_hit_vl);
} }
tc->set_top(first_hit_vl);
} }
return true; return true;

10
test/listview_output_cursor.3
Unescape Escape View File

@ -6,15 +6,15 @@ S -1 ┋
A └ normal A └ normal
CSI Reset Replace mode CSI Reset Replace mode
CSI Erase all CSI Erase all
S 1 ┋World! x┋ S 1 ┋2 x┋
A └┛ alt A └┛ alt
S 2 ┋2 x┋ S 2 ┋3 x┋
A └┛ alt A └┛ alt
S 3 ┋3 x┋ S 3 ┋+4 x┋
A └┛ alt A └┛ alt
S 4 ┋+4 x┋ S 4 ┋5 x┋
A └┛ alt A └┛ alt
S 5 ┋5 x┋ S 5 ┋6 x┋
A └┛ alt A └┛ alt
CSI Erase all CSI Erase all
CSI Use normal screen buffer CSI Use normal screen buffer

10
test/listview_output_cursor.4
Unescape Escape View File

@ -6,15 +6,15 @@ S -1 ┋
A └ normal A └ normal
CSI Reset Replace mode CSI Reset Replace mode
CSI Erase all CSI Erase all
S 1 ┋Hello x┋ S 1 ┋World! x┋
A └┛ alt A └┛ alt
S 2 ┋World! x┋ S 2 ┋2 x┋
A └┛ alt A └┛ alt
S 3 ┋2 x┋ S 3 ┋+3 x┋
A └┛ alt A └┛ alt
S 4 ┋+3 x┋ S 4 ┋4 x┋
A └┛ alt A └┛ alt
S 5 ┋4 x┋ S 5 ┋5 x┋
A └┛ alt A └┛ alt
CSI Erase all CSI Erase all
CSI Use normal screen buffer CSI Use normal screen buffer

20
test/listview_output_cursor.5
Unescape Escape View File

@ -6,25 +6,25 @@ S -1 ┋
A └ normal A └ normal
CSI Reset Replace mode CSI Reset Replace mode
CSI Erase all CSI Erase all
S 1 ┋+18 x┋ S 1 ┋17 x┋
A └┛ alt A └┛ alt
S 2 ┋19 x┋ S 2 ┋+18 x┋
A └┛ alt A └┛ alt
S 3 ┋20 x┋ S 3 ┋19 x┋
A └┛ alt A └┛ alt
S 4 ┋21 x┋ S 4 ┋20 x┋
A └┛ alt A └┛ alt
S 5 ┋22 x┋ S 5 ┋21 x┋
A └┛ alt A └┛ alt
S 6 ┋23 x┋ S 6 ┋22 x┋
A └┛ alt A └┛ alt
S 7 ┋24 x┋ S 7 ┋23 x┋
A └┛ alt A └┛ alt
S 8 ┋25 x┋ S 8 ┋24 x┋
A └┛ alt A └┛ alt
S 9 ┋26 x┋ S 9 ┋25 x┋
A └┛ alt A └┛ alt
S 10 ┋27 x┋ S 10 ┋26 x┋
A └┛ alt A └┛ alt
CSI Erase all CSI Erase all
CSI Use normal screen buffer CSI Use normal screen buffer

20
test/listview_output_cursor.6
Unescape Escape View File

@ -6,25 +6,25 @@ S -1 ┋
A └ normal A └ normal
CSI Reset Replace mode CSI Reset Replace mode
CSI Erase all CSI Erase all
S 1 ┋+9 x┋ S 1 ┋8 x┋
A └┛ alt A └┛ alt
S 2 ┋10 x┋ S 2 ┋+9 x┋
A └┛ alt A └┛ alt
S 3 ┋11 x┋ S 3 ┋10 x┋
A └┛ alt A └┛ alt
S 4 ┋12 x┋ S 4 ┋11 x┋
A └┛ alt A └┛ alt
S 5 ┋13 x┋ S 5 ┋12 x┋
A └┛ alt A └┛ alt
S 6 ┋14 x┋ S 6 ┋13 x┋
A └┛ alt A └┛ alt
S 7 ┋15 x┋ S 7 ┋14 x┋
A └┛ alt A └┛ alt
S 8 ┋16 x┋ S 8 ┋15 x┋
A └┛ alt A └┛ alt
S 9 ┋17 x┋ S 9 ┋16 x┋
A └┛ alt A └┛ alt
S 10 ┋18 x┋ S 10 ┋17 x┋
A └┛ alt A └┛ alt
CSI Erase all CSI Erase all
CSI Use normal screen buffer CSI Use normal screen buffer

Write Preview
Loading…
Cancel
Save