xaizek / vifm (License: GPLv2+) (since 2018-12-07)
Vifm is a file manager with curses interface, which provides Vi[m]-like environment for managing objects within file systems, extended with some useful ideas from mutt.
Clone URLs: https://code.reversed.top/user/xaizek/vifm ssh://rocketgit@code.reversed.top/user/xaizek/vifm
v0.13 v0.13-beta v0.14 v0.14-beta master
Commit 1da341d3141b5eaddf5888d8f9dd7ab2eea927a7

Fix unintended {ext}/{fileext} search highlighting
Introduce is_primary_colored_column_id() to avoid counting {ext} and
{fileext} as primary columns as that affects processing of search
match highlighting.

Started to appear since commit 9b4e6721f3:

Apply file highlighting to "ext" and "fileext"

Those are view columns.

Seeing highlighting in those columns takes clearing 'classify' because
decorations affect match offsets.
Author: xaizek
Author date (UTC): 2025-03-25 13:25
Committer name: xaizek
Committer date (UTC): 2025-03-25 13:34
Parent(s): e2cae15195b717496e6e14deef4450cf394087b2
Signing key: 99DC5E4DB05F6BE2
Tree: e43fcec40857dc5870dbdfdac1e05326b1c12e8f
File Lines added Lines deleted
ChangeLog 3 0
src/ui/fileview.c 26 15
File ChangeLog changed (mode: 100644) (index fee139e93..68b350c43)
17 17 Fixed a crash on drawing a tree-view when {ext} or {fileext} follows Fixed a crash on drawing a tree-view when {ext} or {fileext} follows
18 18 {name}, {iname}, {root} or {fileroot}. Thanks to aw-cloud. {name}, {iname}, {root} or {fileroot}. Thanks to aw-cloud.
19 19
20 Fixed unintended (and incorrect) highlighting of search matches in {ext}
21 and {fileext} columns.
22
20 23 0.14-beta to 0.14 (2025-02-08) 0.14-beta to 0.14 (2025-02-08)
21 24
22 25 Improved documentation on zh/zl menu keys a bit. Improved documentation on zh/zl menu keys a bit.
File src/ui/fileview.c changed (mode: 100644) (index 08f66ea8c..a55280191)
... ... static void column_line_print(const char buf[], int offset, AlignType align,
123 123 static void column_line_match(const char full_column[], static void column_line_match(const char full_column[],
124 124 const format_info_t *info, int *match_from, int *match_to); const format_info_t *info, int *match_from, int *match_to);
125 125 static void draw_line_number(const column_data_t *cdt, int column); static void draw_line_number(const column_data_t *cdt, int column);
126 static int is_primary_colored_column_id(int id);
126 127 static int is_primary_column_id(int id); static int is_primary_column_id(int id);
127 static cchar_t prepare_col_color(const view_t *view, int primary, int line_nr,
128 const column_data_t *cdt, int real_id);
128 static cchar_t prepare_col_color(const view_t *view, int is_primary_colored,
129 int line_nr, const column_data_t *cdt, int real_id);
129 130 static void mix_in_common_colors(col_attr_t *col, const view_t *view, static void mix_in_common_colors(col_attr_t *col, const view_t *view,
130 131 dir_entry_t *entry, int line_color); dir_entry_t *entry, int line_color);
131 132 static void mix_in_file_hi(const view_t *view, dir_entry_t *entry, int type_hi, static void mix_in_file_hi(const view_t *view, dir_entry_t *entry, int type_hi,
 
... ... column_line_print(const char buf[], int offset, AlignType align,
1182 1183 const int numbers_visible = (offset == 0 && cdt->number_width > 0); const int numbers_visible = (offset == 0 && cdt->number_width > 0);
1183 1184 const int padding = (cfg.extra_padding != 0); const int padding = (cfg.extra_padding != 0);
1184 1185
1185 const int primary = is_primary_column_id(info->id);
1186 const int is_primary_colored = is_primary_colored_column_id(info->id);
1186 1187 const cchar_t line_attrs = const cchar_t line_attrs =
1187 prepare_col_color(view, primary, 0, cdt, info->real_id);
1188 prepare_col_color(view, is_primary_colored, 0, cdt, info->real_id);
1188 1189
1189 1190 /* Non-empty prefix contains tree pseudo-graphics. */ /* Non-empty prefix contains tree pseudo-graphics. */
1190 size_t extra_prefix = primary ? *cdt->prefix_len : 0U;
1191 const int is_treeable_column = is_primary_column_id(info->id);
1192 size_t extra_prefix = is_treeable_column ? *cdt->prefix_len : 0U;
1191 1193
1192 1194 if(extra_prefix != 0U && align == AT_RIGHT) if(extra_prefix != 0U && align == AT_RIGHT)
1193 1195 { {
 
... ... column_line_match(const char full_column[], const format_info_t *info,
1292 1294 const column_data_t *cdt = info->data; const column_data_t *cdt = info->data;
1293 1295 dir_entry_t *entry = cdt->entry; dir_entry_t *entry = cdt->entry;
1294 1296
1295 int primary = is_primary_column_id(info->id);
1296 if(!primary || cdt->view->matches == 0 || !entry->search_match ||
1297 int is_searchable_column = is_primary_column_id(info->id);
1298 if(!is_searchable_column || cdt->view->matches == 0 || !entry->search_match ||
1297 1299 cdt->custom_match) cdt->custom_match)
1298 1300 { {
1299 1301 return; return;
 
... ... column_line_match(const char full_column[], const format_info_t *info,
1326 1328 } }
1327 1329 } }
1328 1330
1329 /* Checks whether column id corresponds to a column that displays part of
1330 * entry's path or name. Returns non-zero if so. */
1331 /* Checks whether column id corresponds to a column that is affected by a
1332 * highlight derived from file's type/path/name. Returns non-zero if so. */
1333 static int
1334 is_primary_colored_column_id(int id)
1335 {
1336 return id == SK_BY_EXTENSION
1337 || id == SK_BY_FILEEXT
1338 || is_primary_column_id(id);
1339 }
1340
1341 /* Checks whether column id corresponds to a column that displays a substantial
1342 * part of entry's path. Such columns can be searched and also display
1343 * pseudographics of a tree. Returns non-zero if so. */
1331 1344 static int static int
1332 1345 is_primary_column_id(int id) is_primary_column_id(int id)
1333 1346 { {
 
... ... is_primary_column_id(int id)
1335 1348 || id == SK_BY_INAME || id == SK_BY_INAME
1336 1349 || id == SK_BY_ROOT || id == SK_BY_ROOT
1337 1350 || id == SK_BY_FILEROOT || id == SK_BY_FILEROOT
1338 || id == SK_BY_EXTENSION
1339 || id == SK_BY_FILEEXT
1340 1351 || vlua_viewcolumn_is_primary(curr_stats.vlua, id); || vlua_viewcolumn_is_primary(curr_stats.vlua, id);
1341 1352 } }
1342 1353
1343 1354 /* Calculate color attributes for a view column. Returns attributes that can be /* Calculate color attributes for a view column. Returns attributes that can be
1344 1355 * used for drawing on a window. */ * used for drawing on a window. */
1345 1356 static cchar_t static cchar_t
1346 prepare_col_color(const view_t *view, int primary, int line_nr,
1357 prepare_col_color(const view_t *view, int is_primary_colored, int line_nr,
1347 1358 const column_data_t *cdt, int real_id) const column_data_t *cdt, int real_id)
1348 1359 { {
1349 1360 const col_scheme_t *const cs = ui_view_get_cs(view); const col_scheme_t *const cs = ui_view_get_cs(view);
 
... ... prepare_col_color(const view_t *view, int primary, int line_nr,
1371 1382
1372 1383 /* Highlight derived from file type/path/name always affects primary field, /* Highlight derived from file type/path/name always affects primary field,
1373 1384 * but the rest depends on configuration. */ * but the rest depends on configuration. */
1374 const int with_line_hi = primary
1385 const int with_line_hi = is_primary_colored
1375 1386 || (cfg.color_what == CW_ONE_ROW && is_current) || (cfg.color_what == CW_ONE_ROW && is_current)
1376 1387 || (cfg.color_what == CW_ALL_ROWS); || (cfg.color_what == CW_ALL_ROWS);
1377 1388 const int line_color = with_line_hi ? cdt->line_hi_group : -1; const int line_color = with_line_hi ? cdt->line_hi_group : -1;
 
... ... prepare_col_color(const view_t *view, int primary, int line_nr,
1381 1392 { {
1382 1393 int color = (view == curr_view || !cdt->is_main) ? CURR_LINE_COLOR int color = (view == curr_view || !cdt->is_main) ? CURR_LINE_COLOR
1383 1394 : OTHER_LINE_COLOR; : OTHER_LINE_COLOR;
1384 /* Avoid combining attributes for non-primary column. */
1385 if(!primary)
1395 /* Avoid combining attributes for non-primary columns. */
1396 if(!is_primary_colored)
1386 1397 { {
1387 1398 cs_overlap_colors(&col, &cs->color[color]); cs_overlap_colors(&col, &cs->color[color]);
1388 1399 } }
Hints
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://code.reversed.top/user/xaizek/vifm

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@code.reversed.top/user/xaizek/vifm

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a pull request:
... clone the repository ...
... make some changes and some commits ...
git push origin master