-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1422 2009/08/22 23:16:03 tom Exp $
+-- $Id: NEWS,v 1.1425 2009/08/29 18:33:51 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20090829
+ + workaround for bug in g++ 4.1-4.4 warnings for wattrset() macro on
+ amd64 (Debian #542031).
+ + fix typo in curs_mouse.3x (Debian #429198).
+
20090822
+ continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.716 2009/08/22 16:00:41 tom Exp $
+# $Id: dist.mk,v 1.717 2009/08/29 18:07:46 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 7
-NCURSES_PATCH = 20090822
+NCURSES_PATCH = 20090829
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
#include "form.priv.h"
-MODULE_ID("$Id: frm_driver.c,v 1.89 2008/12/06 23:08:12 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.90 2009/08/29 19:02:25 tom Exp $")
/*----------------------------------------------------------------------------
This is the core module of the form library. It contains the majority
/* Macro to set the attributes for a fields window */
#define Set_Field_Window_Attributes(field,win) \
( wbkgdset((win),(chtype)((field)->pad | (field)->back)), \
- wattrset((win),(field)->fore) )
+ (void) wattrset((win),(field)->fore) )
/* Logic to decide whether or not a field really appears on the form */
#define Field_Really_Appears(field) \
else
{
if (field->opts & O_VISIBLE)
- Set_Field_Window_Attributes(field, win);
+ {
+ Set_Field_Window_Attributes(field, win);
+ }
else
- wattrset(win, WINDOW_ATTRS(fwin));
+ {
+ (void)wattrset(win, WINDOW_ATTRS(fwin));
+ }
werase(win);
}
* and: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: curses.h.in,v 1.204 2009/07/18 16:02:07 tom Exp $ */
+/* $Id: curses.h.in,v 1.205 2009/08/29 18:33:18 tom Exp $ */
#ifndef __NCURSES_H
#define __NCURSES_H
#if !NCURSES_OPAQUE
#if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
#define wattrset(win,at) ((win)->_color = PAIR_NUMBER(at), \
- NCURSES_CAST(int, (win)->_attrs = (at)))
+ (win)->_attrs = (at), \
+ NCURSES_CAST(int, (win)->_attrs))
#else
-#define wattrset(win,at) NCURSES_CAST(int, (win)->_attrs = (at))
+#define wattrset(win,at) ((win)->_attrs = (at), \
+ NCURSES_CAST(int, (win)->_attrs))
#endif
#endif /* NCURSES_OPAQUE */
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-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 *
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_mouse.3x,v 1.31 2008/11/23 00:09:53 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.32 2009/08/29 18:11:58 tom Exp $
.TH curs_mouse 3X ""
.na
.hy 0
xterm's built-in mouse-tracking API or
platform-specific drivers including
.RS
-Alessandro Rubini's gpm server.
+Alessandro Rubini's gpm server
.br
FreeBSD sysmouse
.br
/****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
#include <curses.priv.h>
-MODULE_ID("$Id: lib_bkgd.c,v 1.36 2008/03/23 00:09:14 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.37 2009/08/29 19:02:25 tom Exp $")
/*
* Set the window's background information.
NCURSES_CH_T old_bkgrnd;
wgetbkgrnd(win, &old_bkgrnd);
- wbkgrndset(win, CHREF(new_bkgd));
- wattrset(win, AttrOf(win->_nc_bkgd));
+ (void) wbkgrndset(win, CHREF(new_bkgd));
+ (void) wattrset(win, AttrOf(win->_nc_bkgd));
for (y = 0; y <= win->_maxy; y++) {
for (x = 0; x <= win->_maxx; x++) {
#define CUR SP_TERMTYPE
#endif
-MODULE_ID("$Id: lib_slkrefr.c,v 1.23 2009/08/15 23:08:28 tom Exp $")
+MODULE_ID("$Id: lib_slkrefr.c,v 1.24 2009/08/29 18:43:13 tom Exp $")
#ifdef USE_TERM_DRIVER
#define NumLabels InfoOf(SP_PARM).numlabels
slk_paint_info(slk->win);
wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x);
if (sp->_slk) {
- wattrset(slk->win, AttrOf(sp->_slk->attr));
+ (void) wattrset(slk->win, AttrOf(sp->_slk->attr));
}
waddstr(slk->win, slk->ent[i].form_text);
/* if we simulate SLK's, it's looking much more
natural to use the current ATTRIBUTE also
for the label window */
- wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp)));
+ (void) wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp)));
}
}
slk->ent[i].dirty = FALSE;
/****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
* results, use the ncurses(3) library. On non-Intel machines, SVr4 curses is
* just as good.
*
- * $Id: blue.c,v 1.30 2008/08/03 18:20:27 tom Exp $
+ * $Id: blue.c,v 1.31 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
}
move(PROMPTROW, 0);
- standout();
+ (void) standout();
(void) printw("Finished deal %d - type any character to continue...", deal_number);
- standend();
+ (void) standend();
(void) getch();
}
{
clear();
(void) printw("You finished the game in %d deals. This is ", deal);
- standout();
+ (void) standout();
if (deal < 2)
(void) addstr("excellent");
else if (deal < 4)
(void) addstr("average");
else
(void) addstr("poor");
- standend();
+ (void) standend();
(void) addstr(". ");
refresh();
}
/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
* v2.0 featuring strict ANSI/POSIX conformance, November 1993.
* v2.1 with ncurses mouse support, September 1995
*
- * $Id: bs.c,v 1.47 2008/08/03 18:30:28 tom Exp $
+ * $Id: bs.c,v 1.48 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
for (j = 0; j < BWIDTH; j++)
(void) addstr(" . ");
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
(void) addch(' ');
(void) addch((chtype) (i + 'A'));
for (j = 0; j < BWIDTH; j++)
(void) addstr(" . ");
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
(void) addch(' ');
(void) addch((chtype) (i + 'A'));
#endif /* A_COLOR */
(void) addch(MARK_MISS);
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
} else {
pgoto(y1, x1);
#endif /* A_COLOR */
(void) addch(SHOWHIT);
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
}
}
#endif /* A_COLOR */
(void) addch((chtype) hits[PLAYER][curx][cury]);
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
prompt(1, "You %s.", hit ? "scored a hit" : "missed");
#endif /* A_COLOR */
(void) addch((chtype) (hit ? SHOWHIT : SHOWSPLASH));
#ifdef A_COLOR
- attrset(0);
+ (void) attrset(0);
#endif /* A_COLOR */
return hit ? (sunk ? S_SUNK : S_HIT) : S_MISS;
* authorization. *
****************************************************************************/
/*
- * $Id: clip_printw.c,v 1.3 2009/07/17 09:28:52 tom Exp $
+ * $Id: clip_printw.c,v 1.4 2009/08/29 19:00:44 tom Exp $
*
* demonstrate how to use printw without wrapping.
*/
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);
ExitProgram(EXIT_SUCCESS);
}
+
#else
int
main(void)
* authorization. *
****************************************************************************/
/*
- * $Id: demo_forms.c,v 1.32 2009/05/30 16:52:42 tom Exp $
+ * $Id: demo_forms.c,v 1.33 2009/08/29 18:47:26 tom Exp $
*
* Demonstrate a variety of functions from the form library.
* Thomas Dickey - 2003/4/26
}
waddch(win, ' ');
- wattrset(win, field_fore(field));
+ (void) wattrset(win, field_fore(field));
waddstr(win, "fore");
wattroff(win, field_fore(field));
waddch(win, '/');
- wattrset(win, field_back(field));
+ (void) wattrset(win, field_back(field));
waddstr(win, "back");
wattroff(win, field_back(field));
for (nbuf = 0; nbuf <= 2; ++nbuf) {
if ((buffer = field_buffer(field, nbuf)) != 0) {
wprintw(win, "buffer %d:", nbuf);
- wattrset(win, A_REVERSE);
+ (void) wattrset(win, A_REVERSE);
waddstr(win, buffer);
wattroff(win, A_REVERSE);
waddstr(win, "\n");
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,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 *
* authorization. *
****************************************************************************/
/*
- * $Id: firework.c,v 1.24 2006/05/20 15:36:08 tom Exp $
+ * $Id: firework.c,v 1.25 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
showit();
init_pair(1, get_colour(&bold), my_bg);
- attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(COLOR_PAIR(1) | bold);
mvprintw(row - 1, col - 1, " - ");
mvprintw(row + 0, col - 1, "-+-");
mvprintw(row + 1, col - 1, " - ");
showit();
init_pair(1, get_colour(&bold), my_bg);
- attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(COLOR_PAIR(1) | bold);
mvprintw(row - 2, col - 2, " --- ");
mvprintw(row - 1, col - 2, "-+++-");
mvprintw(row + 0, col - 2, "-+#+-");
showit();
init_pair(1, get_colour(&bold), my_bg);
- attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(COLOR_PAIR(1) | bold);
mvprintw(row - 2, col - 2, " +++ ");
mvprintw(row - 1, col - 2, "++#++");
mvprintw(row + 0, col - 2, "+# #+");
showit();
init_pair(1, get_colour(&bold), my_bg);
- attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(COLOR_PAIR(1) | bold);
mvprintw(row - 2, col - 2, " # ");
mvprintw(row - 1, col - 2, "## ##");
mvprintw(row + 0, col - 2, "# #");
showit();
init_pair(1, get_colour(&bold), my_bg);
- attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(COLOR_PAIR(1) | bold);
mvprintw(row - 2, col - 2, " # # ");
mvprintw(row - 1, col - 2, "# #");
mvprintw(row + 0, col - 2, " ");
direction = (start > end) ? -1 : 1;
diff = abs(start - end);
} while (diff < 2 || diff >= LINES - 2);
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
for (row = 0; row < diff; row++) {
mvprintw(LINES - row, start + (row * direction),
(direction < 0) ? "\\" : "/");
/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
* modified 10-18-89 for curses (jrl)
* 10-18-89 added signal handling
*
- * $Id: gdc.c,v 1.31 2008/08/03 23:58:42 tom Exp $
+ * $Id: gdc.c,v 1.32 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
int n;
if (hascolor)
- attrset(COLOR_PAIR(PAIR_FRAMES));
+ (void) attrset(COLOR_PAIR(PAIR_FRAMES));
mvaddch(YBASE - 1, XBASE - 1, ACS_ULCORNER);
hline(ACS_HLINE, XLENGTH);
vline(ACS_VLINE, YDEPTH);
if (hascolor)
- attrset(COLOR_PAIR(PAIR_OTHERS));
+ (void) attrset(COLOR_PAIR(PAIR_OTHERS));
}
static void
init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED);
init_pair(PAIR_OTHERS, COLOR_RED, bg);
init_pair(PAIR_FRAMES, COLOR_WHITE, bg);
- attrset(COLOR_PAIR(PAIR_OTHERS));
+ (void) attrset(COLOR_PAIR(PAIR_OTHERS));
}
restart:
goto restart;
case ERR:
if (sigtermed) {
- standend();
+ (void) standend();
endwin();
fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
ExitProgram(EXIT_FAILURE);
continue;
}
} while (--count);
- standend();
+ (void) standend();
endwin();
ExitProgram(EXIT_SUCCESS);
}
/****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
*
* Date: 05.Nov.90
*
- * $Id: hanoi.c,v 1.27 2008/08/04 10:57:59 tom Exp $
+ * $Id: hanoi.c,v 1.28 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
mvaddstr(1, 24, "T O W E R S O F H A N O I");
mvaddstr(3, 34, "SJR 1990");
mvprintw(19, 5, "Moves : %d", NMoves);
- attrset(A_REVERSE);
+ (void) attrset(A_REVERSE);
mvaddstr(BASELINE, 8,
" ");
mvaddch(BASELINE, LEFTPEG, '1');
mvaddch(BASELINE, MIDPEG, '2');
mvaddch(BASELINE, RIGHTPEG, '3');
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
/* Draw tiles */
for (peg = 0; peg < NPEGS; peg++) {
memset(TileBuf, ' ', len);
TileBuf[len] = '\0';
if (has_colors())
- attrset(COLOR_PAIR(LENTOIND(len)));
+ (void) attrset(COLOR_PAIR(LENTOIND(len)));
else
- attrset(A_REVERSE);
+ (void) attrset(A_REVERSE);
mvaddstr(BASELINE - (SlotNo + 1),
(int) (PegPos[peg] - len / 2),
TileBuf);
}
}
}
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
refresh();
}
* authorization. *
****************************************************************************/
/*
- * $Id: insdelln.c,v 1.2 2009/07/15 23:21:04 tom Exp $
+ * $Id: insdelln.c,v 1.3 2009/08/29 18:47:26 tom Exp $
*
* test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
*/
init_status(win, &st);
do {
- wattrset(win, st.attr | COLOR_PAIR(st.pair));
+ (void) wattrset(win, st.attr | COLOR_PAIR(st.pair));
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(st.attr | COLOR_PAIR(st.pair));
switch (st.ch) {
case 'i':
for (n = 0; n < st.count; ++n)
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
Thomas E. Dickey (beginning revision 1.27 in 1996).
-$Id: ncurses.c,v 1.343 2009/07/30 09:13:37 tom Exp $
+$Id: ncurses.c,v 1.345 2009/08/29 20:24:57 tom Exp $
***************************************************************************/
echo();
getyx(win, y0, x0);
- wattrset(win, A_REVERSE);
+ (void) wattrset(win, A_REVERSE);
x = (int) strlen(buffer);
while (!done) {
echo();
getyx(win, y0, x0);
- wattrset(win, A_REVERSE);
+ (void) wattrset(win, A_REVERSE);
x = (int) wcslen(buffer);
while (!done) {
int flg = ((strstr(help[n], "toggle") != 0)
&& (flags[UChar(*help[n])] != FALSE));
if (flg)
- standout();
+ (void) standout();
mvprintw(row, col, "%s", help[n]);
if (col == 0)
clrtoeol();
if (flg)
- standend();
+ (void) standend();
}
wrefresh(stdscr);
wmove(win, y, x);
addch(ch | attr);
}
} else {
- attrset(attr);
+ (void) attrset(attr);
addstr(attr_test_string);
attroff(attr);
}
hello = numbered;
}
printw("%-*.*s", width, width, hello);
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
if ((i % per_row) == 0 && InxToFG(i) == min_colors) {
show_color_name(row, 0, InxToBG(i), opt_wide);
(i == current ? '>' : ' '),
(i < (int) SIZEOF(the_color_names)
? the_color_names[i] : numeric));
- attrset(COLOR_PAIR(i));
+ (void) attrset(COLOR_PAIR(i));
addstr(" ");
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
color_content((short) i, &red, &green, &blue);
addstr(" R = ");
attron(A_STANDOUT);
printw("%04d", red);
if (current == i && field == 0)
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
addstr(", G = ");
if (current == i && field == 1)
attron(A_STANDOUT);
printw("%04d", green);
if (current == i && field == 1)
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
addstr(", B = ");
if (current == i && field == 2)
attron(A_STANDOUT);
printw("%04d", blue);
if (current == i && field == 2)
- attrset(A_NORMAL);
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
printw(" ( %3d %3d %3d )",
scaled_rgb(red),
scaled_rgb(green),
wbkgd(subWin, COLOR_PAIR(2) | ' ');
}
#endif
- wattrset(subWin, A_BOLD);
+ (void) wattrset(subWin, A_BOLD);
box(subWin, ACS_VLINE, ACS_HLINE);
mvwaddstr(subWin, 2, 1, "This is a subwindow");
wrefresh(win);
switch (flavor) {
case 0:
- wattrset(win, A_NORMAL);
+ (void) wattrset(win, A_NORMAL);
break;
case 1:
- wattrset(win, A_BOLD);
+ (void) wattrset(win, A_BOLD);
break;
case 2:
init_pair(cpair, COLOR_BLUE, COLOR_WHITE);
- wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
+ (void) wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
break;
case 3:
init_pair(cpair, COLOR_WHITE, COLOR_BLUE);
- wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
+ (void) wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
break;
}
}
break;
}
overlap_helpitem(state, item, msg);
- wattrset(stdscr, A_NORMAL);
+ (void) wattrset(stdscr, A_NORMAL);
wbkgdset(stdscr, ' ' | A_NORMAL);
}
move(LINES - 1, 0);
{
overlap_test_1_attr(a, flavor, col);
fillwin(a, fill);
- wattrset(a, A_NORMAL);
+ (void) wattrset(a, A_NORMAL);
}
static void
min_colors = -1;
}
#if NCURSES_VERSION_PATCH >= 20000708
- else if (assumed_colors)
+ if (assumed_colors)
assume_default_colors(default_fg, default_bg);
#endif
#endif
* newdemo.c - A demo program using PDCurses. The program illustrate
* the use of colours for text output.
*
- * $Id: newdemo.c,v 1.31 2008/08/03 20:19:38 tom Exp $
+ * $Id: newdemo.c,v 1.32 2009/08/29 18:47:26 tom Exp $
*/
#include <test.priv.h>
if (pair > COLOR_PAIRS)
pair = COLOR_PAIRS;
init_pair(pair, foreground, background);
- wattrset(win, COLOR_PAIR(pair));
+ (void) wattrset(win, COLOR_PAIR(pair));
}
}
pair = COLOR_PAIRS;
attrs |= COLOR_PAIR(pair);
}
- wattrset(win, attrs);
+ (void) wattrset(win, attrs);
return attrs;
}
/****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
* authorization. *
****************************************************************************/
/*
- * $Id: rain.c,v 1.34 2008/05/24 23:34:34 tom Exp $
+ * $Id: rain.c,v 1.35 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
chtype color = COLOR_PAIR(z);
if (z)
color |= A_BOLD;
- attrset(color);
+ (void) attrset(color);
}
return j;
}
-/* $Id: tclock.c,v 1.25 2005/04/16 16:39:27 tom Exp $ */
+/* $Id: tclock.c,v 1.26 2009/08/29 18:47:26 tom Exp $ */
#include <test.priv.h>
int d;
if (has_colors())
- attrset(COLOR_PAIR(pair));
+ (void) attrset(COLOR_PAIR(pair));
dx = x2 - from_x;
dy = y2 - from_y;
dline(3, cx, cy, cx + mdx, cy - mdy, '#');
- attrset(A_REVERSE);
+ (void) attrset(A_REVERSE);
dline(2, cx, cy, cx + hdx, cy - hdy, '.');
attroff(A_REVERSE);
if (has_colors())
- attrset(COLOR_PAIR(1));
+ (void) attrset(COLOR_PAIR(1));
dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
if (has_colors())
- attrset(COLOR_PAIR(0));
+ (void) attrset(COLOR_PAIR(0));
text = ctime(&tim);
mvprintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
/****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc. *
+ * Copyright (c) 2007,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 *
* authorization. *
****************************************************************************/
/*
- * $Id: test_get_wstr.c,v 1.5 2007/08/11 17:01:43 tom Exp $
+ * $Id: test_get_wstr.c,v 1.6 2009/08/29 19:02:25 tom Exp $
*
* Author: Thomas E Dickey
*
*buffer = '\0';
rc = ERR;
echo();
- wattrset(txtwin, A_REVERSE);
+ (void) wattrset(txtwin, A_REVERSE);
switch (flavor) {
case eGetStr:
if (txtwin != stdscr) {
break;
}
noecho();
- wattrset(txtwin, A_NORMAL);
+ (void) wattrset(txtwin, A_NORMAL);
wprintw(strwin, "%d", rc);
- waddwstr(strwin, (wchar_t *) buffer);
+ (void) waddwstr(strwin, (wchar_t *) buffer);
wnoutrefresh(strwin);
break;
default:
/****************************************************************************
- * Copyright (c) 2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 2007-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 *
* authorization. *
****************************************************************************/
/*
- * $Id: test_getstr.c,v 1.8 2008/02/09 18:09:35 tom Exp $
+ * $Id: test_getstr.c,v 1.9 2009/08/29 19:02:25 tom Exp $
*
* Author: Thomas E Dickey
*
*buffer = '\0';
rc = ERR;
echo();
- wattrset(txtwin, A_REVERSE);
+ (void) wattrset(txtwin, A_REVERSE);
switch (flavor) {
case eGetStr:
if (txtwin != stdscr) {
break;
}
noecho();
- wattrset(txtwin, A_NORMAL);
+ (void) wattrset(txtwin, A_NORMAL);
wprintw(strwin, "%d:%s", rc, buffer);
wnoutrefresh(strwin);
break;
/****************************************************************************
- * Copyright (c) 2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 2007-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 *
* authorization. *
****************************************************************************/
/*
- * $Id: test_opaque.c,v 1.7 2008/07/05 23:18:40 tom Exp $
+ * $Id: test_opaque.c,v 1.8 2009/08/29 19:02:25 tom Exp $
*
* Author: Thomas E Dickey
*
{
to_keyword(stswin, cell);
if (active == cell)
- wstandout(stswin);
+ (void) wstandout(stswin);
wprintw(stswin, "%s:", name);
if (active == cell)
- wstandend(stswin);
+ (void) wstandend(stswin);
}
/* *INDENT-OFF* */
static struct {
/****************************************************************************
- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,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 *
* This is an example written by Alexander V. Lukyanov <lav@yars.free.net>,
* to demonstrate an inconsistency between ncurses and SVr4 curses.
*
- * $Id: testaddch.c,v 1.6 2006/04/01 19:08:03 tom Exp $
+ * $Id: testaddch.c,v 1.7 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
attr = (i & 4) ? COLOR_PAIR(4) : 0;
bkgdset(back);
- attrset(set);
+ (void) attrset(set);
attr_addstr("Test string with spaces -> <-\n", attr);
}
attr = (i & 4) ? COLOR_PAIR(4) : 0;
bkgdset(back);
- attrset(set);
+ (void) attrset(set);
attr_addstr("Test string with spaces -> <-\n", attr);
}
* wrs(5/28/93) -- modified to be consistent (perform identically) with either
* PDCurses or under Unix System V, R4
*
- * $Id: testcurs.c,v 1.39 2008/08/03 17:58:09 tom Exp $
+ * $Id: testcurs.c,v 1.40 2009/08/29 18:47:26 tom Exp $
*/
#include <test.priv.h>
if ((pad = newpad(50, 100)) != 0) {
wattron(pad, A_REVERSE);
mvwaddstr(pad, 5, 2, "This is a new pad");
- wattrset(pad, A_NORMAL);
+ (void) wattrset(pad, A_NORMAL);
mvwaddstr(pad, 8, 0,
"The end of this line should be truncated here:except now");
mvwaddstr(pad, 11, 1, "This line should not appear.It will now");
assert((new_option >= 0) && (new_option < MAX_OPTIONS));
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
mvaddstr(3, 20, "PDCurses Test Program");
for (i = 0; i < (int) MAX_OPTIONS; i++)
if ((old_option >= 0) && (old_option < MAX_OPTIONS))
mvaddstr(5 + old_option, 25, command[old_option].text);
- attrset(A_REVERSE);
+ (void) attrset(A_REVERSE);
mvaddstr(5 + new_option, 25, command[new_option].text);
- attrset(A_NORMAL);
+ (void) attrset(A_NORMAL);
mvaddstr(13, 3,
"Use Up and Down Arrows to select - Enter to run - Q to quit");
refresh();
/******************************************************************************/
/*
- * $Id: xmas.c,v 1.24 2008/08/03 11:08:59 tom Exp $
+ * $Id: xmas.c,v 1.25 2009/08/29 18:47:26 tom Exp $
*/
#include <test.priv.h>
unset_color(WINDOW *win)
{
if (has_colors())
- wattrset(win, COLOR_PAIR(0));
+ (void) wattrset(win, COLOR_PAIR(0));
}
static void
mvwaddch(treescrn4, 12, 23, ' ');
/*star */
- wstandout(treescrn4);
+ (void) wstandout(treescrn4);
mvwaddch(treescrn4, 0, 12, '*');
- wstandend(treescrn4);
+ (void) wstandend(treescrn4);
/*strng1 */
mvwaddch(treescrn4, 3, 13, ' ');
mvwaddch(treescrn6, 11, 23, ' ');
/*star */
- wstandout(treescrn6);
+ (void) wstandout(treescrn6);
mvwaddch(treescrn6, 0, 12, '*');
- wstandend(treescrn6);
+ (void) wstandend(treescrn6);
/*strng1 */
static int
star(void)
{
- wattrset(treescrn2, A_BOLD | A_BLINK);
+ (void) wattrset(treescrn2, A_BOLD | A_BLINK);
set_color(treescrn2, COLOR_YELLOW);
mvwaddch(treescrn2, 0, 12, (chtype) '*');
- wstandend(treescrn2);
+ (void) wstandend(treescrn2);
unset_color(treescrn2);
wrefresh(treescrn2);
static int
strng1(void)
{
- wattrset(treescrn2, A_BOLD | A_BLINK);
+ (void) wattrset(treescrn2, A_BOLD | A_BLINK);
set_color(treescrn2, COLOR_WHITE);
mvwaddch(treescrn2, 3, 13, (chtype) '\'');
static int
strng2(void)
{
- wattrset(treescrn2, A_BOLD | A_BLINK);
+ (void) wattrset(treescrn2, A_BOLD | A_BLINK);
set_color(treescrn2, COLOR_WHITE);
mvwaddch(treescrn2, 5, 14, (chtype) '\'');
static int
strng3(void)
{
- wattrset(treescrn2, A_BOLD | A_BLINK);
+ (void) wattrset(treescrn2, A_BOLD | A_BLINK);
set_color(treescrn2, COLOR_WHITE);
mvwaddch(treescrn2, 7, 16, (chtype) '\'');
static int
strng4(void)
{
- wattrset(treescrn2, A_BOLD | A_BLINK);
+ (void) wattrset(treescrn2, A_BOLD | A_BLINK);
set_color(treescrn2, COLOR_WHITE);
mvwaddch(treescrn2, 9, 17, (chtype) '\'');
static int
strng5(void)
{
- wattrset(treescrn2, A_BOLD | A_BLINK);
+ (void) wattrset(treescrn2, A_BOLD | A_BLINK);
set_color(treescrn2, COLOR_WHITE);
mvwaddch(treescrn2, 11, 19, (chtype) '\'');