ncurses 6.0 - patch 20160625

[ncurses.git] / test / demo_menus.c

diff --git a/test/demo_menus.c b/test/demo_menus.c
index 803482ecc70c9d153d7a73d95f3b9b8a55f3572f..7fe0ea37394dab003ead0e3b3e9eb243f83c8a71 100644 (file)
--- a/test/demo_menus.c
+++ b/test/demo_menus.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2005-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 2005-2015,2016 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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_menus.c,v 1.50 2013/06/08 21:38:37 tom Exp $
+ * $Id: demo_menus.c,v 1.59 2016/03/27 00:02:01 tom Exp $
  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9
@@ -97,7 +97,7 @@ typedef enum {
 #define MENU_Y 1
 
 typedef struct {
-    const char *name;
+    NCURSES_CONST char *name;
     void (*func) (int);
     unsigned mask;
 } MENU_DATA;
@@ -112,6 +112,8 @@ static WINDOW *status;
 
 static bool loaded_file = FALSE;
 
+static char empty[1];
+
 /* Common function to allow ^T to toggle trace-mode in the middle of a test
  * so that trace-files can be made smaller.
  */
@@ -268,13 +270,6 @@ menu_create(ITEM ** items, int count, int ncols, MenuNo number)
     if (mcols + (2 * margin + x) >= COLS)
        mcols = COLS - (2 * margin + x);
 
-#ifdef TRACE
-    if (number == eTrace)
-       menu_opts_off(result, O_ONEVALUE);
-    else
-       menu_opts_on(result, O_ONEVALUE);
-#endif
-
     menuwin = newwin(mrows + (2 * margin), mcols + (2 * margin), y, x);
     set_menu_win(result, menuwin);
     keypad(menuwin, TRUE);
@@ -283,6 +278,16 @@ menu_create(ITEM ** items, int count, int ncols, MenuNo number)
 
     set_menu_sub(result, derwin(menuwin, mrows, mcols, margin, margin));
 
+#ifdef TRACE
+    if (number == eTrace)
+       menu_opts_off(result, O_ONEVALUE);
+    else
+       menu_opts_on(result, O_ONEVALUE);
+#endif
+#if defined(NCURSES_MOUSE_VERSION) && defined(O_MOUSE_MENU)
+    menu_opts_on(result, O_MOUSE_MENU);
+#endif
+
     post_menu(result);
 
     set_menu_init(result, my_menu_init);
@@ -315,7 +320,7 @@ menu_destroy(MENU * m)
        if ((count > 0) && (m == mpSelect)) {
            if (blob && loaded_file) {
                Trace(("freeing blob %p", blob));
-               free((char *) blob);
+               free((void *) blob);
            }
            free(items);
            items = 0;
@@ -356,8 +361,8 @@ build_file_menu(MenuNo number)
     int n;
 
     for (n = 0; table[n].name != 0; ++n) {
-       *ip = new_item(table[n].name, "");
-       set_item_userptr(*ip, &table[n]);
+       *ip = new_item(table[n].name, empty);
+       set_item_userptr(*ip, (void *) &table[n]);
        ++ip;
     }
     *ip = (ITEM *) 0;
@@ -407,7 +412,7 @@ build_select_menu(MenuNo number, char *filename)
     MENU_DATA *ap = 0;
     MENU_DATA *myList = 0;
     int i;
-    unsigned count = 0;
+    size_t count = 0;
 
     if (filename != 0) {
        struct stat sb;
@@ -464,8 +469,8 @@ build_select_menu(MenuNo number, char *filename)
     for (i = 0; ap[i].name != 0; ++i) {
        ap[i].func = call_select;
        ap[i].mask = (unsigned) i;
-       *ip = new_item(ap[i].name, "");
-       set_item_userptr(*ip, &table[i]);
+       *ip = new_item(ap[i].name, empty);
+       set_item_userptr(*ip, (void *) &table[i]);
        ++ip;
     }
     *ip = 0;
@@ -526,8 +531,8 @@ build_trace_menu(MenuNo number)
     int n;
 
     for (n = 0; t_tbl[n].name != 0; n++) {
-       *ip = new_item(t_tbl[n].name, "");
-       set_item_userptr(*ip, &t_tbl[n]);
+       *ip = new_item(t_tbl[n].name, empty);
+       set_item_userptr(*ip, (void *) &t_tbl[n]);
        ++ip;
     }
     *ip = (ITEM *) 0;
@@ -595,7 +600,7 @@ perform_trace_menu(int cmd)
     int result;
 
     for (ip = menu_items(mpTrace); *ip; ip++) {
-       MENU_DATA *td = item_userptr(*ip);
+       MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
        unsigned mask = td->mask;
        if (mask == 0)
            set_item_value(*ip, _nc_tracing == 0);
@@ -610,7 +615,7 @@ perform_trace_menu(int cmd)
            newtrace = 0;
            for (ip = menu_items(mpTrace); *ip; ip++) {
                if (item_value(*ip)) {
-                   MENU_DATA *td = item_userptr(*ip);
+                   MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
                    newtrace |= td->mask;
                }
            }
@@ -683,8 +688,8 @@ build_menus(char *filename)
     int n;
 
     for (n = 0; table[n].name != 0; ++n) {
-       *ip = new_item(table[n].name, "");
-       set_item_userptr(*ip, &table[n]);
+       *ip = new_item(table[n].name, empty);
+       set_item_userptr(*ip, (void *) &table[n]);
        ++ip;
     }
     *ip = (ITEM *) 0;
@@ -749,6 +754,36 @@ move_menus(MENU * current, int by_y, int by_x)
     }
 }
 
+#ifdef KEY_RESIZE
+static void
+resize_menu(MENU ** menu)
+{
+#if 0
+    WINDOW *win = menu_win(*menu);
+    WINDOW *sub = menu_sub(*menu);
+#endif
+    (void) menu;
+}
+
+static void
+resize_menus(MENU * current)
+{
+    (void) current;
+
+    werase(status);
+    wnoutrefresh(status);
+    wresize(status, 1, COLS);
+    mvwin(status, LINES - 1, 0);
+
+    resize_menu(&mpBanner);
+    resize_menu(&mpFile);
+    resize_menu(&mpSelect);
+#ifdef TRACE
+    resize_menu(&mpTrace);
+#endif
+}
+#endif
+
 static void
 show_status(int ch, MENU * menu)
 {
@@ -772,7 +807,7 @@ perform_menus(void)
     int ch = ERR;
 
 #ifdef NCURSES_MOUSE_VERSION
-    mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
+    mousemask(BUTTON1_CLICKED, (mmask_t *) 0);
 #endif
 
     menu_display(last_menu);
@@ -801,6 +836,11 @@ perform_menus(void)
        case KEY_SRIGHT:
            move_menus(last_menu, 0, 1);
            continue;
+#ifdef KEY_RESIZE
+       case KEY_RESIZE:
+           resize_menus(last_menu);
+           continue;
+#endif
        }
        cmd = menu_virtualize(ch);
 
@@ -834,9 +874,17 @@ perform_menus(void)
 #endif
            }
 
+#if defined(NCURSES_MOUSE_VERSION) && defined(O_MOUSE_MENU)
            if ((code == E_REQUEST_DENIED) && (cmd == KEY_MOUSE)) {
+               (void) menu_getc(mpBanner);
                code = menu_driver(mpBanner, cmd);
+               if (code == E_REQUEST_DENIED) {
+                   MEVENT event;
+                   if (menu_getc(mpBanner) == KEY_MOUSE)
+                       getmouse(&event);       /* give up */
+               }
            }
+#endif
 
            break;
        }
@@ -859,17 +907,13 @@ perform_menus(void)
        if (code == E_UNKNOWN_COMMAND
            || code == E_NOT_POSTED) {
            ITEM *item = current_item(last_menu);
-           MENU_DATA *td = item_userptr(item);
+           MENU_DATA *td = (MENU_DATA *) item_userptr(item);
            td->func((int) td->mask);
        }
        if (code == E_REQUEST_DENIED)
            beep();
        continue;
     }
-
-#ifdef NCURSES_MOUSE_VERSION
-    mousemask(0, (mmask_t *) 0);
-#endif
 }
 
 static void
@@ -948,7 +992,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) {
+    while ((c = getopt(argc, argv, "fht:")) != -1) {
        switch (c) {
 #if HAVE_RIPOFFLINE
        case 'f':