* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if defined(HAVE_CONFIG_H)
#include "config.h"
-
-#define _GNU_SOURCE
+#endif
#include <assert.h>
#include <errno.h>
#include "nc-boot-editor.h"
#include "nc-config.h"
#include "nc-sysinfo.h"
+#include "nc-helpscreen.h"
static void cui_start(void)
{
{
struct pmenu *menu = cui->main;
struct cui_opt_data *cod;
+ static int user_idx = 0;
/* Was the edit cancelled? */
if (!bd) {
item->on_execute = cui_boot;
item->data = cod = talloc_zero(item, struct cui_opt_data);
- cod->name = talloc_asprintf(cod, "User item %u:", insert_pt);
- pmenu_item_setup(menu, item, insert_pt,
- talloc_strdup(item, cod->name));
+ cod->name = talloc_asprintf(cod, "User item %u:", ++user_idx);
+ if (pmenu_item_setup(menu, item, insert_pt,
+ talloc_strdup(item, cod->name)) == NULL) {
+ talloc_free(item);
+ item = NULL;
+ }
/* Re-attach the items array. */
set_menu_items(menu->ncm, menu->items);
cod->bd = talloc_steal(cod, bd);
- set_current_item(item->pmenu->ncm, item->nci);
+ if (item)
+ set_current_item(item->pmenu->ncm, item->nci);
cui_set_current(cui, &cui->main->scr);
talloc_free(cui->boot_editor);
cui->boot_editor = NULL;
cui_set_current(cui, config_screen_scr(cui->config_screen));
}
+static void cui_help_exit(struct cui *cui)
+{
+ cui_set_current(cui, help_screen_return_scr(cui->help_screen));
+ talloc_free(cui->help_screen);
+ cui->help_screen = NULL;
+}
+
+void cui_show_help(struct cui *cui, const char *title, const char *text)
+{
+ if (!cui->current)
+ return;
+
+ if (cui->help_screen)
+ return;
+
+ cui->help_screen = help_screen_init(cui, cui->current,
+ title, text, cui_help_exit);
+
+ if (cui->help_screen)
+ cui_set_current(cui, help_screen_scr(cui->help_screen));
+}
+
/**
* cui_set_current - Set the currently active screen and redraw it.
*/
for (;;) {
int c = getch();
+ pb_debug("%s: got key %d\n", __func__, c);
+
if (c == ERR)
break;
struct cui *cui = cui_from_arg(arg);
struct cui_opt_data *cod;
unsigned int insert_pt;
+ int result, rows, cols;
struct pmenu_item *i;
ITEM *selected;
- int result;
pb_debug("%s: %p %s\n", __func__, opt, opt->id);
selected = current_item(cui->main->ncm);
+ menu_format(cui->main->ncm, &rows, &cols);
if (cui->current == &cui->main->scr)
nc_scr_unpost(cui->current);
item_count(cui->main->ncm) + 1);
}
- /* FIXME: need to make item visible somehow */
- menu_driver(cui->main->ncm, REQ_SCR_UPAGE);
- menu_driver(cui->main->ncm, REQ_SCR_DPAGE);
- set_current_item(cui->main->ncm, selected);
+ if (!item_visible(selected)) {
+ int idx, top;
+
+ top = top_row(cui->main->ncm);
+ idx = item_index(selected);
+
+ /* If our index is above the current top row, align
+ * us to the new top. Otherwise, align us to the new
+ * bottom */
+ top = top < idx ? idx - rows : idx;
+
+ set_top_row(cui->main->ncm, top);
+ set_current_item(cui->main->ncm, selected);
+ }
if (cui->current == &cui->main->scr)
nc_scr_post(cui->current);
return discover_client_send_config(cui->client, config);
}
+void cui_send_reinit(struct cui *cui)
+{
+ discover_client_send_reinit(cui->client);
+}
+
static struct discover_client_ops cui_client_ops = {
.device_add = NULL,
.boot_option_add = cui_boot_option_add,