Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restore sort function pointers when restoring cfg #1762

Merged
merged 2 commits into from
Nov 19, 2023
Merged

restore sort function pointers when restoring cfg #1762

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
703d349
restore sort function pointers when restoring cfg
azuline Nov 17, 2023
c0b3cc8
factor out a `setcfg` function for setting the cfg global
azuline Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/nnn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4276,6 +4276,18 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
addch(ind);
}

/**
* Sets the global cfg variable and restores related state to match the new
* cfg.
*/
static void setcfg(settings newcfg)
{
cfg = newcfg;
/* Synchronize the global function pointers to match the new cfg. */
entrycmpfn = cfg.reverse ? &reventrycmp : &entrycmp;
namecmpfn = cfg.version ? &xstrverscasecmp : &xstricmp;
}

static void savecurctx(char *path, char *curname, int nextctx)
{
settings tmpcfg = cfg;
Expand Down Expand Up @@ -4307,7 +4319,7 @@ static void savecurctx(char *path, char *curname, int nextctx)
}

tmpcfg.curctx = nextctx;
cfg = tmpcfg;
setcfg(tmpcfg);
}

#ifndef NOSSN
Expand Down Expand Up @@ -6248,11 +6260,9 @@ static int set_sort_flags(int r)
r = 'd';
}

if (cfg.version)
namecmpfn = &xstrverscasecmp;

if (cfg.reverse)
entrycmpfn = &reventrycmp;
/* Ensure function pointers are in sync with cfg. */
entrycmpfn = cfg.reverse ? &reventrycmp : &entrycmp;
namecmpfn = cfg.version ? &xstrverscasecmp : &xstricmp;
} else if (r == CONTROL('T')) {
/* Cycling order: clear -> size -> time -> clear */
if (cfg.timeorder)
Expand Down Expand Up @@ -8017,9 +8027,9 @@ static bool browse(char *ipath, const char *session, int pkey)
lastdir = g_ctx[r].c_last;
lastname = g_ctx[r].c_name;

cfg = g_ctx[r].c_cfg;
g_ctx[r].c_cfg.curctx = r;
setcfg(g_ctx[r].c_cfg);

cfg.curctx = r;
setdirwatch();
goto begin;
}
Expand Down
Loading