Extra diagnostics in the hope that we can track down the problem with

the nightlies. I must remember to take it all out again when we do!

git-svn-id: svn://svn.tartarus.org/sgt/putty@1095 cda61777-01e9-0310-a592-d414129be87e

diff --git a/terminal.c b/terminal.c
index 95bd89f..0d5398e 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -350,6 +350,9 @@ void term_size(int newrows, int newcols, int newsavelines) {
     alt_t = marg_t = 0;
     alt_b = marg_b = newrows - 1;
 
+    debug(("term_size, old r,c,s (%d,%d,%d), new rcs (%d,%d,%d)\n",
+           rows, cols, savelines, newrows, newcols, newsavelines));
+
     if (rows == -1) {
        scrollback = newtree234(NULL);
        screen = newtree234(NULL);
@@ -377,22 +380,31 @@ void term_size(int newrows, int newcols, int newsavelines) {
      *    away.
      */
     sblen = count234(scrollback);
+    debug(("newrows=%d rows=%d sblen=%d\n", newrows, rows, sblen));
     if (newrows > rows) {
        for (i = rows; i < newrows; i++) {
+            debug(("increase screen: i=%d\n", i));
            if (sblen > 0) {
+                debug(("sblen=%d so use line from scrollback\n", sblen));
                line = delpos234(scrollback, --sblen);
            } else {
+                debug(("sblen=%d so make up a new line\n", sblen));
                line = smalloc(TSIZE * (newcols+2));
                line[0] = newcols;
                for (j = 0; j <= newcols; j++)
                    line[j+1] = ERASE_CHAR;
            }
+            debug(("got new screen line %p\n", line));
            addpos234(screen, line, 0);
        }
     } else if (newrows < rows) {
        for (i = newrows; i < rows; i++) {
+            debug(("decrease screen: i=%d\n", i));
            line = delpos234(screen, 0);
+            debug(("taken out line %p, count is now %d\n",
+                   line, count234(screen)));
            addpos234(scrollback, line, sblen++);
+            debug(("added to scrollback, sblen is now %d\n", sblen));
        }
     }
     assert(count234(screen) == newrows);

diff --git a/tree234.c b/tree234.c
index 9d1d7b0..017a12a 100644 (file)
--- a/tree234.c
+++ b/tree234.c
@@ -39,7 +39,8 @@
 #ifdef TEST
 #define LOG(x) (printf x)
 #else
-#define LOG(x)
+// FIXME
+#define LOG(x) (dprintf x)
 #endif
 
 typedef struct node234_Tag node234;