| File src/filelist.c changed (mode: 100644) (index 806c2540b..a7db76ab9) |
| ... |
... |
static void add_to_trie(trie_t *trie, view_t *view, dir_entry_t *entry); |
| 158 |
158 |
static int is_in_trie(trie_t *trie, view_t *view, dir_entry_t *entry, |
static int is_in_trie(trie_t *trie, view_t *view, dir_entry_t *entry, |
| 159 |
159 |
void **data); |
void **data); |
| 160 |
160 |
static void merge_entries(dir_entry_t *new, const dir_entry_t *prev); |
static void merge_entries(dir_entry_t *new, const dir_entry_t *prev); |
| 161 |
|
static int correct_pos(view_t *view, int pos, int dist, int closest); |
|
|
161 |
|
static void pick_position(int *best_pos, int *best_offset, int pos, int offset); |
| 162 |
162 |
static int rescue_from_empty_filelist(view_t *view); |
static int rescue_from_empty_filelist(view_t *view); |
| 163 |
163 |
static void add_parent_entry(view_t *view, dir_entry_t **entries, int *count); |
static void add_parent_entry(view_t *view, dir_entry_t **entries, int *count); |
| 164 |
164 |
static void init_dir_entry(view_t *view, dir_entry_t *entry, const char name[]); |
static void init_dir_entry(view_t *view, dir_entry_t *entry, const char name[]); |
| |
| ... |
... |
static void |
| 2446 |
2446 |
merge_lists(view_t *view, dir_entry_t *entries, int len) |
merge_lists(view_t *view, dir_entry_t *entries, int len) |
| 2447 |
2447 |
{ |
{ |
| 2448 |
2448 |
int i; |
int i; |
| 2449 |
|
int closest_dist; |
|
| 2450 |
2449 |
const int prev_pos = view->list_pos; |
const int prev_pos = view->list_pos; |
| 2451 |
2450 |
const int top_delta = view->list_pos - view->top_line; |
const int top_delta = view->list_pos - view->top_line; |
| 2452 |
2451 |
trie_t *prev_names = trie_create(/*free_func=*/NULL); |
trie_t *prev_names = trie_create(/*free_func=*/NULL); |
| |
| ... |
... |
merge_lists(view_t *view, dir_entry_t *entries, int len) |
| 2459 |
2458 |
update_string(&entries[i].name, NULL); |
update_string(&entries[i].name, NULL); |
| 2460 |
2459 |
} |
} |
| 2461 |
2460 |
|
|
| 2462 |
|
closest_dist = INT_MIN; |
|
|
2461 |
|
int best_pos_offset = INT_MIN; |
| 2463 |
2462 |
for(i = 0; i < view->list_rows; ++i) |
for(i = 0; i < view->list_rows; ++i) |
| 2464 |
2463 |
{ |
{ |
| 2465 |
|
int dist; |
|
| 2466 |
2464 |
void *data; |
void *data; |
| 2467 |
2465 |
dir_entry_t *const entry = &view->dir_entry[i]; |
dir_entry_t *const entry = &view->dir_entry[i]; |
| 2468 |
2466 |
if(!is_in_trie(prev_names, view, entry, &data)) |
if(!is_in_trie(prev_names, view, entry, &data)) |
| |
| ... |
... |
merge_lists(view_t *view, dir_entry_t *entries, int len) |
| 2477 |
2475 |
view->selected_files += (entry->selected != 0); |
view->selected_files += (entry->selected != 0); |
| 2478 |
2476 |
|
|
| 2479 |
2477 |
/* Update cursor position in a smart way. */ |
/* Update cursor position in a smart way. */ |
| 2480 |
|
dist = (dir_entry_t *)data - entries - prev_pos; |
|
| 2481 |
|
closest_dist = correct_pos(view, i, dist, closest_dist); |
|
|
2478 |
|
int old_i = (dir_entry_t *)data - entries; |
|
2479 |
|
pick_position(&view->list_pos, &best_pos_offset, i, old_i - prev_pos); |
| 2482 |
2480 |
} |
} |
| 2483 |
2481 |
|
|
| 2484 |
2482 |
/* When possible, preserve relative placement of the current entry in the |
/* When possible, preserve relative placement of the current entry in the |
| |
| ... |
... |
merge_entries(dir_entry_t *new, const dir_entry_t *prev) |
| 2585 |
2583 |
} |
} |
| 2586 |
2584 |
} |
} |
| 2587 |
2585 |
|
|
| 2588 |
|
/* Corrects selected item position in the list. Returns updated value of the |
|
| 2589 |
|
* closest variable, which initially should be INT_MIN. */ |
|
| 2590 |
|
static int |
|
| 2591 |
|
correct_pos(view_t *view, int pos, int dist, int closest) |
|
| 2592 |
|
{ |
|
| 2593 |
|
if(dist == 0) |
|
| 2594 |
|
{ |
|
| 2595 |
|
closest = 0; |
|
| 2596 |
|
view->list_pos = pos; |
|
| 2597 |
|
} |
|
| 2598 |
|
else if((closest < 0 && dist > closest) || (closest > 0 && dist < closest)) |
|
| 2599 |
|
{ |
|
| 2600 |
|
closest = dist; |
|
| 2601 |
|
view->list_pos = pos; |
|
|
2586 |
|
/* Determines an updated position close to the original one, looking at one |
|
2587 |
|
* candidate at a time. *best_offset should initially be set to INT_MIN. */ |
|
2588 |
|
static void |
|
2589 |
|
pick_position(int *best_pos, int *best_offset, int pos, int offset) |
|
2590 |
|
{ |
|
2591 |
|
/* |
|
2592 |
|
* Unlike `labs(offset) <= labs(*best_offset)` (`labs()` because |
|
2593 |
|
* `abs(INT_MIN) == INT_MIN`), this gives preference to elements following the |
|
2594 |
|
* original position over the closest element that can preceded it. |
|
2595 |
|
* |
|
2596 |
|
* offset == 0: best possible match, use it (should only happen once) |
|
2597 |
|
* best_offset < 0: pick any mathematically larger offset, allowing positive |
|
2598 |
|
* ones to override any negative one |
|
2599 |
|
* best_offset > 0: only permit smaller positive offsets, honing in on the |
|
2600 |
|
* position closest to the original one |
|
2601 |
|
*/ |
|
2602 |
|
if(offset == 0 || |
|
2603 |
|
(*best_offset < 0 && offset > *best_offset) || |
|
2604 |
|
(*best_offset > 0 && offset > 0 && offset < *best_offset)) |
|
2605 |
|
{ |
|
2606 |
|
*best_offset = offset; |
|
2607 |
|
*best_pos = pos; |
| 2602 |
2608 |
} |
} |
| 2603 |
|
return closest; |
|
| 2604 |
2609 |
} |
} |
| 2605 |
2610 |
|
|
| 2606 |
2611 |
/* Performs actions needed to rescue from abnormal situation with empty |
/* Performs actions needed to rescue from abnormal situation with empty |