diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2011-03-22 20:37:08 +0000 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2011-03-22 20:37:08 +0000 |
commit | a9c0ea375323a3f801636f95a76afd0fd1328c5d (patch) | |
tree | 6c8f551197bc53097e4ab2618ca20eb1fe0f0696 /ScreenManager.c | |
parent | b56195663760d76ea61d9ed15121dd4a13fa68cd (diff) |
* Option for counting CPUs from zero
(thanks to Sean Noonan)
* Meters update in every screen (no longer halting while on Setup, etc.)
Diffstat (limited to 'ScreenManager.c')
-rw-r--r-- | ScreenManager.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/ScreenManager.c b/ScreenManager.c index 2be94f6c..7fc50bdf 100644 --- a/ScreenManager.c +++ b/ScreenManager.c @@ -9,10 +9,12 @@ in the source distribution for its full text. #include "Panel.h" #include "Object.h" #include "Vector.h" +#include "Header.h" #include "FunctionBar.h" #include "debug.h" #include <assert.h> +#include <time.h> #include <stdbool.h> @@ -32,13 +34,15 @@ typedef struct ScreenManager_ { Vector* items; Vector* fuBars; int itemCount; - FunctionBar* fuBar; + const FunctionBar* fuBar; + const Header* header; + time_t lastScan; bool owner; } ScreenManager; }*/ -ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation orientation, bool owner) { +ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation orientation, const Header* header, bool owner) { ScreenManager* this; this = malloc(sizeof(ScreenManager)); this->x1 = x1; @@ -50,6 +54,7 @@ ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation ori this->items = Vector_new(PANEL_CLASS, owner, DEFAULT_SIZE, NULL); this->fuBars = Vector_new(FUNCTIONBAR_CLASS, true, DEFAULT_SIZE, NULL); this->itemCount = 0; + this->header = header; this->owner = owner; return this; } @@ -119,14 +124,24 @@ void ScreenManager_resize(ScreenManager* this, int x1, int y1, int x2, int y2) { void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) { bool quit = false; int focus = 0; - + Panel* panelFocus = (Panel*) Vector_get(this->items, focus); if (this->fuBar) FunctionBar_draw(this->fuBar, NULL); + this->lastScan = 0; + int ch = 0; while (!quit) { int items = this->itemCount; + if (this->header) { + time_t now = time(NULL); + if (now > this->lastScan) { + ProcessList_scan(this->header->pl); + this->lastScan = now; + } + Header_draw(this->header); + } for (int i = 0; i < items; i++) { Panel* panel = (Panel*) Vector_get(this->items, i); Panel_draw(panel, i == focus); |