ui/ncurses: Use nc-widgets for boot editor

[petitboot] / ui / ncurses / nc-boot-editor.h

diff --git a/ui/ncurses/nc-boot-editor.h b/ui/ncurses/nc-boot-editor.h
index 650c316b6960e90c918f7678d68d6861e759368d..7aa715e86f7a71780663970d1bfb6ed8e9e94e9e 100644 (file)
--- a/ui/ncurses/nc-boot-editor.h
+++ b/ui/ncurses/nc-boot-editor.h
@@ -19,9 +19,16 @@
 #if !defined(_PB_NC_KED_H)
 #define _PB_NC_KED_H
 
-#include <assert.h>
 #include <linux/input.h> /* This must be included before ncurses.h */
-#include <form.h>
+#if defined HAVE_NCURSESW_FORM_H
+#  include <ncursesw/form.h>
+#elif defined HAVE_NCURSES_FORM_H
+#  include <ncurses/form.h>
+#elif defined HAVE_FORM_H
+#  include <form.h>
+#else
+#  error "Curses form.h not found."
+#endif
 
 #include "types/types.h"
 #include "ui/common/ui-system.h"
@@ -53,19 +60,33 @@ enum boot_editor_result {
  */
 
 struct boot_editor {
-       struct nc_scr scr;
-       FORM *ncf;
-       FIELD **fields;
+       struct nc_scr   scr;
+       void            *data;
+       struct pmenu    *original_pmenu;
+       void            (*on_exit)(struct boot_editor *boot_editor,
+                                       enum boot_editor_result result,
+                                       struct pb_boot_data *bd);
        enum boot_editor_attr_cursor attr_cursor;
-       void (*on_exit)(struct boot_editor *boot_editor,
-                       enum boot_editor_result result,
-                       struct pb_kexec_data *kd);
+
+       struct nc_widgetset     *widgetset;
+       struct {
+               struct nc_widget_label          *image_l;
+               struct nc_widget_textbox        *image_f;
+               struct nc_widget_label          *initrd_l;
+               struct nc_widget_textbox        *initrd_f;
+               struct nc_widget_label          *dtb_l;
+               struct nc_widget_textbox        *dtb_f;
+               struct nc_widget_label          *args_l;
+               struct nc_widget_textbox        *args_f;
+               struct nc_widget_button         *ok_b;
+               struct nc_widget_button         *cancel_b;
+       } widgets;
 };
 
-struct boot_editor *boot_editor_init(void *ui_ctx,
-               const struct pb_kexec_data *kd,
+struct boot_editor *boot_editor_init(struct pmenu *menu,
+               const struct pb_boot_data *bd,
                void (*on_exit)(struct boot_editor *,
                                enum boot_editor_result,
-                               struct pb_kexec_data *));
+                               struct pb_boot_data *));
 
 #endif