From 900f9acaaf49b03e188c429b7ab8183eae207b54 Mon Sep 17 00:00:00 2001
From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 19 Feb 2006 14:59:48 +0000
Subject: [PATCH] Fix `restart-reset-terminal': terminal now restored to a
 sensible state when reusing a window to restart a session.

git-svn-id: svn://svn.tartarus.org/sgt/putty@6577 cda61777-01e9-0310-a592-d414129be87e
---
 putty.h          |  2 +-
 terminal.c       | 27 ++++++++++++++++++++-------
 unix/gtkwin.c    |  3 ++-
 windows/window.c |  3 ++-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/putty.h b/putty.h
index 978cbf52..239df42d 100644
--- a/putty.h
+++ b/putty.h
@@ -787,7 +787,7 @@ void term_free(Terminal *);
 void term_size(Terminal *, int, int, int);
 void term_paint(Terminal *, Context, int, int, int, int, int);
 void term_scroll(Terminal *, int, int);
-void term_pwron(Terminal *);
+void term_pwron(Terminal *, int);
 void term_clrsb(Terminal *);
 void term_mouse(Terminal *, Mouse_Button, Mouse_Button, Mouse_Action,
 		int,int,int,int,int);
diff --git a/terminal.c b/terminal.c
index a3a21784..d23f0544 100644
--- a/terminal.c
+++ b/terminal.c
@@ -94,10 +94,12 @@ static termline *lineptr(Terminal *, int, int, int);
 static void unlineptr(termline *);
 static void do_paint(Terminal *, Context, int);
 static void erase_lots(Terminal *, int, int, int);
+static int find_last_nonempty_line(Terminal *, tree234 *);
 static void swap_screen(Terminal *, int, int, int);
 static void update_sbar(Terminal *);
 static void deselect(Terminal *);
 static void term_print_finish(Terminal *);
+static void scroll(Terminal *, int, int, int, int);
 #ifdef OPTIMISE_SCROLL
 static void scroll_display(Terminal *, int, int, int);
 #endif /* OPTIMISE_SCROLL */
@@ -1170,10 +1172,12 @@ static void term_schedule_vbell(Terminal *term, int already_started,
 
 /*
  * Set up power-on settings for the terminal.
+ * If 'clear' is false, don't actually clear the primary screen, and
+ * position the cursor below the last non-blank line (scrolling if
+ * necessary).
  */
-static void power_on(Terminal *term)
+static void power_on(Terminal *term, int clear)
 {
-    term->curs.x = term->curs.y = 0;
     term->alt_x = term->alt_y = 0;
     term->savecurs.x = term->savecurs.y = 0;
     term->alt_t = term->marg_t = 0;
@@ -1217,8 +1221,17 @@ static void power_on(Terminal *term)
 	swap_screen(term, 1, FALSE, FALSE);
 	erase_lots(term, FALSE, TRUE, TRUE);
 	swap_screen(term, 0, FALSE, FALSE);
-	erase_lots(term, FALSE, TRUE, TRUE);
+	if (clear)
+	    erase_lots(term, FALSE, TRUE, TRUE);
+	term->curs.y = find_last_nonempty_line(term, term->screen) + 1;
+	if (term->curs.y == term->rows) {
+	    term->curs.y--;
+	    scroll(term, 0, term->rows - 1, 1, TRUE);
+	}
+    } else {
+	term->curs.y = 0;
     }
+    term->curs.x = 0;
     term_schedule_tblink(term);
     term_schedule_cblink(term);
 }
@@ -1283,9 +1296,9 @@ void term_seen_key_event(Terminal *term)
 /*
  * Same as power_on(), but an external function.
  */
-void term_pwron(Terminal *term)
+void term_pwron(Terminal *term, int clear)
 {
-    power_on(term);
+    power_on(term, clear);
     if (term->ldisc)		       /* cause ldisc to notice changes */
 	ldisc_send(term->ldisc, NULL, 0, 0);
     term->disptop = 0;
@@ -1442,7 +1455,7 @@ Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata,
     term->tabs = NULL;
     deselect(term);
     term->rows = term->cols = -1;
-    power_on(term);
+    power_on(term, TRUE);
     term->beephead = term->beeptail = NULL;
 #ifdef OPTIMISE_SCROLL
     term->scrollhead = term->scrolltail = NULL;
@@ -3076,7 +3089,7 @@ static void term_out(Terminal *term)
 		    break;
 		  case 'c':	       /* RIS: restore power-on settings */
 		    compatibility(VT100);
-		    power_on(term);
+		    power_on(term, TRUE);
 		    if (term->ldisc)   /* cause ldisc to notice changes */
 			ldisc_send(term->ldisc, NULL, 0, 0);
 		    if (term->reset_132) {
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 47845015..ff08ec08 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2858,7 +2858,7 @@ void clear_scrollback_menuitem(GtkMenuItem *item, gpointer data)
 void reset_terminal_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    term_pwron(inst->term);
+    term_pwron(inst->term, TRUE);
     if (inst->ldisc)
 	ldisc_send(inst->ldisc, NULL, 0, 0);
 }
@@ -3229,6 +3229,7 @@ void restart_session_menuitem(GtkMenuItem *item, gpointer data)
 
     if (!inst->back) {
 	logevent(inst, "----- Session restarted -----");
+	term_pwron(inst->term, FALSE);
 	start_backend(inst);
 	inst->exited = FALSE;
     }
diff --git a/windows/window.c b/windows/window.c
index 8a476b38..722f78e0 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -1987,6 +1987,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	  case IDM_RESTART:
 	    if (!back) {
 		logevent(NULL, "----- Session restarted -----");
+		term_pwron(term, FALSE);
 		start_backend();
 	    }
 
@@ -2154,7 +2155,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    term_clrsb(term);
 	    break;
 	  case IDM_RESET:
-	    term_pwron(term);
+	    term_pwron(term, TRUE);
 	    if (ldisc)
 		ldisc_send(ldisc, NULL, 0, 0);
 	    break;
-- 
2.11.0