X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=4dba0ad1d8d6680e7c21cd189e2642e0e5c167f8;hb=8f36cfac8a6cbb9a2750824b704b3cc4b9db5c49;hp=e28168edd4cf6d253e10e4c2f04fa3939fd25192;hpb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c;p=petitboot

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index e28168e..4dba0ad 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -162,7 +162,7 @@ int pmenu_item_replace(struct pmenu_item *i, const char *name)
 
 	set_item_userptr(nci, i);
 
-	menu->scr.unpost(&menu->scr);
+	nc_scr_unpost(&menu->scr);
 	set_menu_items(menu->ncm, NULL);
 
 	// FIXME: need to assure item name is a talloc string.
@@ -173,7 +173,7 @@ int pmenu_item_replace(struct pmenu_item *i, const char *name)
 	i->nci = nci;
 
 	set_menu_items(menu->ncm, menu->items);
-	menu->scr.post(&menu->scr);
+	nc_scr_post(&menu->scr);
 
 	return 0;
 }
@@ -205,6 +205,7 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
 
 	switch (key) {
 	case 27: /* ESC */
+	case 'x':
 		if (menu->on_exit)
 			menu->on_exit(menu);
 		nc_flush_keys();
@@ -232,10 +233,9 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
 		if (item->on_edit)
 			item->on_edit(item);
 		break;
-	case 'o':
-		DBGS("on_open: %p\n", menu->on_open);
-		if (menu->on_open)
-			menu->on_open(menu);
+	case 'n':
+		if (menu->on_new)
+			menu->on_new(menu);
 		break;
 	case '\n':
 	case '\r':