Imported Upstream version 0.8.1upstream/0.8.1

1 files changed, 69 insertions, 63 deletions

diff --git a/CategoriesPanel.c b/CategoriesPanel.c
index 89e9338..8b9d663 100644
--- a/CategoriesPanel.c
+++ b/CategoriesPanel.c
@@ -35,72 +35,13 @@ static char* ColorsFunctions[10] = {"      ", "      ", "      ", "      ", "
 
 static char* AvailableColumnsFunctions[10] = {"      ", "      ", "      ", "      ", "Add   ", "      ", "      ", "      ", "      ", "Done  "};
 
-CategoriesPanel* CategoriesPanel_new(Settings* settings, ScreenManager* scr) {
-   CategoriesPanel* this = (CategoriesPanel*) malloc(sizeof(CategoriesPanel));
-   Panel* super = (Panel*) this;
-   Panel_init(super, 1, 1, 1, 1, LISTITEM_CLASS, true);
-   ((Object*)this)->delete = CategoriesPanel_delete;
-
-   this->settings = settings;
-   this->scr = scr;
-   super->eventHandler = CategoriesPanel_eventHandler;
-   Panel_setHeader(super, "Setup");
-   Panel_add(super, (Object*) ListItem_new("Meters", 0));
-   Panel_add(super, (Object*) ListItem_new("Display options", 0));
-   Panel_add(super, (Object*) ListItem_new("Colors", 0));
-   Panel_add(super, (Object*) ListItem_new("Columns", 0));
-   return this;
-}
-
-void CategoriesPanel_delete(Object* object) {
+static void CategoriesPanel_delete(Object* object) {
    Panel* super = (Panel*) object;
    CategoriesPanel* this = (CategoriesPanel*) object;
    Panel_done(super);
    free(this);
 }
 
-HandlerResult CategoriesPanel_eventHandler(Panel* super, int ch) {
-   CategoriesPanel* this = (CategoriesPanel*) super;
-
-   HandlerResult result = IGNORED;
-
-   int previous = Panel_getSelectedIndex(super);
-
-   switch (ch) {
-      case KEY_UP:
-      case KEY_DOWN:
-      case KEY_NPAGE:
-      case KEY_PPAGE:
-      case KEY_HOME:
-      case KEY_END: {
-         Panel_onKey(super, ch);
-         int selected = Panel_getSelectedIndex(super);
-         if (previous != selected) {
-            int size = ScreenManager_size(this->scr);
-            for (int i = 1; i < size; i++)
-               ScreenManager_remove(this->scr, 1);
-            switch (selected) {
-               case 0:
-                  CategoriesPanel_makeMetersPage(this);
-                  break;
-               case 1:
-                  CategoriesPanel_makeDisplayOptionsPage(this);
-                  break;
-               case 2:
-                  CategoriesPanel_makeColorsPage(this);
-                  break;
-               case 3:
-                  CategoriesPanel_makeColumnsPage(this);
-                  break;
-            }
-         }
-         result = HANDLED;
-      }
-   }
-
-   return result;
-}
-
 void CategoriesPanel_makeMetersPage(CategoriesPanel* this) {
    Panel* leftMeters = (Panel*) MetersPanel_new(this->settings, "Left column", this->settings->header->leftMeters, this->scr);
    Panel* rightMeters = (Panel*) MetersPanel_new(this->settings, "Right column", this->settings->header->rightMeters, this->scr);
@@ -110,19 +51,84 @@ void CategoriesPanel_makeMetersPage(CategoriesPanel* this) {
    ScreenManager_add(this->scr, availableMeters, FunctionBar_new(10, AvailableMetersFunctions, NULL, NULL), -1);
 }
 
-void CategoriesPanel_makeDisplayOptionsPage(CategoriesPanel* this) {
+static void CategoriesPanel_makeDisplayOptionsPage(CategoriesPanel* this) {
    Panel* displayOptions = (Panel*) DisplayOptionsPanel_new(this->settings, this->scr);
    ScreenManager_add(this->scr, displayOptions, FunctionBar_new(10, DisplayOptionsFunctions, NULL, NULL), -1);
 }
 
-void CategoriesPanel_makeColorsPage(CategoriesPanel* this) {
+static void CategoriesPanel_makeColorsPage(CategoriesPanel* this) {
    Panel* colors = (Panel*) ColorsPanel_new(this->settings, this->scr);
    ScreenManager_add(this->scr, colors, FunctionBar_new(10, ColorsFunctions, NULL, NULL), -1);
 }
 
-void CategoriesPanel_makeColumnsPage(CategoriesPanel* this) {
+static void CategoriesPanel_makeColumnsPage(CategoriesPanel* this) {
    Panel* columns = (Panel*) ColumnsPanel_new(this->settings, this->scr);
    Panel* availableColumns = (Panel*) AvailableColumnsPanel_new(this->settings, columns, this->scr);
    ScreenManager_add(this->scr, columns, FunctionBar_new(10, ColumnsFunctions, NULL, NULL), 20);
    ScreenManager_add(this->scr, availableColumns, FunctionBar_new(10, AvailableColumnsFunctions, NULL, NULL), -1);
 }
+
+static HandlerResult CategoriesPanel_eventHandler(Panel* super, int ch) {
+   CategoriesPanel* this = (CategoriesPanel*) super;
+
+   HandlerResult result = IGNORED;
+
+   int selected = Panel_getSelectedIndex(super);
+   switch (ch) {
+      case EVENT_SETSELECTED:
+         result = HANDLED;
+         break;
+      case KEY_UP:
+      case KEY_DOWN:
+      case KEY_NPAGE:
+      case KEY_PPAGE:
+      case KEY_HOME:
+      case KEY_END: {
+         int previous = selected;
+         Panel_onKey(super, ch);
+         selected = Panel_getSelectedIndex(super);
+         if (previous != selected)
+            result = HANDLED;
+         break;
+      }
+   }
+
+   if (result == HANDLED) {
+      int size = ScreenManager_size(this->scr);
+      for (int i = 1; i < size; i++)
+         ScreenManager_remove(this->scr, 1);
+      switch (selected) {
+         case 0:
+            CategoriesPanel_makeMetersPage(this);
+            break;
+         case 1:
+            CategoriesPanel_makeDisplayOptionsPage(this);
+            break;
+         case 2:
+            CategoriesPanel_makeColorsPage(this);
+            break;
+         case 3:
+            CategoriesPanel_makeColumnsPage(this);
+            break;
+      }
+   }
+
+   return result;
+}
+
+CategoriesPanel* CategoriesPanel_new(Settings* settings, ScreenManager* scr) {
+   CategoriesPanel* this = (CategoriesPanel*) malloc(sizeof(CategoriesPanel));
+   Panel* super = (Panel*) this;
+   Panel_init(super, 1, 1, 1, 1, LISTITEM_CLASS, true);
+   ((Object*)this)->delete = CategoriesPanel_delete;
+
+   this->settings = settings;
+   this->scr = scr;
+   super->eventHandler = CategoriesPanel_eventHandler;
+   Panel_setHeader(super, "Setup");
+   Panel_add(super, (Object*) ListItem_new("Meters", 0));
+   Panel_add(super, (Object*) ListItem_new("Display options", 0));
+   Panel_add(super, (Object*) ListItem_new("Colors", 0));
+   Panel_add(super, (Object*) ListItem_new("Columns", 0));
+   return this;
+}