ncurses 6.2 - patch 20200321

[ncurses.git] / test / demo_panels.c

diff --git a/test/demo_panels.c b/test/demo_panels.c
index d28592511c835fe20aac3afed38b0907967ec74a..005483e94f62b7f5eccba19f114cef8f391f2f74 100644 (file)
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2007-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2003-2016,2017 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 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_panels.c,v 1.41 2017/04/15 18:39:29 tom Exp $
+ * $Id: demo_panels.c,v 1.45 2020/02/02 23:34:34 tom Exp $
  *
  * Demonstrate a variety of functions from the panel library.
  */
@@ -204,7 +205,7 @@ mkpanel(short color, int rows, int cols, int tly, int tlx)
 {
     WINDOW *win;
     PANEL *pan = 0;
-    char *userdata = typeMalloc(char, 3);
+    char *userdata = typeMalloc(char, 6);
 
     if ((win = newwin(rows, cols, tly, tlx)) != 0) {
        keypad(win, TRUE);
@@ -222,13 +223,13 @@ mkpanel(short color, int rows, int cols, int tly, int tlx)
            wbkgdset(win, A_BOLD | ' ');
        }
     }
-    _nc_SPRINTF(userdata, _nc_SLIMIT(3) "p%d", color % 8);
+    _nc_SPRINTF(userdata, _nc_SLIMIT(4) "p%d", color % 8);
     set_panel_userptr(pan, (NCURSES_CONST void *) userdata);
     return pan;
 }
 
 static void
-my_remove_panel(PANEL ** pans, int which)
+my_remove_panel(PANEL **pans, int which)
 {
     if (pans[which] != 0) {
        PANEL *pan = pans[which];
@@ -248,9 +249,8 @@ my_remove_panel(PANEL ** pans, int which)
 #define ABS(a)   ((a) < 0 ? -(a) : (a))
 
 static void
-my_create_panel(PANEL ** pans, int which, FillPanel myFill)
+my_create_panel(PANEL **pans, int which, FillPanel myFill)
 {
-    PANEL *pan = 0;
     int code;
     short pair = (short) which;
     short fg = (short) ((pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK);
@@ -281,7 +281,10 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill)
        if (code > 0) {
            int tly = MIN(y0, y1);
            int tlx = MIN(x0, x1);
-           pan = mkpanel(pair, ABS(y1 - y0) + 1, ABS(x1 - x0) + 1, tly, tlx);
+           PANEL *pan = mkpanel(pair,
+                                ABS(y1 - y0) + 1,
+                                ABS(x1 - x0) + 1,
+                                tly, tlx);
            /* finish */
            myFill(pan);
            pans[which] = pan;
@@ -292,7 +295,7 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill)
 }
 
 static void
-my_move_panel(PANEL ** pans, int which, bool continuous)
+my_move_panel(PANEL **pans, int which, bool continuous)
 {
     if (pans[which] != 0) {
        int code;
@@ -317,7 +320,7 @@ my_move_panel(PANEL ** pans, int which, bool continuous)
 }
 
 static void
-my_resize_panel(PANEL ** pans, int which, FillPanel myFill)
+my_resize_panel(PANEL **pans, int which, FillPanel myFill)
 {
     if (pans[which] != 0) {
        int code;
@@ -365,7 +368,7 @@ init_panel(void)
 }
 
 static void
-fill_panel(PANEL * pan)
+fill_panel(PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
@@ -385,7 +388,7 @@ fill_panel(PANEL * pan)
 }
 
 static void
-fill_unboxed(PANEL * pan)
+fill_unboxed(PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
@@ -428,7 +431,7 @@ init_wide_panel(void)
 }
 
 static void
-fill_wide_panel(PANEL * pan)
+fill_wide_panel(PANEL *pan)
 {
     WINDOW *win = panel_window(pan);
     int num = ((const char *) panel_userptr(pan))[1];
@@ -450,7 +453,7 @@ fill_wide_panel(PANEL * pan)
 #define MAX_PANELS 5
 
 static int
-which_panel(PANEL * px[MAX_PANELS + 1], PANEL * pan)
+which_panel(PANEL *px[MAX_PANELS + 1], PANEL *pan)
 {
     int result = 0;
     int j;
@@ -465,7 +468,7 @@ which_panel(PANEL * px[MAX_PANELS + 1], PANEL * pan)
 }
 
 static void
-show_panels(PANEL * px[MAX_PANELS + 1])
+show_help(WINDOW *win)
 {
     static const char *help[] =
     {
@@ -481,7 +484,17 @@ show_panels(PANEL * px[MAX_PANELS + 1])
        "  s - show the panel",
        "  t - put the panel on the top of the stack"
     };
+    int j;
+
+    for (j = 0; j < (int) SIZEOF(help); ++j) {
+       if (wprintw(win, "%s\n", help[j]) == ERR)
+           break;
+    }
+}
 
+static void
+show_panels(PANEL *px[MAX_PANELS + 1])
+{
     struct {
        bool valid;
        bool hidden;
@@ -490,7 +503,6 @@ show_panels(PANEL * px[MAX_PANELS + 1])
     } table[MAX_PANELS + 1];
 
     WINDOW *win;
-    PANEL *pan;
     int j;
 
     memset(table, 0, sizeof(table));
@@ -504,6 +516,8 @@ show_panels(PANEL * px[MAX_PANELS + 1])
     }
 
     if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) {
+       PANEL *pan;
+
        keypad(win, TRUE);
        if ((pan = new_panel(win)) != 0) {
            werase(win);
@@ -527,10 +541,7 @@ show_panels(PANEL * px[MAX_PANELS + 1])
                    waddch(win, '\n');
                }
            }
-           for (j = 0; j < (int) SIZEOF(help); ++j) {
-               if (wprintw(win, "%s\n", help[j]) == ERR)
-                   break;
-           }
+           show_help(win);
            wgetch(win);
            del_panel(pan);
            pflush();
@@ -556,7 +567,7 @@ wrapper(top_panel)
 /* *INDENT-ON* */
 
 static void
-do_panel(PANEL * px[MAX_PANELS + 1],
+do_panel(PANEL *px[MAX_PANELS + 1],
         NCURSES_CONST char *cmd,
         FillPanel myFill)
 {
@@ -622,11 +633,10 @@ ok_digit(int ch)
  * End the command with a newline.  Reject other characters.
  */
 static bool
-get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
+get_command(PANEL *px[MAX_PANELS + 1], char *buffer, int limit)
 {
     int length = 0;
     int y0, x0;
-    int c0, ch;
     WINDOW *win;
 
     getyx(stdscr, y0, x0);
@@ -645,9 +655,9 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
        }
        (void) wgetch(win);
     } else {
-       c0 = 0;
+       int c0 = 0;
        for (;;) {
-           ch = wgetch(win);
+           int ch = wgetch(win);
            if (ch == ERR || ch == QUIT || ch == ESCAPE) {
                buffer[0] = '\0';
                break;