diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-23 15:26:56 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-23 15:26:56 -0300 |
| commit | d0c72c3fb29d535f5bb12b651e3bcaa516650199 (patch) | |
| tree | 2c01b7d96d50a7f47334093a1ed8ff4962cec204 /MainPanel.c | |
| parent | 1084a3ff8faf3aa98e8e9fbdab97a08a2c40482e (diff) | |
Move FunctionBar inside Panel
Diffstat (limited to 'MainPanel.c')
| -rw-r--r-- | MainPanel.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/MainPanel.c b/MainPanel.c index 2b70bab2..7d7e72db 100644 --- a/MainPanel.c +++ b/MainPanel.c @@ -30,13 +30,15 @@ typedef bool(*MainPanel_ForeachProcessFn)(Process*, size_t); }*/ -void MainPanel_updateTreeFunctions(FunctionBar* fuBar, bool mode) { +static const char* MainFunctions[] = {"Help ", "Setup ", "Search", "Filter", "Tree ", "SortBy", "Nice -", "Nice +", "Kill ", "Quit ", NULL}; + +void MainPanel_updateTreeFunctions(MainPanel* this, bool mode) { if (mode) { - FunctionBar_setLabel(fuBar, KEY_F(5), "Sorted"); - FunctionBar_setLabel(fuBar, KEY_F(6), "Collap"); + FunctionBar_setLabel(this->fuBar, KEY_F(5), "Sorted"); + FunctionBar_setLabel(this->fuBar, KEY_F(6), "Collap"); } else { - FunctionBar_setLabel(fuBar, KEY_F(5), "Tree "); - FunctionBar_setLabel(fuBar, KEY_F(6), "SortBy"); + FunctionBar_setLabel(this->fuBar, KEY_F(5), "Tree "); + FunctionBar_setLabel(this->fuBar, KEY_F(6), "SortBy"); } } @@ -98,7 +100,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { } if (reaction & HTOP_REDRAW_BAR) { - MainPanel_updateTreeFunctions(this->fuBar, this->state->settings->treeView); + MainPanel_updateTreeFunctions(this, this->state->settings->treeView); IncSet_drawBar(this->inc); } if (reaction & HTOP_UPDATE_PANELHDR) { @@ -165,12 +167,12 @@ PanelClass MainPanel_class = { .eventHandler = MainPanel_eventHandler }; -MainPanel* MainPanel_new(FunctionBar* fuBar) { +MainPanel* MainPanel_new() { MainPanel* this = AllocThis(MainPanel); - Panel_init((Panel*) this, 1, 1, 1, 1, Class(Process), false); + this->fuBar = FunctionBar_new(MainFunctions, NULL, NULL); + Panel_init((Panel*) this, 1, 1, 1, 1, Class(Process), false, this->fuBar); this->keys = calloc(KEY_MAX, sizeof(Htop_Action)); - this->fuBar = fuBar; - this->inc = IncSet_new(fuBar); + this->inc = IncSet_new(this->fuBar); Action_setBindings(this->keys); Platform_setBindings(this->keys); |