ncurses 5.7 - patch 20100703

[ncurses.git] / test / clip_printw.c

diff --git a/test/clip_printw.c b/test/clip_printw.c
index 7af637cc9597a593d2fcf154580aff20ca1a2e78..dd3d7ee0579cd2353866b8647b0a0a243ffd7ad7 100644 (file)
--- a/test/clip_printw.c
+++ b/test/clip_printw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2008 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2008-2009,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -26,13 +26,15 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: clip_printw.c,v 1.1 2008/12/20 21:03:06 tom Exp $
+ * $Id: clip_printw.c,v 1.6 2010/05/01 19:13:46 tom Exp $

  *
  * demonstrate how to use printw without wrapping.
  */
 
 #include <test.priv.h>
 
  *
  * demonstrate how to use printw without wrapping.
  */
 
 #include <test.priv.h>
 

+#ifdef HAVE_VW_PRINTW
+

 #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
 #define COLOR_DEFAULT (-1)
 
 #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
 #define COLOR_DEFAULT (-1)
 


@@ -53,7 +55,7 @@ typedef struct {
 } STATUS;
 
 static int
 } STATUS;
 
 static int

-clip_wprintw(WINDOW *win, const char *fmt,...)
+clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt,...)

 {
     int y0, x0, y1, x1, width;
     WINDOW *sub;
 {
     int y0, x0, y1, x1, width;
     WINDOW *sub;


@@ -150,10 +152,17 @@ static void
 fill_window(WINDOW *win)
 {
     int y, x;
 fill_window(WINDOW *win)
 {
     int y, x;

+    int y0 = -1, x0 = -1;

 
     getyx(win, y, x);
     wmove(win, 0, 0);
     while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
 
     getyx(win, y, x);
     wmove(win, 0, 0);
     while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {

+       int y1, x1;
+       getyx(win, y1, x1);
+       if (y1 == y0 && x1 == x0)
+           break;
+       x0 = x1;
+       y0 = y1;

     }
     wmove(win, y, x);
 }
     }
     wmove(win, y, x);
 }


@@ -238,7 +247,7 @@ show_help(WINDOW *win)
 
     getmaxyx(win, y_max, x_max);
     for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
 
     getmaxyx(win, y_max, x_max);
     for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {

-       mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
+       MvWPrintw(win, row, 0, "%.*s", x_max, table[row]);

     }
     while (wgetch(win) != 'q')
        beep();
     }
     while (wgetch(win) != 'q')
        beep();


@@ -318,7 +327,7 @@ test_clipping(WINDOW *win)
     do {
        switch (st.ch) {
        case '.':               /* change from current position */
     do {
        switch (st.ch) {
        case '.':               /* change from current position */

-           wattrset(win, st.attr | COLOR_PAIR(st.pair));
+           (void) wattrset(win, st.attr | COLOR_PAIR(st.pair));

            if (st.count > 0) {
                need = st.count + 1;
                sprintf(fmt, "%%c%%%ds%%c", st.count);
            if (st.count > 0) {
                need = st.count + 1;
                sprintf(fmt, "%%c%%%ds%%c", st.count);


@@ -328,7 +337,7 @@ test_clipping(WINDOW *win)
            }
            if ((buffer = typeMalloc(char, need)) != 0) {
                for (j = 0; j < need; ++j) {
            }
            if ((buffer = typeMalloc(char, need)) != 0) {
                for (j = 0; j < need; ++j) {

-                   buffer[j] = 'A' + (j % 26);
+                   buffer[j] = (char) ('A' + (j % 26));

                }
                buffer[need - 1] = '\0';
                st.status = clip_wprintw(win, fmt, '[', buffer, ']');
                }
                buffer[need - 1] = '\0';
                st.status = clip_wprintw(win, fmt, '[', buffer, ']');


@@ -358,3 +367,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     ExitProgram(EXIT_SUCCESS);
 }
 
     ExitProgram(EXIT_SUCCESS);
 }

+
+#else
+int
+main(void)
+{
+    printf("This program requires the curses vw_printw function\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif