diff --git a/configure.in b/configure.in index 03bb423d..b6451b1e 100644 --- a/configure.in +++ b/configure.in @@ -69,6 +69,9 @@ if test "$pdcurses" = "XCurses" && test "$CURSES_CONFIG" != "" ; then else AC_CHECK_LIB($curses_lib, initscr, LDFLAGS="$LDFLAGS -l$curses_lib", AC_MSG_ERROR([$ncurses_lib library is required])) fi +if test "$pdcurses" != "no" ; then + AC_CHECK_LIB($curses_lib, Xinitscr, AC_DEFINE([XCURSES], [1], [x11 pdcurses available]), ) +fi AC_CHECK_HEADERS([curses.h], , AC_MSG_ERROR([missing ncurses.h header])) dnl ================================= diff --git a/src/window.cpp b/src/window.cpp index 226ed772..d6074f3b 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -41,12 +41,12 @@ void NCurses::InitScreen(const char *window_title, bool enable_colors) COLOR_BLUE, COLOR_MAGENTA, COLOR_CYAN, COLOR_WHITE }; setlocale(LC_ALL, ""); -# if defined(USE_PDCURSES) && defined(XCURSES) +# ifdef XCURSES Xinitscr(1, const_cast(&window_title)); # else window_title = 0; // silence compiler initscr(); -# endif // USE_PDCURSES && XCURSES +# endif // XCURSES if (has_colors() && enable_colors) { start_color(); diff --git a/src/window.h b/src/window.h index 270bf797..580a3546 100644 --- a/src/window.h +++ b/src/window.h @@ -25,10 +25,6 @@ #include #endif -#if !defined(WIN32) && defined(USE_PDCURSES) -# define XCURSES -#endif // !WIND32 && USE_PDCURSES - #include "curses.h" #include