/****************************************************************************
- * Copyright (c) 2008 Free Software Foundation, Inc. *
+ * Copyright (c) 2008-2012,2014 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: insdelln.c,v 1.1 2008/12/20 22:06:52 tom Exp $
+ * $Id: insdelln.c,v 1.9 2014/08/02 23:09:32 tom Exp $
*
* test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
*/
{
/* *INDENT-OFF* */
static struct {
- int pair;
- int fg, bg;
+ short pair;
+ short fg, bg;
const char *msg;
} table[] = {
{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
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);
}
delwin(win1);
touchwin(win);
} else {
+ if (win1)
+ delwin(win1);
beep();
}
}
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();
init_status(win, &st);
do {
- wattrset(win, st.attr | COLOR_PAIR(st.pair));
+ (void) wattrset(win, AttrArg(COLOR_PAIR(st.pair), st.attr));
switch (st.ch) {
case 'i':
for (n = 0; n < st.count; ++n)
init_status(stdscr, &st);
do {
- attrset(st.attr | COLOR_PAIR(st.pair));
+ (void) attrset(AttrArg(COLOR_PAIR(st.pair), st.attr));
switch (st.ch) {
case 'i':
for (n = 0; n < st.count; ++n)