ui/ncurses: Add basic config editor

[petitboot] / ui / ncurses / generic-main.c

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 560e3e5683e9b32b9ee9c965a4df01e32580a458..feff506cd67e8d8e1c36e45a03c10b60a213bca9 100644 (file)
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -18,11 +18,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#if defined(HAVE_CONFIG_H)
 #include "config.h"
-#endif
 
 #define _GNU_SOURCE
+
+#include <assert.h>
 #include <errno.h>
 #include <getopt.h>
 #include <signal.h>
@@ -126,6 +126,18 @@ struct pb_cui {
        struct cui *cui;
 };
 
+static int pmenu_sysinfo(struct pmenu_item *item)
+{
+       cui_show_sysinfo(cui_from_item(item));
+       return 0;
+}
+
+static int pmenu_config(struct pmenu_item *item)
+{
+       cui_show_config(cui_from_item(item));
+       return 0;
+}
+
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -136,22 +148,29 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
        struct pmenu *m;
        struct pmenu_item *i;
 
-       m = pmenu_init(pb_cui->cui, 1, cui_on_exit);
+       m = pmenu_init(pb_cui->cui, 4, cui_on_exit);
 
        if (!m) {
                pb_log("%s: failed\n", __func__);
                return NULL;
        }
 
-       m->on_open = cui_on_open;
+       m->on_new = cui_item_new;
 
-       m->scr.frame.title = talloc_asprintf(m,
+       m->scr.frame.ltitle = talloc_asprintf(m,
                "Petitboot (" PACKAGE_VERSION ")");
+       m->scr.frame.rtitle = NULL;
        m->scr.frame.help = talloc_strdup(m,
-               "ESC=exit, Enter=accept, e=edit, o=open");
+               "Enter=accept, e=edit, n=new, x=exit");
        m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
 
-       i = pmenu_item_init(m, 0, "Exit to Shell");
+       i = pmenu_item_init(m, 0, " ");
+       item_opts_off(i->nci, O_SELECTABLE);
+       i = pmenu_item_init(m, 1, "System information");
+       i->on_execute = pmenu_sysinfo;
+       i = pmenu_item_init(m, 2, "System configuration");
+       i->on_execute = pmenu_config;
+       i = pmenu_item_init(m, 3, "Exit to shell");
        i->on_execute = pmenu_exit_cb;
 
        result = pmenu_setup(m);
@@ -206,6 +225,7 @@ int main(int argc, char *argv[])
        int result;
        int cui_result;
        struct opts opts;
+       FILE *log;
 
        result = opts_parse(&opts, argc, argv);
 
@@ -224,20 +244,15 @@ int main(int argc, char *argv[])
                return EXIT_SUCCESS;
        }
 
+       log = stderr;
        if (strcmp(opts.log_file, "-")) {
-               FILE *log = fopen(opts.log_file, "a");
+               log = fopen(opts.log_file, "a");
 
                if (!log)
                        log = fopen("/dev/null", "a");
+       }
 
-               assert(log);
-               pb_log_set_stream(log);
-       } else
-               pb_log_set_stream(stderr);
-
-#if defined(DEBUG)
-       pb_log_always_flush(1);
-#endif
+       pb_log_init(log);
 
        pb_log("--- petitboot-nc ---\n");
 
@@ -259,7 +274,6 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
 
        pb.mm = pb_mm_init(&pb);
-       ui_timer_disable(&pb.cui->timer);
 
        cui_result = cui_run(pb.cui, pb.mm, 0);