ncurses 5.7 - patch 20110115

[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 2adc690..ce6beb7
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2007-2008,2010 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.30 2008/04/12 21:59:49 tom Exp $
+ * $Id: demo_panels.c,v 1.37 2010/05/01 22:19:02 tom Exp $
  *
  * Demonstrate a variety of functions from the panel library.
  */
@@ -117,10 +117,9 @@ get_position(NCURSES_CONST char *text,
     int result = 0;
     int x1, y1;
     char cmd;
-    WINDOW *win;
 
     getyx(stdscr, y1, x1);
-    win = statusline();
+    (void) statusline();
 
     show_position(text, also, which, y1, x1);
 
@@ -212,9 +211,9 @@ mkpanel(short color, int rows, int cols, int tly, int tlx)
        if ((pan = new_panel(win)) == 0) {
            delwin(win);
        } else if (use_colors) {
-           short fg = ((color == COLOR_BLUE)
-                       ? COLOR_WHITE
-                       : COLOR_BLACK);
+           short fg = (short) ((color == COLOR_BLUE)
+                               ? COLOR_WHITE
+                               : COLOR_BLACK);
            short bg = color;
 
            init_pair(color, fg, bg);
@@ -244,6 +243,7 @@ my_remove_panel(PANEL ** pans, int which)
     }
 }
 
+#undef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #define ABS(a)   ((a) < 0 ? -(a) : (a))
 
@@ -252,8 +252,8 @@ my_create_panel(PANEL ** pans, int which, FillPanel myFill)
 {
     PANEL *pan = 0;
     int code;
-    int pair = which;
-    short fg = (pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK;
+    short pair = (short) which;
+    short fg = (short) ((pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK);
     short bg = pair;
     int x0, y0, x1, y1;
 
@@ -368,7 +368,8 @@ static void
 fill_panel(PANEL * pan)
 {
     WINDOW *win = panel_window(pan);
-    int num = ((const char *) panel_userptr(pan))[1];
+    const char *userptr = (const char *) panel_userptr(pan);
+    int num = (userptr && *userptr) ? userptr[1] : '?';
     int y, x;
 
     wmove(win, 1, 1);
@@ -387,7 +388,8 @@ static void
 fill_unboxed(PANEL * pan)
 {
     WINDOW *win = panel_window(pan);
-    int num = ((const char *) panel_userptr(pan))[1];
+    const char *userptr = (const char *) panel_userptr(pan);
+    int num = (userptr && *userptr) ? userptr[1] : '?';
     int y, x;
 
     for (y = 0; y < getmaxy(win); y++) {
@@ -491,6 +493,7 @@ show_panels(PANEL * px[MAX_PANELS + 1])
     PANEL *pan;
     int j;
 
+    memset(table, 0, sizeof(table));
     for (j = 1; j <= MAX_PANELS; ++j) {
        table[j].valid = (px[j] != 0);
        if (table[j].valid) {
@@ -504,7 +507,7 @@ show_panels(PANEL * px[MAX_PANELS + 1])
        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);
@@ -633,7 +636,7 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
 
     if (log_in != 0) {
        if (fgets(buffer, limit - 3, log_in) != 0) {
-           length = strlen(buffer);
+           length = (int) strlen(buffer);
            while (length > 0 && isspace(UChar(buffer[length - 1])))
                buffer[--length] = '\0';
            waddstr(win, buffer);
@@ -663,22 +666,22 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
                    } else if (isdigit(UChar(c0))) {
                        wprintw(win, " %c", ch);
                        buffer[length++] = ' ';
-                       buffer[length++] = c0 = ch;
+                       buffer[length++] = (char) (c0 = ch);
                    } else {
                        wprintw(win, "%c", ch);
-                       buffer[length++] = c0 = ch;
+                       buffer[length++] = (char) (c0 = ch);
                    }
                } else if (ok_digit(ch)) {
                    if (isalpha(UChar(c0))) {
                        wprintw(win, "%c", ch);
-                       buffer[length++] = c0 = ch;
+                       buffer[length++] = (char) (c0 = ch);
                    } else {
                        beep();
                    }
                } else if (ch == ' ') {
                    if (isdigit(UChar(c0))) {
                        wprintw(win, "%c", ch);
-                       buffer[length++] = c0 = ch;
+                       buffer[length++] = (char) (c0 = ch);
                    } else {
                        beep();
                    }
@@ -714,7 +717,7 @@ demo_panels(InitPanel myInit, FillPanel myFill)
     memset(px, 0, sizeof(px));
 
     while (get_command(px, buffer, sizeof(buffer))) {
-       int limit = strlen(buffer);
+       int limit = (int) strlen(buffer);
        for (itmp = 0; itmp < limit; itmp += 3) {
            do_panel(px, buffer + itmp, myFill);
        }