#include <assert.h>
#include <errno.h>
#include <string.h>
+#include <stdlib.h>
+#include <wctype.h>
#include "log/log.h"
#include "talloc/talloc.h"
pmenu_post(scr);
}
+static int pmenu_item_destructor(void *arg)
+{
+ struct pmenu_item *item = arg;
+ free_item(item->nci);
+ return 0;
+}
+
+static const char *pmenu_item_label(struct pmenu_item *item, const char *name)
+{
+ static int invalid_idx;
+ unsigned int i;
+ wchar_t *tmp;
+ char *label;
+ size_t len;
+
+ len = mbstowcs(NULL, name, 0);
+
+ /* 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",
+ ++invalid_idx);
+ return name;
+ }
+
+ tmp = talloc_array(item, wchar_t, len + 1);
+ mbstowcs(tmp, name, len + 1);
+
+ /* replace anything unprintable with U+FFFD REPLACEMENT CHARACTER */
+ for (i = 0; i < len; i++) {
+ if (!iswprint(tmp[i]))
+ tmp[i] = 0xfffd;
+ }
+
+ len = wcstombs(NULL, tmp, 0);
+ label = talloc_array(item, char, len + 1);
+ wcstombs(label, tmp, len + 1);
+
+ pb_log("%s: %s\n", __func__, label);
+
+ talloc_free(tmp);
+ return label;
+}
+
/**
- * pmenu_item_init - Allocate and initialize a new pmenu_item instance.
+ * pmenu_item_create - Allocate and initialize a new pmenu_item instance.
*
* Returns a pointer the the initialized struct pmenu_item instance or NULL
* on error. The caller is responsible for calling talloc_free() for the
* returned instance.
*/
-
-struct pmenu_item *pmenu_item_alloc(struct pmenu *menu)
+struct pmenu_item *pmenu_item_create(struct pmenu *menu, const char *name)
{
- /* Items go with the menu, not the pointer array. */
+ struct pmenu_item *item = talloc_zero(menu, struct pmenu_item);
+ const char *label;
- struct pmenu_item *i = talloc_zero(menu, struct pmenu_item);
+ label = pmenu_item_label(item, name);
- return i;
-}
+ item->i_sig = pb_item_sig;
+ item->pmenu = menu;
+ item->nci = new_item(label, NULL);
-struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
- unsigned int index, const char *name)
-{
- assert(i);
- assert(name);
-
- if (!i)
+ if (!item->nci) {
+ talloc_free(item);
return NULL;
+ }
- i->i_sig = pb_item_sig;
- i->pmenu = menu;
- i->nci = new_item(name, NULL);
+ talloc_set_destructor(item, pmenu_item_destructor);
- if (!i->nci) {
- talloc_free(i);
- return NULL;
- }
+ set_item_userptr(item->nci, item);
- set_item_userptr(i->nci, i);
+ return item;
+}
- menu->items[index] = i->nci;
+void pmenu_item_insert(struct pmenu *menu, struct pmenu_item *item,
+ unsigned int index)
+{
+ assert(item);
+ assert(index < menu->item_count);
+ assert(menu->items[index] == NULL);
+ assert(menu_items(menu->ncm) == NULL);
- return i;
+ menu->items[index] = item->nci;
}
static int pmenu_item_get_index(const struct pmenu_item *item)
return -1;
}
-/**
- * pmenu_item_replace - Replace the menu item with a new one.
- *
- * Use this routine to change a menu item's text.
- */
-
-int pmenu_item_replace(struct pmenu_item *i, const char *name)
-{
- struct pmenu *menu;
- ITEM *nci;
- int index;
-
- assert(name);
- assert(i->nci);
-
- menu = i->pmenu;
- index = pmenu_item_get_index(i);
-
- if (index < 0) {
- assert(0 && "get_index failed");
- return -1;
- }
-
- nci = new_item(name, NULL);
-
- if (!nci) {
- assert(0 && "new_item failed");
- return -1;
- }
-
- set_item_userptr(nci, i);
-
- nc_scr_unpost(&menu->scr);
- set_menu_items(menu->ncm, NULL);
-
- // FIXME: need to assure item name is a talloc string.
- /* talloc_free((char *)item_name(i->nci)); */
-
- free_item(i->nci);
- menu->items[index] = nci;
- i->nci = nci;
-
- set_menu_items(menu->ncm, menu->items);
- nc_scr_post(&menu->scr);
-
- return 0;
-}
-
/**
* pmenu_move_cursor - Move the cursor.
* @req: An ncurses request or char to send to menu_driver().
case KEY_UP:
pmenu_move_cursor(menu, REQ_UP_ITEM);
break;
+ case KEY_BTAB:
+ pmenu_move_cursor(menu, REQ_PREV_ITEM);
+ break;
case KEY_DOWN:
pmenu_move_cursor(menu, REQ_DOWN_ITEM);
break;
+ case '\t':
+ pmenu_move_cursor(menu, REQ_NEXT_ITEM);
+ break;
case 'e':
if (item->on_edit)
item->on_edit(item);
case 'c':
cui_show_config(cui_from_arg(scr->ui_ctx));
break;
+ case KEY_F(1):
case 'h':
if (menu->help_text)
cui_show_help(cui_from_arg(scr->ui_ctx),
if (index < 0)
return -1;
- free_item(item->nci);
talloc_free(item);
/* Note that items array has a null terminator. */
void pmenu_delete(struct pmenu *menu)
{
- unsigned int i;
-
assert(menu->scr.sig == pb_pmenu_sig);
menu->scr.sig = pb_removed_sig;
- for (i = item_count(menu->ncm); i; i--)
- free_item(menu->items[i - 1]);
-
+ unpost_menu(menu->ncm);
free_menu(menu->ncm);
delwin(menu->scr.sub_ncw);
delwin(menu->scr.main_ncw);