fix restoring cursor position after leaving altscreen

When swapping to altscreen, also swap cursor position

Bug: 49883

2 files changed, 9 insertions, 1 deletions

diff --git a/src/ansi.c b/src/ansi.c
index 0c9b022..cd4403b 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -1446,8 +1446,8 @@ int c, intermediate;
 		  else
 		    {
 		      if (curr->w_alt.on) {
-		        RestoreCursor(&curr->w_alt.cursor);
 		        LeaveAltScreen(curr);
+		        RestoreCursor(&curr->w_alt.cursor);
 		      }
 		    }
 		  if (a1 == 47 && !i)
diff --git a/src/resize.c b/src/resize.c
index 9786164..ba7988d 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -1091,6 +1091,14 @@ struct win *p;
   SWAP(width, t);
   SWAP(height, t);
 
+  /* we need to swap cursor positions, but they are not swappable with macro */
+  t = p->w_alt.cursor.x;
+  p->w_alt.cursor.x = p->w_x;
+  p->w_x = t;
+  t = p->w_alt.cursor.y;
+  p->w_alt.cursor.y = p->w_y;
+  p->w_y = t;
+
 #ifdef COPY_PASTE
   SWAP(histheight, t);
   SWAP(hlines, ml);