X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdots_xcurses.c;h=ba65dab2564aee86d5f696507b7f33a8790e50d4;hp=9e2d5b7f7259b4127eac1e9cfd8d793870d64fa8;hb=f3ec084eb66ba14feb6357b674fb85dd474933d8;hpb=eccca377f55c70b12e3e92621d94d1e1c1fcfb7d diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c index 9e2d5b7f..ba65dab2 100644 --- a/test/dots_xcurses.c +++ b/test/dots_xcurses.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2017-2018,2019 Free Software Foundation, Inc. * + * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2017 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 * @@ -29,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_xcurses.c,v 1.17 2019/01/21 14:20:18 tom Exp $ + * $Id: dots_xcurses.c,v 1.19 2020/02/02 23:34:34 tom Exp $ * * A simple demo of the wide-curses interface used for comparison with termcap. */ @@ -139,10 +140,8 @@ usage(void) int main(int argc, char *argv[]) { - int x, y, z, p; int fg, bg, ch; wchar_t wch[2]; - int pair; double r; double c; #if HAVE_USE_DEFAULT_COLORS @@ -205,6 +204,7 @@ main(int argc, char *argv[]) { for (fg = 0; fg < COLORS; fg++) { for (bg = 0; bg < COLORS; bg++) { + int pair; if (interrupted) { cleanup(); ExitProgram(EXIT_FAILURE); @@ -224,16 +224,15 @@ main(int argc, char *argv[]) fg = COLOR_WHITE; bg = COLOR_BLACK; - pair = 0; wch[1] = 0; while (!interrupted) { - x = (int) (c * ranf()) + m_option; - y = (int) (r * ranf()) + m_option; - p = (ranf() > 0.9) ? '*' : ' '; + int x = (int) (c * ranf()) + m_option; + int y = (int) (r * ranf()) + m_option; + int p = (ranf() > 0.9) ? '*' : ' '; move(y, x); if (has_colors()) { - z = (int) (ranf() * COLORS); + int z = (int) (ranf() * COLORS); if (ranf() > 0.01) { set_colors(fg = z, bg); } else {