Bump version to 0.51

Bump terminal-emulator libraryVersion to 0.50
Remove unused xmlns:android declaration
2017-06-05 22:49:11 +02:00 · 2017-06-05 22:45:44 +02:00 · 2017-06-05 22:45:15 +02:00 · 2017-06-05 22:35:39 +02:00 · 2017-06-05 22:35:32 +02:00 · 2017-06-03 17:45:36 -05:00
10 changed files with 67 additions and 14 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ android:
  components:
    - platform-tools
    - tools
-    - build-tools-25.0.2
+    - build-tools-25.0.3
    - android-25
    - extra-android-m2repository

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
        applicationId "com.termux"
        minSdkVersion 21
        targetSdkVersion 25
-        versionCode 49
-        versionName "0.49"
+        versionCode 51
+        versionName "0.51"
    }

    buildTypes {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
    <uses-permission android:name="android.permission.VIBRATE" />

    <application
-        android:extractNativeLibs="false"
+        android:extractNativeLibs="true"
        android:allowBackup="true"
        android:fullBackupContent="@xml/backupscheme"
        android:icon="@mipmap/ic_launcher"
--- a/terminal-emulator/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -13,12 +13,12 @@ ext {
    libraryDescription = 'The terminal emulator used in Termux'
    siteUrl = 'https://github.com/termux/termux'
    gitUrl = 'https://github.com/termux/termux.git'
-    libraryVersion = '0.49'
+    libraryVersion = '0.50'
 }

 android {
    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"

    defaultConfig {
        minSdkVersion 21
--- a/terminal-emulator/src/main/AndroidManifest.xml
+++ b/terminal-emulator/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.termux.terminal">
+<manifest package="com.termux.terminal">
 </manifest>
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -632,6 +632,7 @@ public final class TerminalEmulator {
                                int bottom = Math.min(getArg(2, mRows, true) + 1, effectiveBottomMargin - 1) + effectiveTopMargin;
                                int right = Math.min(getArg(3, mColumns, true) + 1, effectiveRightMargin - 1) + effectiveLeftMargin;
                                if (mArgIndex >= 4) {
+                                    if (mArgIndex >= mArgs.length) mArgIndex = mArgs.length - 1;
                                    for (int i = 4; i <= mArgIndex; i++) {
                                        int bits = 0;
                                        boolean setOrClear = true; // True if setting, false if clearing.
@@ -965,6 +966,7 @@ public final class TerminalEmulator {
                break;
            case 'h':
            case 'l':
+                if (mArgIndex >= mArgs.length) mArgIndex = mArgs.length - 1;
                for (int i = 0; i <= mArgIndex; i++)
                    doDecSetOrReset(b == 'h', mArgs[i]);
                break;
@@ -981,6 +983,7 @@ public final class TerminalEmulator {
                break;
            case 'r':
            case 's':
+                if (mArgIndex >= mArgs.length) mArgIndex = mArgs.length - 1;
                for (int i = 0; i <= mArgIndex; i++) {
                    int externalBit = mArgs[i];
                    int internalBit = mapDecSetBitToInternalBit(externalBit);
@@ -1307,6 +1310,8 @@ public final class TerminalEmulator {
        state.mSavedCursorRow = mCursorRow;
        state.mSavedCursorCol = mCursorCol;
        state.mSavedEffect = mEffect;
+        state.mSavedForeColor = mForeColor;
+        state.mSavedBackColor = mBackColor;
        state.mSavedDecFlags = mCurrentDecSetFlags;
        state.mUseLineDrawingG0 = mUseLineDrawingG0;
        state.mUseLineDrawingG1 = mUseLineDrawingG1;
@@ -1318,6 +1323,8 @@ public final class TerminalEmulator {
        SavedScreenState state = (mScreen == mMainBuffer) ? mSavedStateMain : mSavedStateAlt;
        setCursorRowCol(state.mSavedCursorRow, state.mSavedCursorCol);
        mEffect = state.mSavedEffect;
+        mForeColor = state.mSavedForeColor;
+        mBackColor = state.mSavedBackColor;
        int mask = (DECSET_BIT_AUTOWRAP | DECSET_BIT_ORIGIN_MODE);
        mCurrentDecSetFlags = (mCurrentDecSetFlags & ~mask) | (state.mSavedDecFlags & mask);
        mUseLineDrawingG0 = state.mUseLineDrawingG0;
@@ -1639,6 +1646,7 @@ public final class TerminalEmulator {

    /** Select Graphic Rendition (SGR) - see http://en.wikipedia.org/wiki/ANSI_escape_code#graphics. */
    private void selectGraphicRendition() {
+        if (mArgIndex >= mArgs.length) mArgIndex = mArgs.length - 1;
        for (int i = 0; i <= mArgIndex; i++) {
            int code = mArgs[i];
            if (code < 0) {
@@ -2049,6 +2057,7 @@ public final class TerminalEmulator {
            buf.append(", escapeState=");
            buf.append(mEscapeState);
            boolean firstArg = true;
+            if (mArgIndex >= mArgs.length) mArgIndex = mArgs.length - 1;
            for (int i = 0; i <= mArgIndex; i++) {
                int value = mArgs[i];
                if (value >= 0) {
@@ -2263,8 +2272,8 @@ public final class TerminalEmulator {
        mBottomMargin = mRows;
        mRightMargin = mColumns;
        mAboutToAutoWrap = false;
-        mForeColor = TextStyle.COLOR_INDEX_FOREGROUND;
-        mBackColor = TextStyle.COLOR_INDEX_BACKGROUND;
+        mForeColor = mSavedStateMain.mSavedForeColor = mSavedStateAlt.mSavedForeColor = TextStyle.COLOR_INDEX_FOREGROUND;
+        mBackColor = mSavedStateMain.mSavedBackColor = mSavedStateAlt.mSavedBackColor = TextStyle.COLOR_INDEX_BACKGROUND;
        setDefaultTabStops();

        mUseLineDrawingG0 = mUseLineDrawingG1 = false;
@@ -2318,7 +2327,7 @@ public final class TerminalEmulator {
    static final class SavedScreenState {
        /** Saved state of the cursor position, Used to implement the save/restore cursor position escape sequences. */
        int mSavedCursorRow, mSavedCursorCol;
-        int mSavedEffect;
+        int mSavedEffect, mSavedForeColor, mSavedBackColor;
        int mSavedDecFlags;
        boolean mUseLineDrawingG0, mUseLineDrawingG1, mUseLineDrawingUsesG0 = true;
    }
--- a/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
@@ -29,4 +29,10 @@ public class ControlSequenceIntroducerTest extends TerminalTestCase {
 		withTerminalSized(13, 2).enterString("abcdefghijkl\b\b\b\b\b\033[20X").assertLinesAre("abcdefg      ", "             ");
 	}

+	/** CSI Pm m  Set SGR parameter(s) from semicolon-separated list Pm. */
+	public void testCsiSGRParameters() {
+		// Set more parameters (19) than supported (16).  Additional parameters should be silently consumed.
+		withTerminalSized(3, 2).enterString("\033[0;38;2;255;255;255;48;2;0;0;0;1;2;3;4;5;7;8;9mabc").assertLinesAre("abc", "   ");
+	}
+
 }
--- a/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
+++ b/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
@@ -227,4 +227,44 @@ public class CursorAndScreenTest extends TerminalTestCase {
        withTerminalSized(3, 3).enterString("\b\b\b\bhi").assertLinesAre("hi ", "   ", "   ");
    }

+	public void testCursorSaveRestoreLocation() {
+		// DEC save/restore
+		withTerminalSized(4, 2).enterString("t\0337est\r\nme\0338ry ").assertLinesAre("try ", "me  ");
+		// ANSI.SYS save/restore
+		withTerminalSized(4, 2).enterString("t\033[sest\r\nme\033[ury ").assertLinesAre("try ", "me  ");
+		// Alternate screen enter/exit
+		withTerminalSized(4, 2).enterString("t\033[?1049h\033[Hest\r\nme").assertLinesAre("est ", "me  ").enterString("\033[?1049lry").assertLinesAre("try ", "    ");
+	}
+
+	public void testCursorSaveRestoreTextStyle() {
+		long s;
+
+		// DEC save/restore
+		withTerminalSized(4, 2).enterString("\033[31;42;4m..\0337\033[36;47;24m\0338..");
+		s = getStyleAt(0, 3);
+		Assert.assertEquals(1, TextStyle.decodeForeColor(s));
+		Assert.assertEquals(2, TextStyle.decodeBackColor(s));
+		Assert.assertEquals(TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE, TextStyle.decodeEffect(s));
+
+		// ANSI.SYS save/restore
+		withTerminalSized(4, 2).enterString("\033[31;42;4m..\033[s\033[36;47;24m\033[u..");
+		s = getStyleAt(0, 3);
+		Assert.assertEquals(1, TextStyle.decodeForeColor(s));
+		Assert.assertEquals(2, TextStyle.decodeBackColor(s));
+		Assert.assertEquals(TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE, TextStyle.decodeEffect(s));
+
+		// Alternate screen enter/exit
+		withTerminalSized(4, 2);
+		enterString("\033[31;42;4m..\033[?1049h\033[H\033[36;47;24m.");
+		s = getStyleAt(0, 0);
+		Assert.assertEquals(6, TextStyle.decodeForeColor(s));
+		Assert.assertEquals(7, TextStyle.decodeBackColor(s));
+		Assert.assertEquals(0, TextStyle.decodeEffect(s));
+		enterString("\033[?1049l..");
+		s = getStyleAt(0, 3);
+		Assert.assertEquals(1, TextStyle.decodeForeColor(s));
+		Assert.assertEquals(2, TextStyle.decodeBackColor(s));
+		Assert.assertEquals(TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE, TextStyle.decodeEffect(s));
+	}
+
 }
--- a/terminal-view/build.gradle
+++ b/terminal-view/build.gradle
@@ -18,7 +18,7 @@ ext {

 android {
    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"

    dependencies {
        compile 'com.android.support:support-annotations:25.3.1'
--- a/terminal-view/src/main/AndroidManifest.xml
+++ b/terminal-view/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.termux.view">
+<manifest package="com.termux.view">
 </manifest>
Author	SHA1	Message	Date
Fredrik Fornwall	d4be782c03	Bump version to 0.51	2017-06-05 22:49:11 +02:00
Fredrik Fornwall	c29909726c	Bump terminal-emulator libraryVersion to 0.50	2017-06-05 22:45:44 +02:00
Fredrik Fornwall	45bac89298	Remove unused xmlns:android declaration	2017-06-05 22:45:15 +02:00
Fredrik Fornwall	c06770c353	Merge pull request #330 from whydoubt/cursor_preserve_color Make cursor save/restore affect color attributes	2017-06-05 22:35:39 +02:00
Fredrik Fornwall	52a627efc8	Merge pull request #331 from whydoubt/fix_parameter_fc Fix FC from too many control code parameters	2017-06-05 22:35:32 +02:00
Jeff Smith	2e9383720c	Make cursor save/restore affect color attributes SGR attributes are stored in three variables: mEffect, mForeColor, and mBackColor. Saving/restoring the cursor only preserves mEffect. Change the cursor save/restore methods to additionally preserve mForeColor and mBackColor. This affects both 'explit' saving/restoring the cursor and switching to/from the alternate screen buffer.	2017-06-03 17:45:36 -05:00
Jeff Smith	58f9f1be71	Add tests for cursor save/restore	2017-06-03 17:45:36 -05:00
Jeff Smith	058441dda6	Fix FC from too many control code parameters When the number of parameters in a CSI control code exceeds the size of the mArgs array, the code may attempt to read past the end of the array, resulting in a force close of the app. Stop the index from moving past the last element of the mArgs array.	2017-06-03 00:15:09 -05:00
Jeff Smith	888802a519	Add test for CSI followed by many parameters	2017-06-03 00:14:20 -05:00
Fredrik Fornwall	1a09b6d2a6	Change android:extractNativeLibs to false We're trying this to see if that fixes an F-Droid build issue. See #319.	2017-05-18 13:25:41 +02:00
Fredrik Fornwall	9d3f7734a1	Update android build tools	2017-05-16 11:11:57 +02:00
Fredrik Fornwall	61f766b59f	Bump build tools in .travis.yml	2017-05-16 00:21:15 +02:00