zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 12:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Working on integration of IncSet in new branch.

Browse Source
This commit is contained in:
Hisham Muhammad
2015-03-22 22:39:33 -03:00
parent 09c7152990
commit 1084a3ff8f
6 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MainPanel.c
View File

@ -20,6 +20,7 @@ in the source distribution for its full text.
typedef struct MainPanel_ {
Panel super;
State* state;
IncSet* inc;
FunctionBar* fuBar;
Htop_Action *keys;
pid_t pidSearch;
@ -65,7 +66,13 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
if (ch == 27) {
return HANDLED;
}
if(ch != ERR && this->keys[ch]) {
if (ch != ERR && this->inc->active) {
bool redraw = IncSet_handleKey(this->inc, ch, super, (IncMode_GetPanelValue) MainPanel_getValue, NULL);
if (redraw) {
reaction = HTOP_REFRESH | HTOP_REDRAW_BAR;
}
reaction |= HTOP_KEEP_FOLLOWING;
} else if (ch != ERR && this->keys[ch]) {
reaction |= (this->keys[ch])(this->state);
result = HANDLED;
} else if (isdigit(ch)) {
@ -92,7 +99,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
if (reaction & HTOP_REDRAW_BAR) {
MainPanel_updateTreeFunctions(this->fuBar, this->state->settings->treeView);
IncSet_drawBar(this->state->inc);
IncSet_drawBar(this->inc);
}
if (reaction & HTOP_UPDATE_PANELHDR) {
ProcessList_printHeader(this->state->pl, Panel_getHeader(super));
@ -163,6 +170,7 @@ MainPanel* MainPanel_new(FunctionBar* fuBar) {
Panel_init((Panel*) this, 1, 1, 1, 1, Class(Process), false);
this->keys = calloc(KEY_MAX, sizeof(Htop_Action));
this->fuBar = fuBar;
this->inc = IncSet_new(fuBar);
Action_setBindings(this->keys);
Platform_setBindings(this->keys);
@ -178,6 +186,7 @@ void MainPanel_delete(Object* object) {
Panel* super = (Panel*) object;
MainPanel* this = (MainPanel*) object;
Panel_done(super);
IncSet_delete(this->inc);
free(this->keys);
free(this);
}