/****************************************************************************
- * Copyright (c) 2009 Free Software Foundation, Inc. *
+ * Copyright (c) 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: test_addstr.c,v 1.2 2009/09/12 22:52:29 tom Exp $
+ * $Id: test_addstr.c,v 1.6 2010/12/12 00:17:37 tom Exp $
*
* Demonstrate the waddstr() and waddch functions.
* Thomas Dickey - 2009/9/12
#define AddNStr addnstr
#define AddStr addstr
-#define MvAddNStr mvaddnstr
-#define MvAddStr mvaddstr
-#define MvWAddNStr mvwaddnstr
-#define MvWAddStr mvwaddstr
+#define MvAddNStr (void) mvaddnstr
+#define MvWAddNStr (void) mvwaddnstr
#define WAddNStr waddnstr
#define WAddStr waddstr
#define AddCh addch
-#define MvAddCh mvaddch
-#define MvWAddCh mvwaddch
#define WAddCh waddch
#define MY_TABSIZE 8
static void
legend(WINDOW *win, int level, Options state, char *buffer, int length)
{
- NCURSES_CONST char *showstate;
+ const char *showstate;
switch (state) {
default:
wprintw(win,
"The Strings/Chars displays should match. Enter any characters, except:\n");
wprintw(win,
- "down-arrow or ^N to repeat on next line, 'w' for inner window, 'q' to exit.\n");
+ "down-arrow or ^N to repeat on next line, ^W for inner window, ESC to exit.\n");
wclrtoeol(win);
wprintw(win, "Level %d,%s added %d characters <%s>", level,
showstate, length, buffer);
keypad(work, TRUE);
for (col = margin + 1; col < COLS; col += MY_TABSIZE)
- mvwvline(work, row, col, '.', limit - 2);
+ MvWVLine(work, row, col, '.', limit - 2);
- mvwvline(work, row, margin, ACS_VLINE, limit - 2);
- mvwvline(work, row, margin + 1, ACS_VLINE, limit - 2);
+ MvWVLine(work, row, margin, ACS_VLINE, limit - 2);
+ MvWVLine(work, row, margin + 1, ACS_VLINE, limit - 2);
limit /= 2;
- mvwaddstr(work, 1, 2, "String");
- mvwaddstr(work, limit + 1, 2, "Chars");
+ MvWAddStr(work, 1, 2, "String");
+ MvWAddStr(work, limit + 1, 2, "Chars");
wnoutrefresh(work);
buffer[length = 0] = '\0';
beep();
break;
}
- buffer[length++] = ch;
+ buffer[length++] = (char) ch;
buffer[length] = '\0';
/* put the string in, one character at a time */