ncurses/nc-cui: musl libc fixes

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

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 666b78bbfee23d5bd7688958adc828eeda62b3d1..a6c2b15f61d2caf7d66cce45f980790b2e50c24e 100644 (file)
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -62,7 +62,6 @@ static int pmenu_post(struct nc_scr *scr)
        result = post_menu(menu->ncm);
 
        nc_scr_frame_draw(scr);
-       redrawwin(menu->scr.main_ncw);
        wrefresh(menu->scr.main_ncw);
 
        return result;
@@ -124,6 +123,31 @@ static const char *pmenu_item_label(struct pmenu_item *item, const char *name)
        return label;
 }
 
+/**
+ * pmenu_item_update - Update the label of an existing pmenu_item.
+ *
+ * The item array must be disconnected prior to calling.
+ */
+int pmenu_item_update(struct pmenu_item *item, const char *name)
+{
+       const char *label;
+       ITEM *i;
+
+       if (!item || !item->nci)
+               return -1;
+
+       label = pmenu_item_label(item, name);
+
+       if (!label)
+               return -1;
+
+       i = item->nci;
+       i->name.str = label;
+       i->name.length = strncols(label);
+
+       return 0;
+}
+
 /**
  * pmenu_item_create - Allocate and initialize a new pmenu_item instance.
  *
@@ -231,7 +255,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 
        for (i = 0; i < menu->item_count; i++) {
                item = item_userptr(menu->items[i]);
-               cod = item->data;
+               cod = cod_from_item(item);
                /* boot entries will have opt defined */
                if (!cod || cod->opt)
                        continue;
@@ -254,6 +278,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
        switch (dev->type) {
        case DEVICE_TYPE_OPTICAL:
        case DEVICE_TYPE_DISK:
+       case DEVICE_TYPE_USB:
                /* Find block info */
                for (i = 0; sys && i < sys->n_blockdevs; i++) {
                        bd = sys->blockdevs[i];
@@ -264,8 +289,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
                }
                if (matched) {
                        snprintf(buf,sizeof(buf),"[%s: %s / %s]",
-                               dev->type == DEVICE_TYPE_DISK ?
-                               "Disk" : "CD/DVD",
+                               device_type_display_name(dev->type),
                                bd->name, bd->uuid);
                }
                break;
@@ -282,10 +306,16 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
                if (matched) {
                        mac_str(intf->hwaddr, intf->hwaddr_size,
                                hwaddr, sizeof(hwaddr));
-                       snprintf(buf,sizeof(buf),"[Interface %s / %s]",
-                               intf->name, hwaddr);
+                       snprintf(buf,sizeof(buf),"[%s: %s / %s]",
+                               _("Network"), intf->name, hwaddr);
                }
                break;
+       case DEVICE_TYPE_ANY:
+               /* This is an option found from a file:// url, not associated
+                * with any device */
+               snprintf(buf, sizeof(buf), "[Custom Local Options]");
+               matched = true;
+               break;
 
        default:
                /* Assume the device may be able to boot */
@@ -294,8 +324,8 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
        if (!matched) {
                pb_debug("%s: No matching device found for %s (%s)\n",
                        __func__,opt->device_id, dev->id);
-               snprintf(buf,sizeof(buf),"[Unknown Device: %s]",
-                       dev->id);
+               snprintf(buf, sizeof(buf), "[%s: %s]",
+                       _("Unknown Device"), dev->id);
        }
 
        dev_hdr = pmenu_item_create(menu, buf);
@@ -309,10 +339,9 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
 
        /* We identify dev_hdr items as having a valid c->name,
         * but a NULL c->opt */
-       cod = talloc(dev_hdr, struct cui_opt_data);
+       cod = talloc_zero(dev_hdr, struct cui_opt_data);
        cod->name = talloc_strdup(dev_hdr, opt->device_id);
        cod->dev = dev;
-       cod->opt = NULL;
        dev_hdr->data = cod;
 
        pb_debug("%s: returning %s\n",__func__,cod->name);
@@ -323,9 +352,10 @@ static int pmenu_item_get_index(const struct pmenu_item *item)
 {
        unsigned int i;
 
-       for (i = 0; i < item->pmenu->item_count; i++)
-               if (item->pmenu->items[i] == item->nci)
-                       return i;
+       if (item)
+               for (i = 0; i < item->pmenu->item_count; i++)
+                       if (item->pmenu->items[i] == item->nci)
+                               return i;
 
        pb_log("%s: not found: %p %s\n", __func__, item,
                (item ? item->nci->name.str : "(null)"));
@@ -343,6 +373,34 @@ static void pmenu_move_cursor(struct pmenu *menu, int req)
        wrefresh(menu->scr.main_ncw);
 }
 
+/**
+ * pmenu_main_hot_keys - Hot keys for the main boot menu
+ */
+int pmenu_main_hot_keys(struct pmenu *menu, struct pmenu_item *item, int c)
+{
+       struct nc_scr *scr = &menu->scr;
+       (void)item;
+
+       switch (c) {
+       case 'i':
+               cui_show_sysinfo(cui_from_arg(scr->ui_ctx));
+               break;
+       case 'c':
+               cui_show_config(cui_from_arg(scr->ui_ctx));
+               break;
+       case 'l':
+               cui_show_lang(cui_from_arg(scr->ui_ctx));
+               break;
+       case 'g':
+               cui_show_statuslog(cui_from_arg(scr->ui_ctx));
+               break;
+       default:
+               return 0;
+       }
+
+       return c;
+}
+
 /**
  * pmenu_process_key - Process a user keystroke.
  */
@@ -351,11 +409,15 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
 {
        struct pmenu *menu = pmenu_from_scr(scr);
        struct pmenu_item *item = pmenu_find_selected(menu);
+       unsigned int i;
 
        nc_scr_status_free(&menu->scr);
 
-       if (menu->hot_key)
-               key = menu->hot_key(menu, item, key);
+       if (menu->hot_keys)
+               for (i = 0; i < menu->n_hot_keys; i++) {
+                       if (menu->hot_keys[i](menu, item, key))
+                               return;
+               }
 
        switch (key) {
        case 27: /* ESC */
@@ -403,15 +465,6 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
                if (item->on_execute)
                        item->on_execute(item);
                break;
-       case 'i':
-               cui_show_sysinfo(cui_from_arg(scr->ui_ctx));
-               break;
-       case 'c':
-               cui_show_config(cui_from_arg(scr->ui_ctx));
-               break;
-       case 'l':
-               cui_show_lang(cui_from_arg(scr->ui_ctx));
-               break;
        case KEY_F(1):
        case 'h':
                if (menu->help_text)