aboutsummaryrefslogtreecommitdiff
path: root/test/demo_panels.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/demo_panels.c')
-rw-r--r--test/demo_panels.c71
1 files changed, 40 insertions, 31 deletions
diff --git a/test/demo_panels.c b/test/demo_panels.c
index ce6beb703ce2..ac3b43186011 100644
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2007-2008,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2007-2018,2019 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_panels.c,v 1.37 2010/05/01 22:19:02 tom Exp $
+ * $Id: demo_panels.c,v 1.44 2019/08/31 23:24:11 tom Exp $
*
* Demonstrate a variety of functions from the panel library.
*/
@@ -204,7 +204,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 +222,13 @@ mkpanel(short color, int rows, int cols, int tly, int tlx)
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
-my_remove_panel(PANEL ** pans, int which)
+my_remove_panel(PANEL **pans, int which)
{
if (pans[which] != 0) {
PANEL *pan = pans[which];
@@ -248,9 +248,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);
@@ -271,7 +270,7 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill)
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) {
@@ -281,7 +280,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 +294,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;
@@ -302,7 +304,7 @@ my_move_panel(PANEL ** pans, int which, bool continuous)
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) {
@@ -317,7 +319,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;
@@ -327,7 +329,7 @@ my_resize_panel(PANEL ** pans, int which, FillPanel myFill)
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) {
@@ -365,7 +367,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 +387,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);
@@ -406,7 +408,7 @@ make_fullwidth_digit(cchar_t *target, int digit)
{
wchar_t source[2];
- source[0] = digit + 0xff10;
+ source[0] = (wchar_t) (digit + 0xff10);
source[1] = 0;
setcchar(target, source, A_NORMAL, 0, 0);
}
@@ -428,7 +430,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 +452,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 +467,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[] =
{
@@ -479,9 +481,19 @@ show_panels(PANEL * px[MAX_PANELS + 1])
" 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;
@@ -490,7 +502,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 +515,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 +540,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 +566,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 +632,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 +654,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;
@@ -655,7 +664,7 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
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) {