#include "log/log.h"
#include "talloc/talloc.h"
+#include "i18n/i18n.h"
#include "ui/common/ui-system.h"
#include "nc-cui.h"
#include "nc-menu.h"
result = post_menu(menu->ncm);
nc_scr_frame_draw(scr);
- redrawwin(menu->scr.main_ncw);
wrefresh(menu->scr.main_ncw);
return result;
/* if we have an invalid multibyte sequence, create an entirely
* new name, indicating that we had invalid input */
if (len == SIZE_MAX) {
- name = talloc_asprintf(item, "!Invalid option %d\n",
+ name = talloc_asprintf(item, _("!Invalid option %d"),
++invalid_idx);
return name;
}
label = talloc_array(item, char, len + 1);
wcstombs(label, tmp, len + 1);
- pb_log("%s: %s\n", __func__, label);
+ pb_log_fn("%s\n", label);
talloc_free(tmp);
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.
*
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;
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];
}
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;
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 */
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);
/* 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);
{
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,
+ pb_log_fn("not found: %p %s\n", item,
(item ? item->nci->name.str : "(null)"));
return -1;
}
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.
*/
{
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 */
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 KEY_F(1):
case 'h':
if (menu->help_text)
assert(item_count(menu->ncm) == 0 && "not disconnected");
- pb_log("%s: %u current + %u new = %u\n", __func__, menu->item_count,
+ pb_log_fn("%u current + %u new = %u\n", menu->item_count,
count, menu->item_count + count);
/* Note that items array has a null terminator. */
assert(menu->item_count);
- pb_log("%s: %u\n", __func__, menu->item_count);
+ pb_log_fn("%u\n", menu->item_count);
index = pmenu_item_get_index(item);
return 0;
}
+static int pmenu_destructor(void *ptr)
+{
+ struct pmenu *menu = ptr;
+ assert(menu->scr.sig == pb_pmenu_sig);
+ menu->scr.sig = pb_removed_sig;
+
+ unpost_menu(menu->ncm);
+ free_menu(menu->ncm);
+ delwin(menu->scr.sub_ncw);
+ delwin(menu->scr.main_ncw);
+ return 0;
+}
+
/**
* pmenu_init - Allocate and initialize a new menu instance.
*
void (*on_exit)(struct pmenu *))
{
struct pmenu *menu = talloc_zero(ui_ctx, struct pmenu);
-
if (!menu)
return NULL;
- /* note items array has a null terminator */
+ talloc_set_destructor(menu, pmenu_destructor);
+ /* note items array has a null terminator */
menu->items = talloc_zero_array(menu, ITEM *, item_count + 1);
-
if (!menu->items) {
talloc_free(menu);
return NULL;
return 0;
}
-/**
- * pmenu_delete - Delete a menu instance.
- *
- */
-
-void pmenu_delete(struct pmenu *menu)
-{
- assert(menu->scr.sig == pb_pmenu_sig);
- menu->scr.sig = pb_removed_sig;
-
- unpost_menu(menu->ncm);
- free_menu(menu->ncm);
- delwin(menu->scr.sub_ncw);
- delwin(menu->scr.main_ncw);
- talloc_free(menu);
-}
projects / petitboot / blobdiff