X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fbackground.c;h=291851b80e8b595841d382f280d5f0206d0e2e47;hp=c7e61113d9523b9c68b77db67da358da496b1965;hb=02f02dcd4464143580e783ae32c822d8eb8cdcbf;hpb=83589fb4c61328aec02dd6661e3f4bbb1daaeaaa

diff --git a/test/background.c b/test/background.c
index c7e61113..291851b8 100644
--- a/test/background.c
+++ b/test/background.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2003-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 2003-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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: background.c,v 1.12 2012/05/12 20:58:40 tom Exp $
+ * $Id: background.c,v 1.15 2014/08/09 22:31:23 tom Exp $
  */
 
 #define NEED_COLOR_CODE 1
@@ -39,33 +39,33 @@ static int default_fg = COLOR_WHITE;
 static void
 test_background(void)
 {
-    short f, b;
+    NCURSES_COLOR_T f, b;
     int row;
     int chr;
 
     if (pair_content(0, &f, &b) == ERR) {
 	printw("pair 0 contains no data\n");
     } else {
-	printw("pair 0 contains (%d,%d)\n", f, b);
+	printw("pair 0 contains (%d,%d)\n", (int) f, (int) b);
     }
     getch();
 
     printw("Initializing pair 1 to red/%s\n", color_name(default_bg));
-    init_pair(1, COLOR_RED, (short) default_bg);
-    bkgdset(' ' | COLOR_PAIR(1));
+    init_pair(1, COLOR_RED, (NCURSES_COLOR_T) default_bg);
+    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
     printw("RED/BLACK\n");
     getch();
 
     printw("Initializing pair 2 to %s/blue\n", color_name(default_fg));
-    init_pair(2, (short) default_fg, COLOR_BLUE);
-    bkgdset(' ' | COLOR_PAIR(2));
+    init_pair(2, (NCURSES_COLOR_T) default_fg, COLOR_BLUE);
+    bkgdset((chtype) (' ' | COLOR_PAIR(2)));
     printw("This line should be %s/blue\n", color_name(default_fg));
     getch();
 
     printw("Initializing pair 3 to %s/cyan (ACS_HLINE)\n", color_name(default_fg));
-    init_pair(3, (short) default_fg, COLOR_CYAN);
+    init_pair(3, (NCURSES_COLOR_T) default_fg, COLOR_CYAN);
     printw("...and drawing a box which should be followed by lines\n");
-    bkgdset(ACS_HLINE | COLOR_PAIR(3));
+    bkgdset(ACS_HLINE | (attr_t) COLOR_PAIR(3));
     /*
      * Characters from vt100 line-drawing should be mapped to line-drawing,
      * since A_ALTCHARSET is set in the background, and the character part
@@ -86,7 +86,7 @@ test_background(void)
     while (chr < 128) {
 	if ((chr % 32) == 0)
 	    mvprintw(row++, 10, "x");
-	addch((chr == 127) ? ' ' : chr);
+	addch((chtype) ((chr == 127) ? ' ' : chr));
 	if ((++chr % 32) == 0)
 	    printw("x\n");
     }
@@ -96,33 +96,33 @@ test_background(void)
     printw("j\n");
     getch();
 
-    bkgdset(' ' | COLOR_PAIR(0));
+    bkgdset((chtype) (' ' | COLOR_PAIR(0)));
     printw("Default Colors\n");
     getch();
 
     printw("Resetting colors to pair 1\n");
-    bkgdset(' ' | COLOR_PAIR(1));
+    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
     printw("This line should be red/%s\n", color_name(default_bg));
     getch();
 
     printw("Setting screen to pair 0\n");
-    bkgd(' ' | COLOR_PAIR(0));
+    bkgd((chtype) (' ' | COLOR_PAIR(0)));
     getch();
 
     printw("Setting screen to pair 1\n");
-    bkgd(' ' | COLOR_PAIR(1));
+    bkgd((chtype) (' ' | COLOR_PAIR(1)));
     getch();
 
     printw("Setting screen to pair 2\n");
-    bkgd(' ' | COLOR_PAIR(2));
+    bkgd((chtype) (' ' | COLOR_PAIR(2)));
     getch();
 
     printw("Setting screen to pair 3\n");
-    bkgd(' ' | COLOR_PAIR(3));
+    bkgd((chtype) (' ' | COLOR_PAIR(3)));
     getch();
 
     printw("Setting screen to pair 0\n");
-    bkgd(' ' | COLOR_PAIR(0));
+    bkgd((chtype) (' ' | COLOR_PAIR(0)));
     getch();
 }