ui/ncurses: Call widget process_key handlers first

[petitboot] / ui / ncurses / nc-menu.h

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 693b96c8efd84b0988d79f006b2c089c8ed43545..136bf666886020c4cec5e4c6351b97213a58df70 100644 (file)
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -53,10 +53,13 @@ struct pmenu_item {
        int (*on_execute)(struct pmenu_item *item);
 };
 
-struct pmenu_item *pmenu_item_alloc(struct pmenu *menu);
-struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
-       unsigned int index, const char *name);
-int pmenu_item_replace(struct pmenu_item *i, const char *name);
+struct pmenu_item *pmenu_item_create(struct pmenu *menu, const char *name);
+struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
+       struct boot_option *opt);
+void pmenu_item_insert(struct pmenu *menu, struct pmenu_item *item,
+       unsigned int index);
+void pmenu_item_add(struct pmenu *menu, struct pmenu_item *item,
+       unsigned int insert_pt);
 void pmenu_item_delete(struct pmenu_item *item);
 
 static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
@@ -67,10 +70,9 @@ static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
        return item;
 }
 
-static inline struct pmenu_item *pmenu_item_init(struct pmenu *menu,
-       unsigned int index, const char *name)
+static inline struct cui_opt_data *cod_from_item(struct pmenu_item *item)
 {
-       return pmenu_item_setup(menu, pmenu_item_alloc(menu), index, name);
+       return item->data;
 }
 
 /**
@@ -85,6 +87,8 @@ struct pmenu {
        ITEM **items;
        unsigned int item_count;
        unsigned int insert_pt;
+       const char *help_title;
+       const struct help_text *help_text;
        int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
        void (*on_exit)(struct pmenu *menu);
        void (*on_new)(struct pmenu *menu);
@@ -93,7 +97,6 @@ struct pmenu {
 struct pmenu *pmenu_init(void *ui_ctx, unsigned int item_count,
        void (*on_exit)(struct pmenu *));
 int pmenu_setup(struct pmenu *menu);
-void pmenu_delete(struct pmenu *menu);
 unsigned int pmenu_grow(struct pmenu *menu, unsigned int count);
 int pmenu_remove(struct pmenu *menu, struct pmenu_item *item);
 struct pmenu_item *pmenu_find_selected(struct pmenu *menu);