/****************************************************************************
- * Copyright (c) 2005-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 2005-2011,2012 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* authorization. *
****************************************************************************/
/*
- * $Id: demo_menus.c,v 1.23 2008/02/23 23:06:49 tom Exp $
+ * $Id: demo_menus.c,v 1.36 2012/11/03 19:27:01 tom Exp $
*
* Demonstrate a variety of functions from the menu library.
* Thomas Dickey - 2005/4/9
static MENU *mpFile;
static MENU *mpSelect;
-#if !HAVE_STRDUP
-#define strdup my_strdup
-static char *
-strdup(char *s)
-{
- char *p = (char *) malloc(strlen(s) + 1);
- if (p)
- strcpy(p, s);
- return (p);
-}
-#endif /* not HAVE_STRDUP */
+static bool loaded_file = FALSE;
/* Common function to allow ^T to toggle trace-mode in the middle of a test
* so that trace-files can be made smaller.
#endif
/* FIXME: MENU.itemlen seems the only way to get actual width of items */
- result = (number - (eBanner + 1)) * (mpBanner->itemlen + spc_rows);
+ result = (number - (eBanner + 1)) * (menu_itemwidth(mpBanner) + spc_rows);
}
return result;
}
result = new_menu(items);
if (has_colors()) {
- set_menu_fore(result, COLOR_PAIR(1));
- set_menu_back(result, COLOR_PAIR(2));
+ set_menu_fore(result, (chtype) COLOR_PAIR(1));
+ set_menu_back(result, (chtype) COLOR_PAIR(2));
}
set_menu_format(result, maxrow, maxcol);
static void
menu_destroy(MENU * m)
{
- ITEM **ip;
int count;
+ Trace(("menu_destroy %p", (void *) m));
if (m != 0) {
- delwin(menu_sub(m));
- delwin(menu_win(m));
+ ITEM **items = menu_items(m);
+ const char *blob = 0;
- ip = menu_items(m);
count = item_count(m);
+ Trace(("menu_destroy %p count %d", (void *) m, count));
+ if ((count > 0) && (m == mpSelect)) {
+ blob = item_name(*items);
+ }
+ unpost_menu(m);
free_menu(m);
-#if 0
- if (count > 0) {
- while (*ip) {
- Trace(("freeing item %d:%d", ip - menu_items(m), count));
- free_item(*ip++);
+
+ /* free the extra data allocated in build_select_menu() */
+ if ((count > 0) && (m == mpSelect)) {
+ if (blob && loaded_file) {
+ Trace(("freeing blob %p", blob));
+ free((char *) blob);
}
+ free(items);
+ }
+#ifdef TRACE
+ if ((count > 0) && (m == mpTrace)) {
+ ITEM **ip = items;
+ while (*ip)
+ free(*ip++);
}
#endif
}
ITEM **ip;
CONST_MENUS char **ap = 0;
+ CONST_MENUS char **myList = 0;
unsigned count = 0;
if (filename != 0) {
if (stat(filename, &sb) == 0
&& (sb.st_mode & S_IFMT) == S_IFREG
&& sb.st_size != 0) {
- unsigned size = sb.st_size;
+ size_t size = (size_t) sb.st_size;
unsigned j, k;
- char *blob = malloc(size + 1);
- CONST_MENUS char **list =
- (CONST_MENUS char **) calloc(sizeof(*list), size + 1);
+ char *blob = typeMalloc(char, size + 1);
+ CONST_MENUS char **list = typeCalloc(CONST_MENUS char *, size + 1);
- items = (ITEM **) calloc(sizeof(ITEM *), size + 1);
+ items = typeCalloc(ITEM *, size + 1);
+ Trace(("build_select_menu blob=%p, items=%p",
+ (void *) blob,
+ (void *) items));
if (blob != 0 && list != 0) {
FILE *fp = fopen(filename, "r");
if (fp != 0) {
}
list[k] = 0;
count = k;
- ap = list;
+ ap = myList = list;
}
fclose(fp);
}
+ loaded_file = TRUE;
}
}
}
if (ap == 0) {
count = SIZEOF(labels) - 1;
- items = (ITEM **) calloc(count + 1, sizeof(*items));
+ items = typeCalloc(ITEM *, count + 1);
ap = labels;
}
*ip = 0;
mpSelect = menu_create(items, (int) count, 1, number);
+ if (myList != 0)
+ free(myList);
}
static int
size_t need = 12;
for (n = 0; t_tbl[n].name != 0; n++)
need += strlen(t_tbl[n].name) + 2;
- buf = (char *) malloc(need);
+ buf = typeMalloc(char, need);
}
sprintf(buf, "0x%02x = {", tlevel);
if (tlevel == 0) {
trace(newtrace);
Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
- (void) mvprintw(LINES - 2, 0,
- "Trace level is %s\n", tracetrace(_nc_tracing));
+ MvPrintw(LINES - 2, 0,
+ "Trace level is %s\n", tracetrace(_nc_tracing));
refresh();
}
}
{
static const char *const tbl[] =
{
- "Usage: demo_menus [options]"
+ "Usage: demo_menus [options] [menu-file]"
,""
,"Options:"
#if HAVE_RIPOFFLINE
#endif /* HAVE_RIPOFFLINE */
#ifdef TRACE
case 't':
- trace(strtoul(optarg, 0, 0));
+ trace((unsigned) strtoul(optarg, 0, 0));
break;
#endif
default: