Ticket #152: remove-ncurses.patch

utils/gg_utils.h

@@ -52 +52 @@
 #include <io.h>
 #endif
 
-void gg_init_color(void);
 void write_color_char(int c, int x);
 void write_color_string(int c, const char *str);
 

utils/gg_utils.c

@@ -35 +35 @@
 /* Avoid compiler warnings with unused parameters */
 #define UNUSED(x)  (void)x
 
-/* Define TERMINFO or ANSI_COLOR to enable coloring of pieces.
+/* Define ANSI_COLOR to enable coloring of pieces.
  * This is normally done in config.h.
  */
 
@@ -52 +52 @@
  *  7=white
  */
 
-#ifdef TERMINFO
-
-#ifdef _AIX
-#define _TPARM_COMPAT
-#endif
-
-#if HAVE_CURSES_H
-#include <curses.h>
-#elif HAVE_NCURSES_CURSES_H
-#include <ncurses/curses.h>
-#else
-#endif
-
-#if HAVE_TERM_H
-#include <term.h>
-#elif HAVE_NCURSES_TERM_H
-#include <ncurses/term.h>
-#else
-#endif
-
-
-/* terminfo attributes */
-static char *setaf;             /* terminfo string to set color */
-static int max_color;           /* terminfo max colour */
-
-static int init = 0;
-
-#endif /* TERMINFO */
-
 /* for gg_cputime */
 
 #ifdef HAVE_UNISTD_H
@@ -92 +63 @@
 #include <windows.h>
 #endif
 
-void
-gg_init_color()
-{
-#ifdef TERMINFO
-
-/* compiler is set to make string literals  const char *
- * But system header files dont prototype things correctly.
- * These are equivalent to a non-const string literals
- */
-
-  static char setaf_literal[] = "setaf";
-  static char colors_literal[] = "colors";
-  static char empty_literal[] = "";
-
-  if (init)
-    return;
-  
-  init = 1;
-
-  setupterm(NULL, 2, NULL);
-  setaf = tigetstr(setaf_literal);
-  if (!setaf)
-    setaf = empty_literal;
-  max_color = tigetnum(colors_literal) - 1;
-  if (max_color < 1)
-    max_color = 1;
-  else if (max_color > 30)
-    max_color = 30;
-  
-#endif /* TERMINFO */
-}
-
-
 
 #ifdef WIN32
 #ifdef VC
@@ -154 +92 @@
 void 
 write_color_char_no_space(int c, int x)
 {
-#ifdef TERMINFO
-
-  fprintf(stderr, "%s%c", tparm(setaf, c, 0, 0, 0, 0, 0, 0, 0, 0), x);
-  fputs(tparm(setaf, max_color, 0, 0, 0, 0, 0, 0, 0, 0), stderr);
-
-#elif defined(ANSI_COLOR)
+#ifdef ANSI_COLOR
 
   fprintf(stderr, "\033[%dm%c\033[0m", 30+c, x);
 

engine/showbord.c

@@ -100 +100 @@
 void
 start_draw_board()
 {
-  gg_init_color();
   draw_letter_coordinates(stderr);
 }
 
@@ -266 +265 @@
 showboard(int xo)
 {
   int i, j, ii;
-  gg_init_color();
 
   /* Set all dragon numbers to 0. */
   memset(dragon_num, 0, sizeof(dragon_num));

configure.in

@@ -29 +29 @@
 
 AM_MAINTAINER_MODE
 
-dnl See if user has expressed a preference for use of curses and/or color
-dnl These set variables $enable_color and $with_curses to "no" if disabled
+dnl See if user has expressed a preference for use of color
+dnl These set variables $enable_color to "no" if disabled
 dnl "yes" if enabled, or undefined if not specified
 
 AC_ARG_WITH(readline,
  [  --with-readline     try to use GNU Readline for command reading
   --without-readline  do not use GNU Readline (default)])
 
-AC_ARG_WITH(curses,
- [  --with-curses       try to use curses for colored debugging output (default)
-  --without-curses    do not use curses for colored debugging output])
-
 AC_ARG_ENABLE(color,
- [  --enable-color              use curses or ansi escape sequences for colored
+ [  --enable-color              use ansi escape sequences for colored
                                    debug output
   --disable-color             do not try to generated colored debug output])
 
@@ -160 +156 @@
 AC_C_CONST
 
 AC_CHECK_HEADERS(unistd.h sys/time.h sys/times.h)
-AC_CHECK_HEADERS(curses.h term.h ncurses/curses.h ncurses/term.h)
-
-if test "$ac_cv_header_curses_h" = "yes";then
-   curses_header="curses.h"
-elif test "$ac_cv_header_ncurses_curses_h" = "yes";then
-   curses_header="ncurses/curses.h"
-else
-   curses_header="no"
-fi
-
-if test "$ac_cv_header_term_h" = "yes";then
-   term_header="term.h"
-elif test "$ac_cv_header_ncurses_term_h" = "yes";then
-   term_header="ncurses/term.h"
-else
-   term_header="no"
-fi
 
 AC_CHECK_SIZEOF(long,,[#include <stdio.h>])
 
@@ -250 +229 @@
 
 dnl -------- color debugging support -----------
 
-AH_TEMPLATE([TERMINFO],
-[Define to 1 if termcap/terminfo is available.])
-
 AH_TEMPLATE([ANSI_COLOR],
 [Define to use ansi escape sequences for color debugging])
 
 tmp_color_result="none"
 
-if test "$with_curses" != no -a "$enable_color" != no ; then
-  tmp_color_result="none (curses failed)"
-
-  dnl Do a separate test for curses and termcap
-  dnl DJGPP does have pdcurses, but not termcap
-
-  dnl make sure that both curses.h and term.h are available
-  dnl FIXME: better to actually figure out here what headers
-  dnl are really required
-  if test "$term_header" != "no" -a "$curses_header" != "no" ; then
-
-    dnl check for a working termcap library
-    AC_SEARCH_LIBS(tparm,ncurses curses pdcurses termcap terminfo termlib)
-
-    if test "$ac_cv_search_tparm" != "no" ; then
-      AC_DEFINE(TERMINFO)
-    tmp_color_result="curses"
-    fi
-  fi
-fi
-
-if test "$with_curses" = no -a "$enable_color" != no ; then
-  dnl we asked for color, but there is no termcap
+if test "$enable_color" != no ; then
   AC_DEFINE(ANSI_COLOR)
   tmp_color_result="ANSI color"