X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Finsdelln.c;h=d5034a4459667a7fcb027f5cc5a14f50f9a324ac;hp=f25a90c03a09c78b94de7fdd82227ba4fc49b284;hb=52aa842907b31bb56fb5133da3f023b45bd4355f;hpb=06ae48ca77d71610e4d86d138a8fd19db84634ce

diff --git a/test/insdelln.c b/test/insdelln.c
index f25a90c0..d5034a44 100644
--- a/test/insdelln.c
+++ b/test/insdelln.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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: insdelln.c,v 1.1 2008/12/20 22:06:52 tom Exp $
+ * $Id: insdelln.c,v 1.5 2010/11/13 23:39:38 tom Exp $
  *
  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
  */
@@ -56,8 +56,8 @@ color_params(unsigned state, int *pair)
 {
     /* *INDENT-OFF* */
     static struct {
-	int pair;
-	int fg, bg;
+	short pair;
+	short fg, bg;
 	const char *msg;
     } table[] = {
 	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
@@ -116,10 +116,17 @@ static void
 fill_window(WINDOW *win)
 {
     int y, x;
+    int y0 = -1, x0 = -1;
 
     getyx(win, y, x);
-    wmove(win, 1, 0);
+    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);
 }
@@ -217,7 +224,7 @@ show_help(WINDOW *win)
 
     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();
@@ -293,7 +300,7 @@ test_winsdelln(WINDOW *win)
     init_status(win, &st);
 
     do {
-	wattrset(win, st.attr | COLOR_PAIR(st.pair));
+	(void) wattrset(win, st.attr | (attr_t) COLOR_PAIR(st.pair));
 	switch (st.ch) {
 	case 'i':
 	    for (n = 0; n < st.count; ++n)
@@ -334,7 +341,7 @@ test_insdelln(void)
     init_status(stdscr, &st);
 
     do {
-	attrset(st.attr | COLOR_PAIR(st.pair));
+	(void) attrset(st.attr | (attr_t) COLOR_PAIR(st.pair));
 	switch (st.ch) {
 	case 'i':
 	    for (n = 0; n < st.count; ++n)