Fri Jun 14 01:58:36 2002 Michael Jennings (mej)

Fixed a problem with Ctrl-< and Ctrl-> in Escreen mode.


SVN revision: 6322

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 69c56e0..a6bb5d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4702,3 +4702,7 @@ Fri Jun 14 01:40:50 2002                        Michael Jennings (mej)
 
 Fixed a couple bugs, trying to track down some others.
 ----------------------------------------------------------------------
+Fri Jun 14 01:58:36 2002                        Michael Jennings (mej)
+
+Fixed a problem with Ctrl-< and Ctrl-> in Escreen mode.
+----------------------------------------------------------------------
diff --git a/src/font.c b/src/font.c
index 7e6fbf1..9f6a4f6 100644
--- a/src/font.c
+++ b/src/font.c
@@ -648,7 +648,11 @@ change_font(int init, const char *fontname)
     set_colorfgbg();
 
     TermWin.width = TermWin.ncol * TermWin.fwidth;
+#ifdef ESCREEN
+    TermWin.height = (NS_MAGIC_LINE(TermWin.screen_mode) ? TermWin.nrow - 1 : TermWin.nrow) * TermWin.fheight;
+#else
     TermWin.height = TermWin.nrow * TermWin.fheight;
+#endif
     D_FONT((" -> New font width/height = %ldx%ld, making the terminal size %ldx%ld\n", TermWin.fwidth, TermWin.fheight, TermWin.width, TermWin.height));
 
     /* If we're initializing, *we* do the size hints.  If not, resize the parent window. */
diff --git a/src/windows.c b/src/windows.c
index 99426c7..b173239 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -569,7 +569,7 @@ term_resize(int width, int height)
     D_X11(("term_resize(%d, %d)\n", width, height));
     TermWin.width = TermWin.ncol * TermWin.fwidth;
 #ifdef ESCREEN
-    TermWin.height = (TermWin.screen_mode ? TermWin.nrow - 1 : TermWin.nrow) * TermWin.fheight;
+    TermWin.height = (NS_MAGIC_LINE(TermWin.screen_mode) ? TermWin.nrow - 1 : TermWin.nrow) * TermWin.fheight;
 #else
     TermWin.height = TermWin.nrow * TermWin.fheight;
 #endif