zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Read settings after applying defaults 

Default settings are used as a base and only settings specified in `htoprc` are
applied on top of it. This patch removes the special case for applying some
defaults  when the config does not contain a `meters` key. All defauls are set
before any attempt to read settings, so only keys actually present in the config
file are overridden.
This commit is contained in:
Bart Bakker 2021-08-02 17:33:34 +02:00
parent ed82ce6456
commit c1c4b5a1ab
No known key found for this signature in database
GPG Key ID: 8BC1D8F4C6C7B548
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Settings.c
View File

@ -131,12 +131,13 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
return false; return false;
bool didReadMeters = false; bool didReadMeters = false;
bool didReadFields = false; bool didReadAny = false;
for (;;) { for (;;) {
char* line = String_readLine(fd); char* line = String_readLine(fd);
if (!line) { if (!line) {
break; break;
} }
didReadAny = true;
size_t nOptions; size_t nOptions;
char** option = String_split(line, '=', &nOptions); char** option = String_split(line, '=', &nOptions);
free (line); free (line);
@ -146,7 +147,6 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
} }
if (String_eq(option[0], "fields")) { if (String_eq(option[0], "fields")) {
readFields(this->fields, &(this->flags), option[1]); readFields(this->fields, &(this->flags), option[1]);
didReadFields = true;
} else if (String_eq(option[0], "sort_key")) { } else if (String_eq(option[0], "sort_key")) {
// This "+1" is for compatibility with the older enum format. // This "+1" is for compatibility with the older enum format.
this->sortKey = atoi(option[1]) + 1; this->sortKey = atoi(option[1]) + 1;
@ -253,7 +253,7 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
if (!didReadMeters) { if (!didReadMeters) {
Settings_defaultMeters(this, initialCpuCount); Settings_defaultMeters(this, initialCpuCount);
} }
return didReadFields; return didReadAny;
} }
static void writeFields(FILE* fd, const ProcessField* fields, const char* name) { static void writeFields(FILE* fd, const ProcessField* fields, const char* name) {
@ -370,13 +370,13 @@ Settings* Settings_new(unsigned int initialCpuCount) {
this->treeDirection = 1; this->treeDirection = 1;
this->shadowOtherUsers = false; this->shadowOtherUsers = false;
this->showThreadNames = false; this->showThreadNames = false;
this->hideKernelThreads = false; this->hideKernelThreads = true;
this->hideUserlandThreads = false; this->hideUserlandThreads = false;
this->treeView = false; this->treeView = false;
this->allBranchesCollapsed = false; this->allBranchesCollapsed = false;
this->highlightBaseName = false; this->highlightBaseName = false;
this->highlightDeletedExe = true; this->highlightDeletedExe = true;
this->highlightMegabytes = false; this->highlightMegabytes = true;
this->detailedCPUTime = false; this->detailedCPUTime = false;
this->countCPUsFromOne = false; this->countCPUsFromOne = false;
this->showCPUUsage = true; this->showCPUUsage = true;
@ -394,6 +394,7 @@ Settings* Settings_new(unsigned int initialCpuCount) {
this->stripExeFromCmdline = true; this->stripExeFromCmdline = true;
this->showMergedCommand = false; this->showMergedCommand = false;
this->hideFunctionBar = 0; this->hideFunctionBar = 0;
this->headerMargin = true;
#ifdef HAVE_LIBHWLOC #ifdef HAVE_LIBHWLOC
this->topologyAffinity = false; this->topologyAffinity = false;
#endif #endif
@ -462,17 +463,7 @@ Settings* Settings_new(unsigned int initialCpuCount) {
} }
if (!ok) { if (!ok) {
this->changed = true; this->changed = true;
ok = Settings_read(this, SYSCONFDIR "/htoprc", initialCpuCount); Settings_read(this, SYSCONFDIR "/htoprc", initialCpuCount);
}
if (!ok) {
Settings_defaultMeters(this, initialCpuCount);
this->hideKernelThreads = true;
this->highlightMegabytes = true;
this->highlightThreads = true;
this->findCommInCmdline = true;
this->stripExeFromCmdline = true;
this->showMergedCommand = false;
this->headerMargin = true;
} }
return this; return this;
} }