ncurses 5.7 - patch 20100116

[ncurses.git] / test / chgat.c

diff --git a/test/chgat.c b/test/chgat.c
index ee51297de5f006f4c6b1809c98c062bb12e094d9..aee178e16947fbfc4888f10c04c559ed8c53f211 100644 (file)
--- a/test/chgat.c
+++ b/test/chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 2006-2008,2009 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 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: chgat.c,v 1.8 2008/02/09 23:19:13 tom Exp $
+ * $Id: chgat.c,v 1.10 2009/10/24 21:32:57 tom Exp $

  *
  * test-driver for chgat/wchgat/mvchgat/mvwchgat
  */
  *
  * test-driver for chgat/wchgat/mvchgat/mvwchgat
  */


@@ -47,7 +47,7 @@
 typedef struct {
     unsigned c;
     unsigned v;
 typedef struct {
     unsigned c;
     unsigned v;

-    int pair;
+    short pair;

     unsigned attr;
     int count;
     int ch;
     unsigned attr;
     int count;
     int ch;


@@ -60,12 +60,12 @@ typedef struct {
 } STATUS;
 
 static const char *
 } STATUS;
 
 static const char *

-color_params(unsigned state, int *pair)
+color_params(unsigned state, short *pair)

 {
     /* *INDENT-OFF* */
     static struct {
 {
     /* *INDENT-OFF* */
     static struct {

-       int pair;
-       int fg, bg;
+       short pair;
+       short fg, bg;

        const char *msg;
     } table[] = {
        { 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
        const char *msg;
     } table[] = {
        { 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },


@@ -124,10 +124,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);
 }