1 files changed, 228 insertions, 139 deletions

diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c
index fefcb53..a23a82e 100644
--- a/gnu/lib/libdialog/radiolist.c
+++ b/gnu/lib/libdialog/radiolist.c
@@ -4,6 +4,8 @@
  *  AUTHOR: Stuart Herbert - S.Herbert@sheffield.ac.uk
  *   (from checklist.c by Savio Lam (lam836@cs.cuhk.hk))
  *
+ *	Substantial rennovation:  12/18/95, Jordan K. Hubbard
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
  *  as published by the Free Software Foundation; either version 2
@@ -24,8 +26,10 @@
 #include "dialog.priv.h"
 
 
-static void print_item(WINDOW *win, char *tag, char *item, int status, int choice, int selected);
+static void print_item(WINDOW *win, char *tag, char *item, int status, int choice, int selected,
+		       dialogMenuItem *me);
 
+#define DREF(di, item)		((di) ? &((di)[(item)]) : NULL)
 
 static int list_width, check_x, item_x;
 
@@ -33,32 +37,61 @@ static int list_width, check_x, item_x;
 /*
  * Display a dialog box with a list of options that can be turned on or off
  */
-int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, int width, int list_height, int item_no, unsigned char **items, unsigned char *result)
+int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, int width, int list_height,
+		     int item_no, void *it, unsigned char *result)
 {
   int i, j, x, y, cur_x, cur_y, box_x, box_y, key = 0, button = 0, choice = 0,
       l, k, scroll = 0, max_choice, *status, was_on = 0;
   int redraw_menu = FALSE;
+  char okButton, cancelButton;
   WINDOW *dialog, *list;
+  unsigned char **items;
+  dialogMenuItem *ditems;
 
   /* Allocate space for storing item on/off status */
-  if ((status = malloc(sizeof(int)*item_no)) == NULL) {
+  if ((status = alloca(sizeof(int)*item_no)) == NULL) {
     endwin();
     fprintf(stderr, "\nCan't allocate memory in dialog_radiolist().\n");
     exit(-1);
   }
-  /* Initializes status */
-  for (i = 0; i < item_no; i++) {
-    status[i] = !strcasecmp(items[i*3 + 2], "on");
-    if (status[i])
-      if (was_on) {
-	endwin();
-	fprintf(stderr, "\nOnly one status can be ON in dialog_radiolist().\n");
-	exit(-1);
-      } else
-	was_on = 1;
+
+  /* Previous calling syntax, e.g. just a list of strings? */
+  if (item_no >= 0) {
+    items = it;
+    ditems = NULL;
+
+    /* Initializes status */
+    for (i = 0; i < item_no; i++) {
+      status[i] = !strcasecmp(items[i*3 + 2], "on");
+      if (status[i]) {
+	if (was_on)
+	  status[i] = FALSE;
+	else
+	  was_on = 1;
+      }
+    }
+  }
+  /* It's the new specification format - fake the rest of the code out */
+  else {
+    item_no = abs(item_no);
+    ditems = it;
+    items = (unsigned char **)alloca((item_no * 3) * sizeof(unsigned char *));
+    /* Initializes status */
+    for (i = 0; i < item_no; i++) {
+      status[i] = ditems[i].checked ? (*ditems[i].checked)(&ditems[i]) : FALSE;
+      if (status[i]) {
+	if (was_on)
+	  status[i] = FALSE;
+	else
+	  was_on = 1;
+      }
+      items[i*3] = ditems[i].prompt;
+      items[i*3 + 1] = ditems[i].title;
+      items[i*3 + 2] = status[i] ? "on" : "off";
+    }
   }
   max_choice = MIN(list_height, item_no);
-
+  
   check_x = 0;
   item_x = 0;
   /* Find length of longest item in order to center radiolist */
@@ -71,23 +104,23 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
     item_x = MAX(item_x, l);
   }
   if (height < 0)
-	height = strheight(prompt)+list_height+4+2;
+    height = strheight(prompt)+list_height+4+2;
   if (width < 0) {
-	i = strwidth(prompt);
-	j = ((title != NULL) ? strwidth(title) : 0);
-	width = MAX(i,j);
-	width = MAX(width,check_x+4)+4;
+    i = strwidth(prompt);
+    j = ((title != NULL) ? strwidth(title) : 0);
+    width = MAX(i,j);
+    width = MAX(width,check_x+4)+4;
   }
   width = MAX(width,24);
-
+  
   if (width > COLS)
-	width = COLS;
+    width = COLS;
   if (height > LINES)
-	height = LINES;
+    height = LINES;
   /* center dialog box on screen */
   x = (COLS - width)/2;
   y = (LINES - height)/2;
-
+  
 #ifdef HAVE_NCURSES
   if (use_shadow)
     draw_shadow(stdscr, y, x, height, width);
@@ -96,10 +129,10 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
   if (dialog == NULL) {
     endwin();
     fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n", height,width,y,x);
-    exit(1);
+    return -1;
   }
   keypad(dialog, TRUE);
-
+  
   draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
   wattrset(dialog, border_attr);
   wmove(dialog, height-3, 0);
@@ -122,21 +155,21 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
   wattrset(dialog, dialog_attr);
   wmove(dialog, 1, 2);
   print_autowrap(dialog, prompt, height-1, width-2, width, 1, 2, TRUE, FALSE);
-
+  
   list_width = width-6;
   getyx(dialog, cur_y, cur_x);
   box_y = cur_y + 1;
   box_x = (width - list_width)/2 - 1;
-
+  
   /* create new window for the list */
   list = subwin(dialog, list_height, list_width, y + box_y + 1, x + box_x + 1);
   if (list == NULL) {
     endwin();
     fprintf(stderr, "\nsubwin(dialog,%d,%d,%d,%d) failed, maybe wrong dims\n", list_height,list_width,y+box_y+1,x+box_x+1);
-    exit(1);
+    return -1;
   }
   keypad(list, TRUE);
-
+  
   /* draw a box around the list items */
   draw_box(dialog, box_y, box_x, list_height+2, list_width+2, menubox_border_attr, menubox_attr);
 
@@ -145,7 +178,7 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
 
   /* Print the list */
   for (i = 0; i < max_choice; i++)
-    print_item(list, items[i*3], items[i*3 + 1], status[i], i, i == choice);
+    print_item(list, items[i*3], items[i*3 + 1], status[i], i, i == choice, DREF(ditems, i));
   wnoutrefresh(list);
   print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
 
@@ -153,49 +186,78 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
 
   x = width/2-11;
   y = height-2;
-  print_button(dialog, "Cancel", y, x+14, FALSE);
-  print_button(dialog, "  OK  ", y, x, TRUE);
+  if (ditems && result) {
+    cancelButton = toupper(ditems[CANCEL_BUTTON].prompt[0]);
+    print_button(dialog, ditems[CANCEL_BUTTON].prompt, y, x + strlen(ditems[OK_BUTTON].prompt) + 5,
+		 ditems[CANCEL_BUTTON].checked ? (*ditems[CANCEL_BUTTON].checked)(&ditems[CANCEL_BUTTON]) : FALSE);
+    okButton = toupper(ditems[OK_BUTTON].prompt[0]);
+    print_button(dialog, ditems[OK_BUTTON].prompt, y, x,
+		 ditems[OK_BUTTON].checked ? (*ditems[OK_BUTTON].checked)(&ditems[OK_BUTTON]) : TRUE);
+  }
+  else {
+    cancelButton = 'C';
+    print_button(dialog, "Cancel", y, x + 14, FALSE);
+    okButton = 'O';
+    print_button(dialog, "  OK  ", y, x, TRUE);
+  }
   wrefresh(dialog);
-
+  
   while (key != ESC) {
     key = wgetch(dialog);
+
+    /* See if its the short-cut to "OK" */
+    if (toupper(key) == okButton) {
+      if (ditems && result && ditems[OK_BUTTON].fire) {
+	if ((*ditems[OK_BUTTON].fire)(&ditems[OK_BUTTON]) == DITEM_FAILURE)
+	  continue;
+	else
+	  delwin(dialog);
+      }
+      else {
+	delwin(dialog);
+	*result = '\0';
+	for (i = 0; i < item_no; i++) {
+	  if (status[i]) {
+	    strcat(result, items[i*3]);
+	    break;
+	  }
+	}
+      }
+      return 0;
+    }
+    /* Shortcut to cancel */
+    else if (toupper(key) == cancelButton) {
+      if (ditems && result && ditems[CANCEL_BUTTON].fire) {
+	if ((*ditems[CANCEL_BUTTON].fire)(&ditems[CANCEL_BUTTON]) == DITEM_FAILURE)
+	  continue;
+      }
+      delwin(dialog);
+      return 1;
+    }
+
     /* Check if key pressed matches first character of any item tag in list */
     for (i = 0; i < max_choice; i++)
       if (toupper(key) == toupper(items[(scroll+i)*3][0]))
         break;
 
-    if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) ||
-        key == KEY_UP || key == KEY_DOWN || key == ' ' ||
-        key == '+' || key == '-' ) {
-      if (key >= '1' && key <= MIN('9', '0'+max_choice))
+    if (i < max_choice || (key >= '1' && key <= MIN('9', '0' + max_choice)) ||
+        key == KEY_UP || key == KEY_DOWN || key == ' ' || key == '+' || key == '-' ) {
+      if (key >= '1' && key <= MIN('9', '0' + max_choice))
         i = key - '1';
       else if (key == KEY_UP || key == '-') {
         if (!choice) {
           if (scroll) {
-#ifdef BROKEN_WSCRL
-    /* wscrl() in ncurses 1.8.1 seems to be broken, causing a segmentation
-       violation when scrolling windows of height = 4, so scrolling is not
-       used for now */
-            scroll--;
-            getyx(dialog, cur_y, cur_x);    /* Save cursor position */
-            /* Reprint list to scroll down */
-            for (i = 0; i < max_choice; i++)
-              print_item(list, items[(scroll+i)*3], items[(scroll+i)*3 + 1], status[scroll+i], i, i == choice);
-
-#else
-
             /* Scroll list down */
             getyx(dialog, cur_y, cur_x);    /* Save cursor position */
             if (list_height > 1) {
               /* De-highlight current first item before scrolling down */
-              print_item(list, items[scroll*3], items[scroll*3 + 1], status[scroll], 0, FALSE);
+              print_item(list, items[scroll*3], items[scroll*3 + 1], status[scroll], 0, FALSE, DREF(ditems, scroll));
               scrollok(list, TRUE);
               wscrl(list, -1);
               scrollok(list, FALSE);
             }
             scroll--;
-            print_item(list, items[scroll*3], items[scroll*3 + 1], status[scroll], 0, TRUE);
-#endif
+            print_item(list, items[scroll*3], items[scroll*3 + 1], status[scroll], 0, TRUE, DREF(ditems, scroll));
             wnoutrefresh(list);
 	    print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
             wrefresh(dialog);
@@ -208,30 +270,19 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
       else if (key == KEY_DOWN || key == '+') {
         if (choice == max_choice - 1) {
           if (scroll+choice < item_no-1) {
-#ifdef BROKEN_WSCRL
-    /* wscrl() in ncurses 1.8.1 seems to be broken, causing a segmentation
-       violation when scrolling windows of height = 4, so scrolling is not
-       used for now */
-            scroll++;
-            getyx(dialog, cur_y, cur_x);    /* Save cursor position */
-            /* Reprint list to scroll up */
-            for (i = 0; i < max_choice; i++)
-              print_item(list, items[(scroll+i)*3], items[(scroll+i)*3 + 1], status[scroll+i], i, i == choice);
-
-#else
-
             /* Scroll list up */
             getyx(dialog, cur_y, cur_x);    /* Save cursor position */
             if (list_height > 1) {
               /* De-highlight current last item before scrolling up */
-              print_item(list, items[(scroll+max_choice-1)*3], items[(scroll+max_choice-1)*3 + 1], status[scroll+max_choice-1], max_choice-1, FALSE);
+              print_item(list, items[(scroll + max_choice - 1) * 3], items[(scroll + max_choice - 1) * 3 + 1],
+			 status[scroll + max_choice - 1], max_choice - 1, FALSE, DREF(ditems, scroll + max_choice - 1));
               scrollok(list, TRUE);
               scroll(list);
               scrollok(list, FALSE);
             }
             scroll++;
-            print_item(list, items[(scroll+max_choice-1)*3], items[(scroll+max_choice-1)*3 + 1], status[scroll+max_choice-1], max_choice-1, TRUE);
-#endif
+            print_item(list, items[(scroll + max_choice - 1) * 3], items[(scroll + max_choice - 1) * 3 + 1],
+		       status[scroll + max_choice - 1], max_choice - 1, TRUE, DREF(ditems, scroll + max_choice - 1));
             wnoutrefresh(list);
 	    print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
             wrefresh(dialog);
@@ -242,28 +293,47 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
           i = choice + 1;
       }
       else if (key == ' ') {    /* Toggle item status */
-	if (!status[scroll+choice])
-	{
-  	  for (i=0; i<item_no; i++)
-	    status[i]=0;
-	  status[scroll+choice]=1;
-          getyx(dialog, cur_y, cur_x);    /* Save cursor position */
-          for (i = 0; i < max_choice; i++)
-            print_item(list, items[(scroll+i)*3], items[(scroll+i)*3 + 1], status[scroll+i], i, i == choice);
-          wnoutrefresh(list);
-          wmove(dialog, cur_y, cur_x);  /* Restore cursor to previous position */
-          wrefresh(dialog);
+	if (status[scroll + choice])
+	  continue;
+	else if (ditems) {
+	  if (ditems[scroll + choice].fire) {
+	    int st = (*ditems[scroll + choice].fire)(&ditems[scroll + choice]);
+
+	    if (st == DITEM_LEAVE_MENU) {
+	      /* Allow a fire action to take us out of the menu */
+	      key = ESC;
+	      break;
+	    }
+	    else if (st == DITEM_FAILURE)
+	      continue;
+	  }
+	  for (i = 0; i < item_no; i++)
+	    status[i] = ditems[i].checked ? (*ditems[i].checked)(&ditems[i]) : FALSE;
+	}
+	else {
+  	  for (i = 0; i < item_no; i++)
+	    status[i] = 0;
+	  status[scroll + choice] = TRUE;
 	}
+	getyx(dialog, cur_y, cur_x);    /* Save cursor position */
+	for (i = 0; i < max_choice; i++)
+	  print_item(list, items[(scroll + i) * 3], items[(scroll + i) * 3 + 1], status[scroll + i], i, i == choice,
+		     DREF(ditems, scroll + i));
+	wnoutrefresh(list);
+	wmove(dialog, cur_y, cur_x);  /* Restore cursor to previous position */
+	wrefresh(dialog);
         continue;    /* wait for another key press */
       }
 
       if (i != choice) {
         /* De-highlight current item */
         getyx(dialog, cur_y, cur_x);    /* Save cursor position */
-	print_item(list, items[(scroll+choice)*3], items[(scroll+choice)*3 +1], status[scroll+choice], choice, FALSE);
+	print_item(list, items[(scroll+choice)*3], items[(scroll+choice)*3 +1], status[scroll+choice], choice, FALSE,
+		   DREF(ditems, scroll + choice));
         /* Highlight new item */
         choice = i;
-        print_item(list, items[(scroll+choice)*3], items[(scroll+choice)*3 + 1], status[scroll+choice], choice, TRUE);
+        print_item(list, items[(scroll+choice)*3], items[(scroll+choice)*3 + 1], status[scroll+choice], choice, TRUE,
+		   DREF(ditems, scroll + choice));
         wnoutrefresh(list);
         wmove(dialog, cur_y, cur_x);  /* Restore cursor to previous position */
         wrefresh(dialog);
@@ -273,93 +343,109 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
 
     switch (key) {
     case KEY_PPAGE:
-	if (scroll > height-4) {	/* can we go up? */
+	if (scroll > height-4)		/* can we go up? */
 	    scroll -= (height-4);
-	} else {
+	else
 	    scroll = 0;
-	}
 	redraw_menu = TRUE;
 	break;
+
     case KEY_NPAGE:
 	if (scroll + list_height >= item_no-1 - list_height) { /* can we go down a full page? */
 	    scroll = item_no - list_height;
-	    if (scroll < 0) scroll = 0;
-	} else {
-	    scroll += list_height;
+	    if (scroll < 0)
+	      scroll = 0;
 	}
+	else
+	  scroll += list_height;
 	redraw_menu = TRUE;
 	break;
+
     case KEY_HOME:
 	scroll = 0;
 	choice = 0;
 	redraw_menu = TRUE;
 	break;
+
     case KEY_END:
 	scroll = item_no - list_height;
-	if (scroll < 0) scroll = 0;
+	if (scroll < 0)
+	  scroll = 0;
 	choice = max_choice - 1;
 	redraw_menu = TRUE;
 	break;
-      case 'O':
-      case 'o':
-        delwin(dialog);
-	*result = '\0';
-        for (i = 0; i < item_no; i++)
-	  if (status[i]) {
-	    strcpy(result, items[i*3]);
-	    break;
-	  }
-        free(status);
-        return 0;
-      case 'C':
-      case 'c':
-        delwin(dialog);
-        free(status);
-        return 1;
-      case KEY_BTAB:
-      case TAB:
-      case KEY_LEFT:
-      case KEY_RIGHT:
-        if (!button) {
-          button = 1;    /* Indicates "Cancel" button is selected */
-          print_button(dialog, "  OK  ", y, x, FALSE);
-          print_button(dialog, "Cancel", y, x+14, TRUE);
-        }
-        else {
-          button = 0;    /* Indicates "OK" button is selected */
-          print_button(dialog, "Cancel", y, x+14, FALSE);
-          print_button(dialog, "  OK  ", y, x, TRUE);
-        }
-        wrefresh(dialog);
-        break;
-      case ' ':
-      case '\r':
-      case '\n':
-        delwin(dialog);
-	if (!button) {
+	
+    case KEY_BTAB:
+    case TAB:
+    case KEY_LEFT:
+    case KEY_RIGHT:
+      button = !button;
+      if (ditems && result) {
+	if (button) {
+	  print_button(dialog, ditems[OK_BUTTON].prompt, y, x,
+		       ditems[OK_BUTTON].checked ? (*ditems[OK_BUTTON].checked)(&ditems[OK_BUTTON]) : !button);
+	  print_button(dialog, ditems[CANCEL_BUTTON].prompt, y, x + strlen(ditems[OK_BUTTON].prompt) + 5,
+		       ditems[CANCEL_BUTTON].checked ? (*ditems[CANCEL_BUTTON].checked)(&ditems[CANCEL_BUTTON]) : button);
+	}
+	else {
+	  print_button(dialog, ditems[CANCEL_BUTTON].prompt, y, x + strlen(ditems[OK_BUTTON].prompt) + 5,
+		       ditems[CANCEL_BUTTON].checked ? (*ditems[CANCEL_BUTTON].checked)(&ditems[CANCEL_BUTTON]) : button);
+	  print_button(dialog, ditems[OK_BUTTON].prompt, y, x,
+		       ditems[OK_BUTTON].checked ? (*ditems[OK_BUTTON].checked)(&ditems[OK_BUTTON]) : !button);
+	}
+      }
+      else {
+	if (button) {
+	  print_button(dialog, "  OK  ", y, x, !button);
+	  print_button(dialog, "Cancel", y, x + 14, button);
+	}
+	else {
+	  print_button(dialog, "Cancel", y, x + 14, button);
+	  print_button(dialog, "  OK  ", y, x, !button);
+	}
+      }
+      wrefresh(dialog);
+      break;
+      
+    case ' ':
+    case '\r':
+    case '\n':
+      if (!button && result) {
+	if (ditems && ditems[button ? CANCEL_BUTTON : OK_BUTTON].fire) {
+	  if ((*ditems[button ? CANCEL_BUTTON : OK_BUTTON].fire)(&ditems[button ? CANCEL_BUTTON : OK_BUTTON]) == DITEM_FAILURE)
+	    continue;
+	}
+	else {
 	  *result = '\0';
-          for (i = 0; i < item_no; i++)
+	  for (i = 0; i < item_no; i++) {
 	    if (status[i]) {
 	      strcpy(result, items[i*3]);
 	      break;
 	    }
+	  }
 	}
-        free(status);
-        return button;
-      case ESC:
-        break;
+      }
+      delwin(dialog);
+      return button;
+      break;
+      
+    case ESC:
+      break;
+
     case KEY_F(1):
     case '?':
-	display_helpfile();
-	break;
+      display_helpfile();
+      break;
     }
+    
     if (redraw_menu) {
-	for (i = 0; i < max_choice; i++)
-	  print_item(list, items[(scroll+i)*3], items[(scroll+i)*3 + 1], status[scroll+i], i, i == choice);
-	wnoutrefresh(list);
-	print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
-	wrefresh(dialog);
-	redraw_menu = FALSE;
+      for (i = 0; i < max_choice; i++)
+	print_item(list, items[(scroll + i) * 3], items[(scroll + i) * 3 + 1], status[scroll + i], i, i == choice,
+		   DREF(ditems, scroll + i));
+      wnoutrefresh(list);
+      print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
+      wrefresh(dialog);
+      redraw_menu = FALSE;
     }
   }
 
@@ -373,7 +459,8 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
 /*
  * Print list item
  */
-static void print_item(WINDOW *win, char *tag, char *item, int status, int choice, int selected)
+static void print_item(WINDOW *win, char *tag, char *item, int status, int choice, int selected,
+		       dialogMenuItem *me)
 {
   int i;
 
@@ -384,7 +471,9 @@ static void print_item(WINDOW *win, char *tag, char *item, int status, int choic
     waddch(win, ' ');
   wmove(win, choice, check_x);
   wattrset(win, selected ? check_selected_attr : check_attr);
-  wprintw(win, "(%c)", status ? '*' : ' ');
+  wprintw(win, "%c%c%c", me && me->lbra ? me->lbra : '(',
+	  status ? me && me->mark ? me->mark : '*' : ' ',
+	  me && me->rbra ? me->rbra : ')');
   wattrset(win, menubox_attr);
   waddch(win, ' ');
   wattrset(win, selected ? tag_key_selected_attr : tag_key_attr);