From 6f6ebe924f2ce4cf69555be1f84f0f1fe2c18fa8 Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Sat, 4 May 2002 15:12:59 +0000
Subject: [PATCH] Sat May  4 11:12:19 2002                        Michael
 Jennings (mej)

Added a --enable-escreen option for those who wish to try it out.
Also fixed the compile with Escreen and profiling are both enabled,
and disabled Escreen debugging.


SVN revision: 6203
---
 ChangeLog       |  6 ++++++
 acconfig.h      |  1 +
 configure.in    | 10 ++++++++++
 src/screamcfg.h |  2 +-
 src/screen.c    |  4 ++--
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4213786..43d0e60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4632,3 +4632,9 @@ Also merged in Azundris' Escreen patch.  It's disabled by default for
 the moment pending further testing, but you can enable it manually by
 defining ESCREEN.
 ----------------------------------------------------------------------
+Sat May  4 11:12:19 2002                        Michael Jennings (mej)
+
+Added a --enable-escreen option for those who wish to try it out.
+Also fixed the compile with Escreen and profiling are both enabled,
+and disabled Escreen debugging.
+----------------------------------------------------------------------
diff --git a/acconfig.h b/acconfig.h
index 9104d33..d7cde5a 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -363,6 +363,7 @@
 #undef WINDOWS_IDENT
 #undef HAVE_SAVED_UIDS
 #undef MOUSEWHEEL
+#undef ESCREEN
 
 
 /* Leave that blank line there!!  Autoheader needs it.
diff --git a/configure.in b/configure.in
index 8bc998a..b107421 100644
--- a/configure.in
+++ b/configure.in
@@ -357,6 +357,16 @@ AC_ARG_WITH(pablo,
               AC_MSG_RESULT(no)
             fi], AC_MSG_RESULT(no)
 )
+AC_MSG_CHECKING(for Escreen support)
+AC_ARG_ENABLE(escreen,
+[  --enable-escreen        enable Eterm's built-in screen support], [
+            if test "$enableval" = "yes"; then 
+              AC_MSG_RESULT(yes)
+              AC_DEFINE(ESCREEN)
+            else
+              AC_MSG_RESULT(no)
+            fi], AC_MSG_RESULT(no)
+)
 AC_MSG_CHECKING(if profiling macros should be included)
 AC_ARG_ENABLE(profile,
 [  --enable-profile        compile with code profiling macros enabled], [
diff --git a/src/screamcfg.h b/src/screamcfg.h
index c5d20f9..404d4f2 100644
--- a/src/screamcfg.h
+++ b/src/screamcfg.h
@@ -16,7 +16,7 @@
 #define NS_PARANOID
 
 /* define NS_DEBUG to get debug-info. no support for those who undef this. */
-#define NS_DEBUG
+#undef NS_DEBUG
 
 /* debug memory stuff. never actually used this. */
 #undef  NS_DEBUG_MEM
diff --git a/src/screen.c b/src/screen.c
index cc2ba36..364965f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1630,13 +1630,13 @@ scr_refresh(int type)
 #endif
     int ascent, descent;
 
+    PROF_INIT(scr_refresh);
+
 #ifdef ESCREEN
     if (TermWin.screen_mode)
         nrows--;
 #endif
 
-    PROF_INIT(scr_refresh);
-
     switch (type) {
       case NO_REFRESH:
           D_SCREEN(("scr_refresh(NO_REFRESH) called.\n"));