diff options
author | Christian Göttsche <cgzones@googlemail.com> | 2021-01-27 17:14:15 +0100 |
---|---|---|
committer | Christian Göttsche <cgzones@googlemail.com> | 2021-01-27 17:14:15 +0100 |
commit | 6dba60f6bdebef740c7ddc916cd0c5f6837601ee (patch) | |
tree | 0b2b03a917a2043ad8a0980e592d3b5e46d04491 | |
parent | 211121f060114bba5120538b77c8b94652d358df (diff) |
Pass Settings to CRT_init
Resolve todo
-rw-r--r-- | CRT.c | 10 | ||||
-rw-r--r-- | CRT.h | 3 | ||||
-rw-r--r-- | htop.c | 2 |
3 files changed, 7 insertions, 8 deletions
@@ -687,14 +687,12 @@ void CRT_restorePrivileges() { static struct sigaction old_sig_handler[32]; -// TODO: pass an instance of Settings instead. - -void CRT_init(const int* delay, int colorScheme, bool allowUnicode) { +void CRT_init(const Settings* settings, bool allowUnicode) { initscr(); noecho(); - CRT_delay = delay; - CRT_colors = CRT_colorSchemes[colorScheme]; - CRT_colorScheme = colorScheme; + CRT_delay = &(settings->delay); + CRT_colors = CRT_colorSchemes[settings->colorScheme]; + CRT_colorScheme = settings->colorScheme; for (int i = 0; i < LAST_COLORELEMENT; i++) { unsigned int color = CRT_colorSchemes[COLORSCHEME_DEFAULT][i]; @@ -13,6 +13,7 @@ in the source distribution for its full text. #include "Macros.h" #include "ProvideCurses.h" +#include "Settings.h" typedef enum TreeStr_ { @@ -173,7 +174,7 @@ static inline void CRT_restorePrivileges(void) { } #endif /* HAVE_SETUID_ENABLED */ -void CRT_init(const int* delay, int colorScheme, bool allowUnicode); +void CRT_init(const Settings* settings, bool allowUnicode); void CRT_done(void); @@ -441,7 +441,7 @@ int main(int argc, char** argv) { Settings_setSortKey(settings, flags.sortKey); } - CRT_init(&(settings->delay), settings->colorScheme, flags.allowUnicode); + CRT_init(settings, flags.allowUnicode); MainPanel* panel = MainPanel_new(); ProcessList_setPanel(pl, (Panel*) panel); |