ncurses 6.1 - patch 20191123

[ncurses.git] / test / xmas.c

diff --git a/test/xmas.c b/test/xmas.c
index fbbf4f4fa796b469fa5b9a292dfa9979baf124f2..f66ba6f04c612b8e70dcd5f189d115804c023d7b 100644 (file)
--- a/test/xmas.c
+++ b/test/xmas.c
@@ -92,7 +92,7 @@
 /******************************************************************************/
 
 /*
- * $Id: xmas.c,v 1.31 2017/09/08 09:21:02 tom Exp $
+ * $Id: xmas.c,v 1.33 2017/09/30 19:14:13 tom Exp $
  */
 #include <test.priv.h>
 
@@ -454,37 +454,31 @@ blinkit(void)
     switch (cycle) {
     case 0:
        overlay(treescrn3, treescrn8);
-       wrefresh(treescrn8);
-       wrefresh(w_del_msg);
        break;
     case 1:
        overlay(treescrn4, treescrn8);
-       wrefresh(treescrn8);
-       wrefresh(w_del_msg);
        break;
     case 2:
        overlay(treescrn5, treescrn8);
-       wrefresh(treescrn8);
-       wrefresh(w_del_msg);
        break;
     case 3:
        overlay(treescrn6, treescrn8);
-       wrefresh(treescrn8);
-       wrefresh(w_del_msg);
        break;
     case 4:
        overlay(treescrn7, treescrn8);
-       wrefresh(treescrn8);
-       wrefresh(w_del_msg);
        break;
     }
     touchwin(treescrn8);
+    wrefresh(treescrn8);
+    wrefresh(w_del_msg);
+    look_out(50);
 
     /*ALL ON************************************************** */
 
     overlay(treescrn, treescrn8);
     wrefresh(treescrn8);
     wrefresh(w_del_msg);
+    look_out(50);
 
     ++cycle;
     return (0);
@@ -642,8 +636,6 @@ reindeer(void)
 static void
 done(int sig GCC_UNUSED)
 {
-    CATCHALL(done);
-
     move(LINES - 1, 0);
     refresh();
     exit_curses();
@@ -705,13 +697,11 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    initscr();
+    InitAndCatch(initscr(), done);
     noecho();
     nonl();
     refresh();
 
-    CATCHALL(done);
-
     if (has_colors()) {
        start_color();
 #if HAVE_USE_DEFAULT_COLORS