From 564143c65fd92ba9ce84b401a8cc35d29c7e2031 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Tue, 11 Aug 2009 06:38:35 +0000
Subject: Do not store margins for DECSC

DECRC shouldn't store margins (scroll regions) when saving the cursor.
This bad behavior was messing up mutt with "menu_scroll" enabled.

Reference: http://vt100.net/docs/vt510-rm/DECSC

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@385 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml            | 2 +-
 src/de/mud/terminal/vt320.java | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b4f9a06..db97920 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.6-dev"
-	android:versionCode="185">
+	android:versionCode="186">
 	
 	<application
 		android:icon="@drawable/icon"
diff --git a/src/de/mud/terminal/vt320.java b/src/de/mud/terminal/vt320.java
index 27298a5..0fdaf16 100644
--- a/src/de/mud/terminal/vt320.java
+++ b/src/de/mud/terminal/vt320.java
@@ -1934,7 +1934,7 @@ public void setScreenSize(int c, int r, boolean broadcast) {
               debug("ESC >");
             keypadmode = false;
             break;
-          case '7': /*save cursor, attributes, margins */
+          case '7': /* DECSC: save cursor, attributes */
             Sc = C;
             Sr = R;
             Sgl = gl;
@@ -1942,19 +1942,15 @@ public void setScreenSize(int c, int r, boolean broadcast) {
             Sa = attributes;
             Sgx = new char[4];
             for (int i = 0; i < 4; i++) Sgx[i] = gx[i];
-            Stm = getTopMargin();
-            Sbm = getBottomMargin();
             if (debug > 1)
               debug("ESC 7");
             break;
-          case '8': /*restore cursor, attributes, margins */
+          case '8': /* DECRC: restore cursor, attributes */
             C = Sc;
             R = Sr;
             gl = Sgl;
             gr = Sgr;
             for (int i = 0; i < 4; i++) gx[i] = Sgx[i];
-            setTopMargin(Stm);
-            setBottomMargin(Sbm);
             attributes = Sa;
             if (debug > 1)
               debug("ESC 8");
-- 
cgit v1.2.3