mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: Re: [PATCH v3] Menu: add box style entry
Date: Mon, 6 Sep 2010 20:13:37 +0200	[thread overview]
Message-ID: <20100906181337.GA439@game.jcrosoft.org> (raw)
In-Reply-To: <1283796350-7361-1-git-send-email-plagnioj@jcrosoft.com>

Hi,

	no need

Best Regards,
J.
On 20:05 Mon 06 Sep     , Jean-Christophe PLAGNIOL-VILLARD wrote:
> this will allow you to create a box style entry
> 
> via C API by specifying the type as
> 
> struct menu_entry me = {
> 	.display "test",
> 	.type = MENU_ENTRY_BOX,
> 	.box_state = 1,
> 	.action = action_to_run,
> }
> 
> and via shell
> menu -e -a -m <menu> -c <command> [-R] [-b 0|1] -d <description>
> menu -e -a -m <menu> -u submenu -d [-b 0|1] <description>
> 
> -b with 0 for not selected and 1 for selected
> and -c for the command to run when changing state
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> V3:
> 
> 	do not force a comment for box type
> 
> Best Regards,
> J.
>  commands/menu.c |   33 +++++++++++++++++++++++++--------
>  common/menu.c   |   50 ++++++++++++++++++++++++++++++++++++++++++--------
>  include/menu.h  |   14 +++++++++++++-
>  3 files changed, 80 insertions(+), 17 deletions(-)
> 
> diff --git a/commands/menu.c b/commands/menu.c
> index 2c9ddc3..2350639 100644
> --- a/commands/menu.c
> +++ b/commands/menu.c
> @@ -49,11 +49,13 @@ struct cmd_menu {
>  	char		*submenu;
>  	int		num;
>  	int		auto_select;
> +	menu_entry_type	type;
> +	int		box_state;
>  #endif
>  };
>  
>  #if defined(CONFIG_CMD_MENU_MANAGEMENT)
> -#define OPTS		"m:earlc:d:RsSn:u:A:"
> +#define OPTS		"m:earlc:d:RsSn:u:A:b:B:"
>  #define	is_entry(x)	((x)->entry)
>  #else
>  #define OPTS		"m:ls"
> @@ -62,15 +64,16 @@ struct cmd_menu {
>  
>  #if defined(CONFIG_CMD_MENU_MANAGEMENT)
>  /*
> - * menu -e -a -m <menu> -c <command> [-R] -d <description>
> - * menu -e -a -m <menu> -u submenu -d <description>
> + * menu -e -a -m <menu> -c <command> [-R] [-b 0|1 ] -d <description>
> + * menu -e -a -m <menu> -u submenu -d [-b 0|1] <description>
>   */
>  static int do_menu_entry_add(struct cmd_menu *cm)
>  {
>  	struct menu_entry *me;
>  	struct menu *m;
>  
> -	if (!cm->menu || (!cm->command && !cm->submenu) || !cm->description)
> +	if (!cm->menu || !cm->description ||
> +	    (!cm->command && (!cm->submenu && cm->type !=MENU_ENTRY_BOX)))
>  		return -EINVAL;
>  
>  	m = menu_get_by_name(cm->menu);
> @@ -83,11 +86,15 @@ static int do_menu_entry_add(struct cmd_menu *cm)
>  	if (cm->submenu)
>  		me = menu_add_submenu(m, cm->submenu, cm->description);
>  	else
> -		me = menu_add_command_entry(m, cm->description, cm->command);
> +		me = menu_add_command_entry(m, cm->description, cm->command,
> +					    cm->type);
>  	if (!me)
>  		return PTR_ERR(me);
>  
> -	me->non_re_ent = !cm->re_entrant;
> +	me->box_state = cm->box_state > 0 ? 1 : 0;
> +
> +	if (!cm->submenu)
> +		me->non_re_ent = !cm->re_entrant;
>  
>  	return 0;
>  }
> @@ -359,6 +366,12 @@ static int do_menu(struct command *cmdtp, int argc, char *argv[])
>  			break;
>  		case 'A':
>  			cm.auto_select = simple_strtoul(optarg, NULL, 10);
> +		case 'b':
> +			cm.type = MENU_ENTRY_BOX;
> +			cm.box_state = simple_strtoul(optarg, NULL, 10);
> +			break;
> +		case 'B':
> +			cm.command = optarg;
>  			break;
>  #endif
>  		default:
> @@ -431,11 +444,15 @@ static const __maybe_unused char cmd_menu_help[] =
>  "\n"
>  "Add an entry\n"
>  "  (-R for do no exit the menu after executing the command)\n"
> -"  menu -e -a -m <menu> -c <command> [-R] -d <description>\n"
> +"  (-b for box style 1 for selected)\n"
> +"  (and optional -c for the command to run when we change the state)\n"
> +"  menu -e -a -m <menu> -c <command> [-R] [-b 0|1] -d <description>\n"
>  
>  "Add a submenu entry\n"
>  "  (-R is not needed)\n"
> -"  menu -e -a -m <menu> -u <menu> -d <description>\n"
> +"  (-b for box style 1 for selected)\n"
> +"  (and -c is not needed)\n"
> +"  menu -e -a -m <menu> -u submenu -d [-b 0|1] <description>\n"
>  "\n"
>  "Remove an entry\n"
>  "  menu -e -r -m <name> -n <num>\n"
> diff --git a/common/menu.c b/common/menu.c
> index 4307a07..36d9f45 100644
> --- a/common/menu.c
> +++ b/common/menu.c
> @@ -152,10 +152,27 @@ void menu_entry_free(struct menu_entry *me)
>  static void print_menu_entry(struct menu *m, struct menu_entry *me, int reverse)
>  {
>  	gotoXY(me->num + 1, 3);
> -	if (reverse)
> -		printf_reverse("%d: %-*s", me->num, m->width, me->display);
> -	else
> -		printf("%d: %-*s", me->num, m->width, me->display);
> +	if (reverse) {
> +		if (me->type == MENU_ENTRY_BOX) {
> +			if (me->box_state)
> +				puts_reverse("[*]");
> +			else
> +				puts_reverse("[ ]");
> +		} else {
> +			printf_reverse("   ");
> +		}
> +		printf_reverse(" %d: %-*s", me->num, m->width, me->display);
> +	} else {
> +		if (me->type == MENU_ENTRY_BOX) {
> +			if (me->box_state)
> +				puts("[*]");
> +			else
> +				puts("[ ]");
> +		} else {
> +			puts("   ");
> +		}
> +		printf(" %d: %-*s", me->num, m->width, me->display);
> +	}
>  }
>  
>  int menu_set_selected_entry(struct menu *m, struct menu_entry* me)
> @@ -307,8 +324,18 @@ int menu_show(struct menu *m)
>  			}
>  			print_menu_entry(m, m->selected, 1);
>  			break;
> +		case ' ':
> +			if (m->selected->type != MENU_ENTRY_BOX)
> +				break;
> +			m->selected->box_state = !m->selected->box_state;
> +			if (m->selected->action)
> +				m->selected->action(m, m->selected);
> +			print_menu_entry(m, m->selected, 1);
> +			break;
>  		case '\n':
>  		case '\r':
> +			if (!m->selected->action)
> +				break;
>  			clear();
>  			gotoXY(1,1);
>  			m->selected->action(m, m->selected);
> @@ -336,6 +363,9 @@ static void menu_action_show(struct menu *m, struct menu_entry *me)
>  	struct submenu *s = container_of(me, struct submenu, entry);
>  	struct menu *sm;
>  
> +	if (me->type == MENU_ENTRY_BOX && !me->box_state)
> +		return;
> +
>  	sm = menu_get_by_name(s->submenu);
>  	if (sm)
>  		menu_show(sm);
> @@ -411,7 +441,8 @@ static void menu_command_free(struct menu_entry *me)
>  	free(e);
>  }
>  
> -struct menu_entry *menu_add_command_entry(struct menu *m, char *display, char *command)
> +struct menu_entry *menu_add_command_entry(struct menu *m, char *display,
> +					  char *command, menu_entry_type type)
>  {
>  	struct action_entry *e = calloc(1, sizeof(*e));
>  	int ret;
> @@ -419,12 +450,15 @@ struct menu_entry *menu_add_command_entry(struct menu *m, char *display, char *c
>  	if (!e)
>  		return ERR_PTR(-ENOMEM);
>  
> -	e->command = strdup(command);
> -	e->entry.action = menu_action_command;
> +	if (type != MENU_ENTRY_BOX) {
> +		e->command = strdup(command);
> +		e->entry.action = menu_action_command;
> +	}
>  	e->entry.free = menu_command_free;
> +	e->entry.type = type;
>  	e->entry.display = strdup(display);
>  
> -	if (!e->entry.display || !e->command) {
> +	if (!e->entry.display || (type != MENU_ENTRY_BOX && !e->command)) {
>  		ret = -ENOMEM;
>  		goto err_free;
>  	}
> diff --git a/include/menu.h b/include/menu.h
> index cc9d0af..6e7b555 100644
> --- a/include/menu.h
> +++ b/include/menu.h
> @@ -28,6 +28,11 @@
>  
>  struct menu;
>  
> +typedef enum {
> +	MENU_ENTRY_NORMAL = 0,
> +	MENU_ENTRY_BOX,
> +} menu_entry_type;
> +
>  struct menu_entry {
>  	int num;
>  	char *display;
> @@ -35,6 +40,12 @@ struct menu_entry {
>  	void (*free)(struct menu_entry *me);
>  	int non_re_ent;
>  
> +	/* MENU_ENTRY_BOX */
> +	int box_state;
> +	void (*box_action)(struct menu *m, struct menu_entry *me);
> +
> +	menu_entry_type type;
> +
>  	struct list_head list;
>  };
>  
> @@ -69,7 +80,8 @@ static inline struct menu* menu_alloc(void)
>  	return m;
>  }
>  struct menu_entry *menu_add_submenu(struct menu *parent, char *submenu, char *display);
> -struct menu_entry *menu_add_command_entry(struct menu *m, char *display, char *command);
> +struct menu_entry *menu_add_command_entry(struct menu *m, char *display,
> +					  char *command, menu_entry_type type);
>  void menu_free(struct menu *m);
>  int menu_add(struct menu* m);
>  void menu_remove(struct menu *m);
> -- 
> 1.7.1

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2010-09-06 18:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-06 15:21 [PATCH V2] " Jean-Christophe PLAGNIOL-VILLARD
2010-09-06 18:05 ` [PATCH v3] " Jean-Christophe PLAGNIOL-VILLARD
2010-09-06 18:13   ` Jean-Christophe PLAGNIOL-VILLARD [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100906181337.GA439@game.jcrosoft.org \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox