ncurses 6.2 - patch 20200627

[ncurses.git] / test / demo_panels.c

diff --git a/test/demo_panels.c b/test/demo_panels.c
old mode 100755 (executable)
new mode 100644 (file)
index 55593c0..005483e
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2007,2008 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            *
  *                                                                          *
  * 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.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: demo_panels.c,v 1.33 2008/08/04 13:33:48 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.
  */
  *
  * Demonstrate a variety of functions from the panel library.
  */


@@ -117,10 +118,9 @@ get_position(NCURSES_CONST char *text,
     int result = 0;
     int x1, y1;
     char cmd;
     int result = 0;
     int x1, y1;
     char cmd;

-    WINDOW *win;

 
     getyx(stdscr, y1, x1);
 
     getyx(stdscr, y1, x1);

-    win = statusline();
+    (void) statusline();

 
     show_position(text, also, which, y1, x1);
 
 
     show_position(text, also, which, y1, x1);
 


@@ -205,7 +205,7 @@ mkpanel(short color, int rows, int cols, int tly, int tlx)
 {
     WINDOW *win;
     PANEL *pan = 0;
 {
     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);
 
     if ((win = newwin(rows, cols, tly, tlx)) != 0) {
        keypad(win, TRUE);


@@ -223,13 +223,13 @@ mkpanel(short color, int rows, int cols, int tly, int tlx)
            wbkgdset(win, A_BOLD | ' ');
        }
     }
            wbkgdset(win, A_BOLD | ' ');
        }
     }

-    sprintf(userdata, "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
     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];
 {
     if (pans[which] != 0) {
        PANEL *pan = pans[which];


@@ -249,9 +249,8 @@ my_remove_panel(PANEL ** pans, int which)
 #define ABS(a)   ((a) < 0 ? -(a) : (a))
 
 static void
 #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);
     int code;
     short pair = (short) which;
     short fg = (short) ((pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK);


@@ -272,7 +271,7 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill)
 
     if (code > 0) {
        char also[80];
 
     if (code > 0) {
        char also[80];

-       sprintf(also, " (first %d,%d)", y0, x0);
+       _nc_SPRINTF(also, _nc_SLIMIT(sizeof(also)) " (first %d,%d)", y0, x0);

        /* get the position of the opposite corner */
        while ((code = get_position("Opposite corner",
                                    also, which, &x1, &y1)) == 0) {
        /* get the position of the opposite corner */
        while ((code = get_position("Opposite corner",
                                    also, which, &x1, &y1)) == 0) {


@@ -282,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);
        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;
            /* finish */
            myFill(pan);
            pans[which] = pan;


@@ -293,7 +295,7 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill)
 }
 
 static void
 }
 
 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;
 {
     if (pans[which] != 0) {
        int code;


@@ -303,7 +305,7 @@ my_move_panel(PANEL ** pans, int which, bool continuous)
        char also[80];
 
        getbegyx(win, y0, x0);
        char also[80];
 
        getbegyx(win, y0, x0);

-       sprintf(also, " (start %d,%d)", y0, x0);
+       _nc_SPRINTF(also, _nc_SLIMIT(sizeof(also)) " (start %d,%d)", y0, x0);

        wmove(stdscr, y0, x0);
        while ((code = get_position("Move panel", also, which, &x1, &y1)) == 0) {
            if (continuous) {
        wmove(stdscr, y0, x0);
        while ((code = get_position("Move panel", also, which, &x1, &y1)) == 0) {
            if (continuous) {


@@ -318,7 +320,7 @@ my_move_panel(PANEL ** pans, int which, bool continuous)
 }
 
 static void
 }
 
 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;
 {
     if (pans[which] != 0) {
        int code;


@@ -328,7 +330,7 @@ my_resize_panel(PANEL ** pans, int which, FillPanel myFill)
        char also[80];
 
        getbegyx(win, y0, x0);
        char also[80];
 
        getbegyx(win, y0, x0);

-       sprintf(also, " (start %d,%d)", y0, x0);
+       _nc_SPRINTF(also, _nc_SLIMIT(sizeof(also)) " (start %d,%d)", y0, x0);

        wmove(stdscr, y0, x0);
        while ((code = get_position("Resize panel",
                                    also, which, &x1, &y1)) == 0) {
        wmove(stdscr, y0, x0);
        while ((code = get_position("Resize panel",
                                    also, which, &x1, &y1)) == 0) {


@@ -366,7 +368,7 @@ init_panel(void)
 }
 
 static void
 }
 
 static void

-fill_panel(PANEL * pan)
+fill_panel(PANEL *pan)

 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);


@@ -386,7 +388,7 @@ fill_panel(PANEL * pan)
 }
 
 static void
 }
 
 static void

-fill_unboxed(PANEL * pan)
+fill_unboxed(PANEL *pan)

 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);
 {
     WINDOW *win = panel_window(pan);
     const char *userptr = (const char *) panel_userptr(pan);


@@ -407,7 +409,7 @@ make_fullwidth_digit(cchar_t *target, int digit)
 {
     wchar_t source[2];
 
 {
     wchar_t source[2];
 

-    source[0] = digit + 0xff10;
+    source[0] = (wchar_t) (digit + 0xff10);

     source[1] = 0;
     setcchar(target, source, A_NORMAL, 0, 0);
 }
     source[1] = 0;
     setcchar(target, source, A_NORMAL, 0, 0);
 }


@@ -429,7 +431,7 @@ init_wide_panel(void)
 }
 
 static 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];
 {
     WINDOW *win = panel_window(pan);
     int num = ((const char *) panel_userptr(pan))[1];


@@ -451,7 +453,7 @@ fill_wide_panel(PANEL * pan)
 #define MAX_PANELS 5
 
 static int
 #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;
 {
     int result = 0;
     int j;


@@ -466,7 +468,7 @@ which_panel(PANEL * px[MAX_PANELS + 1], PANEL * pan)
 }
 
 static void
 }
 
 static void

-show_panels(PANEL * px[MAX_PANELS + 1])
+show_help(WINDOW *win)

 {
     static const char *help[] =
     {
 {
     static const char *help[] =
     {


@@ -480,9 +482,19 @@ show_panels(PANEL * px[MAX_PANELS + 1])
        "  m - move the panel (M for continuous move)",
        "  r - resize the panel",
        "  s - show the panel",
        "  m - move the panel (M for continuous move)",
        "  r - resize the panel",
        "  s - show the panel",

-       "  b - put the panel on the top of the stack"
+       "  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;
     struct {
        bool valid;
        bool hidden;


@@ -491,9 +503,9 @@ show_panels(PANEL * px[MAX_PANELS + 1])
     } table[MAX_PANELS + 1];
 
     WINDOW *win;
     } table[MAX_PANELS + 1];
 
     WINDOW *win;

-    PANEL *pan;

     int j;
 
     int j;
 

+    memset(table, 0, sizeof(table));

     for (j = 1; j <= MAX_PANELS; ++j) {
        table[j].valid = (px[j] != 0);
        if (table[j].valid) {
     for (j = 1; j <= MAX_PANELS; ++j) {
        table[j].valid = (px[j] != 0);
        if (table[j].valid) {


@@ -504,10 +516,12 @@ show_panels(PANEL * px[MAX_PANELS + 1])
     }
 
     if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) {
     }
 
     if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) {

+       PANEL *pan;
+

        keypad(win, TRUE);
        if ((pan = new_panel(win)) != 0) {
            werase(win);
        keypad(win, TRUE);
        if ((pan = new_panel(win)) != 0) {
            werase(win);

-           mvwprintw(win, 0, 0, "Panels:\n");
+           MvWPrintw(win, 0, 0, "Panels:\n");

            for (j = 1; j <= MAX_PANELS; ++j) {
                if (table[j].valid) {
                    wprintw(win, " %d:", j);
            for (j = 1; j <= MAX_PANELS; ++j) {
                if (table[j].valid) {
                    wprintw(win, " %d:", j);


@@ -527,10 +541,7 @@ show_panels(PANEL * px[MAX_PANELS + 1])
                    waddch(win, '\n');
                }
            }
                    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();
            wgetch(win);
            del_panel(pan);
            pflush();


@@ -556,7 +567,7 @@ wrapper(top_panel)
 /* *INDENT-ON* */
 
 static void
 /* *INDENT-ON* */
 
 static void

-do_panel(PANEL * px[MAX_PANELS + 1],
+do_panel(PANEL *px[MAX_PANELS + 1],

         NCURSES_CONST char *cmd,
         FillPanel myFill)
 {
         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
  * 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 length = 0;
     int y0, x0;

-    int c0, ch;

     WINDOW *win;
 
     getyx(stdscr, y0, x0);
     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 {
        }
        (void) wgetch(win);
     } else {

-       c0 = 0;
+       int c0 = 0;

        for (;;) {
        for (;;) {

-           ch = wgetch(win);
+           int ch = wgetch(win);

            if (ch == ERR || ch == QUIT || ch == ESCAPE) {
                buffer[0] = '\0';
                break;
            if (ch == ERR || ch == QUIT || ch == ESCAPE) {
                buffer[0] = '\0';
                break;


@@ -655,7 +665,7 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
                wrefresh(curscr);
            } else if (ch == '\n' || ch == KEY_ENTER) {
                break;
                wrefresh(curscr);
            } else if (ch == '\n' || ch == KEY_ENTER) {
                break;

-           } else if (ch == '?') {
+           } else if (ch == HELP_KEY_1) {

                show_panels(px);
            } else if (length + 3 < limit) {
                if (ch >= KEY_MIN) {
                show_panels(px);
            } else if (length + 3 < limit) {
                if (ch >= KEY_MIN) {