From 4051815230f443ac4b052a4cf0f55a951e3f88c8 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 13 Dec 2013 16:02:12 +0800 Subject: [PATCH] ui/ncurses: Add help to boot editor screen Signed-off-by: Jeremy Kerr --- ui/ncurses/Makefile.am | 1 + ui/ncurses/nc-boot-editor-help.c | 24 ++++++++++++++++++++++++ ui/ncurses/nc-boot-editor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 ui/ncurses/nc-boot-editor-help.c diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am index 2834f12..877dc11 100644 --- a/ui/ncurses/Makefile.am +++ b/ui/ncurses/Makefile.am @@ -36,6 +36,7 @@ libpbnc_la_SOURCES = \ nc-cui.h \ nc-boot-editor.c \ nc-boot-editor.h \ + nc-boot-editor-help.c \ nc-helpscreen.c \ nc-helpscreen.h \ nc-menu.c \ diff --git a/ui/ncurses/nc-boot-editor-help.c b/ui/ncurses/nc-boot-editor-help.c new file mode 100644 index 0000000..3f0c7fb --- /dev/null +++ b/ui/ncurses/nc-boot-editor-help.c @@ -0,0 +1,24 @@ +const char *boot_editor_help_text = "\ +This screen allows you to edit or create boot options.\n\ +\n\ +Device: This is a list of block devices available on the system. Select \ +the device which contains your boot resources (kernel, initrd and device \ +tree), or \"Specify paths/URLs manually\" to use full URLs to the boot \ +resources.\n\ +\n\ +Kernel: enter the path to the kernel to boot. This field is mandatory. \ +This should be a kernel image that the kexec utility can handle. Generally, \ +this will be a 'vmlinux'-type image.\n\ +Example: /boot/vmlinux\n\ +\n\ +Initrd: enter the path to the initial RAM disk image. This is optional.\n\ +Example: /boot/initrd.img\n\ +\n\ +Device tree: enter the path to the device tree blob file (.dtb). \ +This is optional; if not specified, and your platform currently provides \ +a device tree, the current one will be used.\n\ +Example: /boot/device-tree.dtb\n\ +\n\ +Boot arguments: enter the kernel command-line arguments. This is optional.\n\ +Example: root=/dev/sda1 console=hvc0\n\ +\n"; diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index ac07156..432a92a 100644 --- a/ui/ncurses/nc-boot-editor.c +++ b/ui/ncurses/nc-boot-editor.c @@ -37,6 +37,7 @@ struct boot_editor { STATE_EDIT, STATE_CANCEL, STATE_SAVE, + STATE_HELP, } state; void (*on_exit)(struct cui *cui, struct pmenu_item *item, @@ -60,6 +61,7 @@ struct boot_editor { struct nc_widget_label *args_l; struct nc_widget_textbox *args_f; struct nc_widget_button *ok_b; + struct nc_widget_button *help_b; struct nc_widget_button *cancel_b; } widgets; @@ -70,6 +72,8 @@ struct boot_editor { char *args; }; +extern const char *boot_editor_help_text; + static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr) { struct boot_editor *boot_editor; @@ -103,9 +107,10 @@ static struct boot_editor *boot_editor_from_arg(void *arg) static int boot_editor_post(struct nc_scr *scr) { struct boot_editor *boot_editor = boot_editor_from_scr(scr); - widgetset_post(boot_editor->widgetset); nc_scr_frame_draw(scr); + redrawwin(scr->main_ncw); + wrefresh(boot_editor->scr.main_ncw); pad_refresh(boot_editor); return 0; } @@ -199,6 +204,9 @@ static void boot_editor_process_key(struct nc_scr *scr, int key) else if (key == 'x' || key == 27) boot_editor->state = STATE_CANCEL; + else if (key == 'h') + boot_editor->state = STATE_HELP; + item = NULL; bd = NULL; @@ -210,6 +218,11 @@ static void boot_editor_process_key(struct nc_scr *scr, int key) case STATE_CANCEL: boot_editor->on_exit(boot_editor->cui, item, bd); break; + case STATE_HELP: + boot_editor->state = STATE_EDIT; + cui_show_help(boot_editor->cui, "Boot Option Editor", + boot_editor_help_text); + break; default: break; } @@ -234,6 +247,12 @@ static void ok_click(void *arg) boot_editor->state = STATE_SAVE; } +static void help_click(void *arg) +{ + struct boot_editor *boot_editor = arg; + boot_editor->state = STATE_HELP; +} + static void cancel_click(void *arg) { struct boot_editor *boot_editor = arg; @@ -284,7 +303,8 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor) y++; widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9); - widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 19); + widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19); + widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29); } static void boot_editor_widget_focus(struct nc_widget *widget, void *arg) @@ -456,6 +476,8 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor, boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6, "OK", ok_click, boot_editor); + boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 6, + "Help", help_click, boot_editor); boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 6, "Cancel", cancel_click, boot_editor); } -- 2.39.2