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

Improvements to the tab code after initial feedback

This commit is contained in:
Nathan Scott 2021-09-24 17:52:20 +10:00
parent 72ba20fa5f
commit cc2547fcf0
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Settings.c
View File

@ -280,12 +280,15 @@ ScreenSettings* Settings_newScreen(Settings* this, const char* name, const char*
return ss; return ss;
} }
static void Settings_defaultScreens(Settings* this) { static ScreenSettings* Settings_defaultScreens(Settings* this) {
if (this->nScreens)
return this->screens[0];
for (unsigned int i = 0; i < Platform_numberOfDefaultScreens; i++) { for (unsigned int i = 0; i < Platform_numberOfDefaultScreens; i++) {
ScreenDefaults* defaults = &Platform_defaultScreens[i]; ScreenDefaults* defaults = &Platform_defaultScreens[i];
Settings_newScreen(this, defaults->name, defaults->columns); ScreenSettings* settings = Settings_newScreen(this, defaults->name, defaults->columns);
this->screens[i]->sortKey = toFieldIndex(this->dynamicColumns, defaults->sortKey); settings->sortKey = toFieldIndex(this->dynamicColumns, defaults->sortKey);
} }
return this->screens[0];
} }
static bool Settings_read(Settings* this, const char* fileName, unsigned int initialCpuCount) { static bool Settings_read(Settings* this, const char* fileName, unsigned int initialCpuCount) {
@ -293,6 +296,7 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
if (!fd) if (!fd)
return false; return false;
ScreenSettings* screen = NULL;
bool didReadMeters = false; bool didReadMeters = false;
bool didReadAny = false; bool didReadAny = false;
for (;;) { for (;;) {
@ -319,34 +323,40 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
fclose(fd); fclose(fd);
return false; return false;
} }
} else if (String_eq(option[0], "fields")) { } else if (String_eq(option[0], "fields") && this->config_version <= 2) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
if (!this->nScreens) screen = Settings_defaultScreens(this);
Settings_defaultScreens(this); ScreenSettings_readFields(screen, this->dynamicColumns, option[1]);
ScreenSettings_readFields(this->screens[0], this->dynamicColumns, option[1]); } else if (String_eq(option[0], "sort_key") && this->config_version <= 2) {
} else if (String_eq(option[0], "sort_key")) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
// This "+1" is for compatibility with the older enum format. // This "+1" is for compatibility with the older enum format.
this->screens[0]->sortKey = atoi(option[1]) + 1; screen = Settings_defaultScreens(this);
} else if (String_eq(option[0], "tree_sort_key")) { screen->sortKey = atoi(option[1]) + 1;
} else if (String_eq(option[0], "tree_sort_key") && this->config_version <= 2) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
// This "+1" is for compatibility with the older enum format. // This "+1" is for compatibility with the older enum format.
this->screens[0]->treeSortKey = atoi(option[1]) + 1; screen = Settings_defaultScreens(this);
} else if (String_eq(option[0], "sort_direction")) { screen->treeSortKey = atoi(option[1]) + 1;
} else if (String_eq(option[0], "sort_direction") && this->config_version <= 2) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
this->screens[0]->direction = atoi(option[1]); screen = Settings_defaultScreens(this);
} else if (String_eq(option[0], "tree_sort_direction")) { screen->direction = atoi(option[1]);
} else if (String_eq(option[0], "tree_sort_direction") && this->config_version <= 2) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
this->screens[0]->treeDirection = atoi(option[1]); screen = Settings_defaultScreens(this);
} else if (String_eq(option[0], "tree_view")) { screen->treeDirection = atoi(option[1]);
} else if (String_eq(option[0], "tree_view") && this->config_version <= 2) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
this->screens[0]->treeView = atoi(option[1]); screen = Settings_defaultScreens(this);
} else if (String_eq(option[0], "tree_view_always_by_pid")) { screen->treeView = atoi(option[1]);
} else if (String_eq(option[0], "tree_view_always_by_pid") && this->config_version <= 2) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
this->screens[0]->treeViewAlwaysByPID = atoi(option[1]); screen = Settings_defaultScreens(this);
} else if (String_eq(option[0], "all_branches_collapsed")) { screen->treeViewAlwaysByPID = atoi(option[1]);
} else if (String_eq(option[0], "all_branches_collapsed") && this->config_version <= 2) {
// old (no screen) naming also supported for backwards compatibility // old (no screen) naming also supported for backwards compatibility
this->screens[0]->allBranchesCollapsed = atoi(option[1]); screen = Settings_defaultScreens(this);
screen->allBranchesCollapsed = atoi(option[1]);
} else if (String_eq(option[0], "hide_kernel_threads")) { } else if (String_eq(option[0], "hide_kernel_threads")) {
this->hideKernelThreads = atoi(option[1]); this->hideKernelThreads = atoi(option[1]);
} else if (String_eq(option[0], "hide_userland_threads")) { } else if (String_eq(option[0], "hide_userland_threads")) {
@ -445,28 +455,28 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
this->topologyAffinity = !!atoi(option[1]); this->topologyAffinity = !!atoi(option[1]);
#endif #endif
} else if (strncmp(option[0], "screen:", 7) == 0) { } else if (strncmp(option[0], "screen:", 7) == 0) {
Settings_newScreen(this, option[0] + 7, option[1]); screen = Settings_newScreen(this, option[0] + 7, option[1]);
} else if (String_eq(option[0], ".sort_key")) { } else if (String_eq(option[0], ".sort_key")) {
if (this->nScreens) if (screen)
this->screens[this->nScreens - 1]->sortKey = toFieldIndex(this->dynamicColumns, option[1]); screen->sortKey = toFieldIndex(this->dynamicColumns, option[1]);
} else if (String_eq(option[0], ".tree_sort_key")) { } else if (String_eq(option[0], ".tree_sort_key")) {
if (this->nScreens) if (screen)
this->screens[this->nScreens - 1]->treeSortKey = toFieldIndex(this->dynamicColumns, option[1]); screen->treeSortKey = toFieldIndex(this->dynamicColumns, option[1]);
} else if (String_eq(option[0], ".sort_direction")) { } else if (String_eq(option[0], ".sort_direction")) {
if (this->nScreens) if (screen)
this->screens[this->nScreens - 1]->direction = atoi(option[1]); screen->direction = atoi(option[1]);
} else if (String_eq(option[0], ".tree_sort_direction")) { } else if (String_eq(option[0], ".tree_sort_direction")) {
if (this->nScreens) if (screen)
this->screens[this->nScreens - 1]->treeDirection = atoi(option[1]); screen->treeDirection = atoi(option[1]);
} else if (String_eq(option[0], ".tree_view")) { } else if (String_eq(option[0], ".tree_view")) {
if (this->nScreens) if (screen)
this->screens[this->nScreens - 1]->treeView = atoi(option[1]); screen->treeView = atoi(option[1]);
} else if (String_eq(option[0], ".tree_view_always_by_pid")) { } else if (String_eq(option[0], ".tree_view_always_by_pid")) {
if (this->nScreens) if (screen)
this->screens[this->nScreens - 1]->treeViewAlwaysByPID = atoi(option[1]); screen->treeViewAlwaysByPID = atoi(option[1]);
} else if (String_eq(option[0], ".all_branches_collapsed")) { } else if (String_eq(option[0], ".all_branches_collapsed")) {
if (this->nScreens) if (screen)
this->screens[this->nScreens - 1]->allBranchesCollapsed = atoi(option[1]); screen->allBranchesCollapsed = atoi(option[1]);
} }
String_freeArray(option); String_freeArray(option);
} }
@ -482,7 +492,8 @@ static void writeFields(FILE* fd, const ProcessField* fields, Hashtable* columns
const char* sep = ""; const char* sep = "";
for (unsigned int i = 0; fields[i]; i++) { for (unsigned int i = 0; fields[i]; i++) {
if (fields[i] >= LAST_PROCESSFIELD || byName) { if (fields[i] >= LAST_PROCESSFIELD || byName) {
fprintf(fd, "%s%s", sep, toFieldName(columns, i)); const char* pName = toFieldName(columns, fields[i]);
fprintf(fd, "%s%s", sep, pName);
} else { } else {
// This "-1" is for compatibility with the older enum format. // This "-1" is for compatibility with the older enum format.
fprintf(fd, "%s%d", sep, (int) fields[i] - 1); fprintf(fd, "%s%d", sep, (int) fields[i] - 1);