Validate file path in TermuxOpenReceiver

HELP page wiki changed to https://wiki.termux.com/wiki/Main_Page as it now has more info than http://termux.com/help.html

.idea/gradle.xml

@@ -10,6 +10,8 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/terminal-emulator" />
+            <option value="$PROJECT_DIR$/terminal-view" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.travis.yml

@@ -1,4 +1,4 @@
-sudo: true
+sudo: false
 language: android
 jdk: oraclejdk8
 
@@ -6,20 +6,19 @@ env:
   global:
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
     # via the "travis encrypt" command using the project repo's public key
-    - secure: "ACnFJxw0VusS2lnGXL+epP/CNJmftWS39YcPdgN2EurWw5ZfXSo7vi+zpMB+11IBS3LQyLFFUambi2N9L4lbReZkHVkoVcZFGZlwbXNTAeqT8CABPTcuOyEOZU4bJwqeYU87ztYipENMLNECaZrgWx5odbWLKnSJQw7Zkb4ArCstfXfYk9u8q49ThRxQyGwHW2xKp1an5aa+3Y6IY+ywsSHw6AvXbyFH078Kolxy86caagczcfmKcMi15QYzwAvFggUphvsO3M5PHJMQXuaNlQxDcQRGUEXsK8aZE0dPH5PB97SFjDALZqI7NEpjZAk5htWjX48ssW064LDbjcBg/ZLgDd8R8uhA159NVZgvcnP2czCn6pmggx1sW5MBmcj7i+bJS2ejaMO+KoovWlVvsch742H5QR6rQaNkjDZRsGVLYvJaR1gBLs898UoT1hcHWoqLVR22r2VFo7OWWCRfNRvZuZDR2HIrYRdFvn8P3nWVMkvXwgsOlxWG5sN+yQqW+6lZS7hivsFhtYs4CkRdoZIan3Qvi/CkY8Lg+ESkZ3IJ0NnId8qOWH+8Xl1sqZ7xlsWTd1sYYHlpvkdvqw1HNLP22EpwwKW5Kb5zBEd/qs3o1OO0Tqa0MR6JpgGdHHRk1iZ25+qTfRVP06vO2RXsgAx4SZfO7DyB0QZn8tGNMMI="
+    - secure: "LdajbHNfRlpnqzhX5KY2Vr7KtzU9vXDs1TCNn93J6Dt522f2AaiyUDJvISvz+uslk0WJiS5bB5vGwQmXginxz6Qi6uMgMbjWXulv1vfs6ZviKpUX348DOp1qKPa8WfVNB66F84SwGIfc8cRMAgCFw79l/DFgLErubF8vKo1wZ8Hmvrz//+RJ0BGMa3YRc4VyJhAL0P+0Wc1Q2Im7R9EovAxC5pZXBIMSgr6g5GzLWPisbNLXpMPGsDeYhcenO6XCtCCy+aNxUYM8vcrLDzlVXR5Hy7KEs/MGRTS0Yk13TWUEYa5wBpKelFTszdWYLVn5ANreh/aXRVfHpnW3epotMYguLx1kSvOhWEnc4F+qqv3nle2LpDg9Y9bcLyTTcYnPl9smqEVVjEDu0FoIr1V58xkG4Oc6BPIvLRjlMVU96PXh2HxMLuGsJ/xM+uAFU9oVMbC07xn42Eu5O4NHOHJNOwMWac4/lSKRK8W/7/vWuXj5vhkD9ZsGVpN70UtY5HAfNUGADnTeDblvjgFTNZ2mUN/u0o7Z8ZFURYllZ9YU+Vr2nPf9CAhVBjuwFWx8uRQpAg1aDmc1dVMJijRBeBeU/uWhYqsGp34wkNEl8VGzob4R4QTyI8+T7CndGqKVmbTK/SjqKhjjPpbXIAfOH+JtxvAnNmb8XeQSJ32uK2nexFo="
 
 android:
   components:
     - platform-tools
     - tools
-    - build-tools-25.0.1
-    - android-25
+    - build-tools-27.0.0
+    - android-26
     - extra-android-m2repository
 
 before_install:
   - git clone https://github.com/urho3d/android-ndk.git $HOME/android-ndk
   - export ANDROID_NDK_HOME=$HOME/android-ndk
-  - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
 
 script:
   - ./gradlew testDebugUnitTest

LICENSE.md

@@ -0,0 +1,3 @@
+Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html).
+
+Contains code from `Terminal Emulator for Android` by which is released under [the Apache License 2.0](https://www.apache.org/licenses/).

README.md

@@ -7,15 +7,14 @@ Termux app
 
 * [Termux on Google Play Store](https://play.google.com/store/apps/details?id=com.termux)
 * [Termux on F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux)
-* [Termux Help](http://termux.com/help/)
+* [Termux Facebook](https://facebook.com/termux/)
 * [Termux Google+ community](http://termux.com/community/)
+* [Termux Help](http://termux.com/help/)
+* [Termux Twitter](http://twitter.com/termux/)
+* [Termux Wiki](https://wiki.termux.com/wiki/)  
 
 Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages)
 
-License
-=======
-Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html). Contains code from `Terminal Emulator for Android` which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
-
 Terminal resources
 ==================
 * [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)

app/build.gradle

@@ -1,30 +1,22 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    compileSdkVersion 26
+    buildToolsVersion "27.0.0"
 
     dependencies {
-        compile 'com.android.support:support-annotations:25.0.1'
-        compile "com.android.support:support-v4:25.0.1"
+        compile 'com.android.support:support-annotations:27.0.0'
+        compile "com.android.support:support-core-utils:26.1.0"
+        compile "com.android.support:support-core-ui:26.1.0"
+        compile project(":terminal-view")
     }
 
     defaultConfig {
         applicationId "com.termux"
         minSdkVersion 21
-        targetSdkVersion 25
-        versionCode 44
-        versionName "0.44"
-
-        externalNativeBuild {
-            ndkBuild {
-                cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
-            }
-        }
-
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-        }
+        targetSdkVersion 26
+        versionCode 54
+        versionName "0.54"
     }
 
     buildTypes {
@@ -34,12 +26,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    externalNativeBuild {
-        ndkBuild {
-            path "src/main/jni/Android.mk"
-        }
-    }
 }
 
 dependencies {

app/src/androidTest/java/com/termux/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.termux;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
+        android:extractNativeLibs="true"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backupscheme"
         android:icon="@mipmap/ic_launcher"
@@ -75,6 +76,18 @@
             </intent-filter>
         </activity>
 
+        <activity-alias
+            android:name=".HomeActivity"
+            android:targetActivity="com.termux.app.TermuxActivity">
+
+            <!-- Launch activity automatically on boot on Android Things devices -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.IOT_LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+
         <provider
             android:name=".filepicker.TermuxDocumentsProvider"
             android:authorities="com.termux.documents"
@@ -90,6 +103,15 @@
             android:name="com.termux.app.TermuxService"
             android:exported="false" />
 
+        <receiver android:name=".app.TermuxOpenReceiver" />
+
+        <provider android:authorities="com.termux.files"
+                  android:readPermission="android.permission.permRead"
+                  android:exported="true"
+                  android:grantUriPermissions="true"
+                  android:name="com.termux.app.TermuxOpenReceiver$ContentProvider" />
+
+        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
     </application>
 
 </manifest>

app/src/main/java/com/termux/app/BackgroundJob.java

@@ -12,6 +12,7 @@ import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -105,7 +106,6 @@ public final class BackgroundJob {
         // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
         // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
         final String externalStorageEnv = "EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE");
-        String[] env;
         if (failSafe) {
             // Keep the default path so that system binaries can be used in the failsafe session.
             final String pathEnv = "PATH=" + System.getenv("PATH");
@@ -116,8 +116,9 @@ public final class BackgroundJob {
             final String langEnv = "LANG=en_US.UTF-8";
             final String pathEnv = "PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets";
             final String pwdEnv = "PWD=" + cwd;
+            final String tmpdirEnv = "TMPDIR=" + TermuxService.PREFIX_PATH + "/tmp";
 
-            return new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv};
+            return new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv, tmpdirEnv};
         }
     }
 
@@ -158,7 +159,6 @@ public final class BackgroundJob {
                             if (c == ' ' || c == '\n') {
                                 if (builder.length() == 0) {
                                     // Skip whitespace after shebang.
-                                    continue;
                                 } else {
                                     // End of shebang.
                                     String executable = builder.toString();
@@ -186,9 +186,7 @@ public final class BackgroundJob {
         List<String> result = new ArrayList<>();
         if (interpreter != null) result.add(interpreter);
         result.add(fileToExecute);
-        if (args != null) {
-            for (String arg : args) result.add(arg);
-        }
+        if (args != null) Collections.addAll(result, args);
         return result.toArray(new String[result.size()]);
     }
 

app/src/main/java/com/termux/app/ExtraKeysView.java

@@ -3,6 +3,7 @@ package com.termux.app;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.Gravity;
+import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
@@ -144,6 +145,7 @@ public final class ExtraKeysView extends GridLayout {
                 button.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
+                        finalButton.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
                         View root = getRootView();
                         switch (buttonText) {
                             case "CTRL":

app/src/main/java/com/termux/app/TermuxActivity.java

@@ -49,8 +49,6 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -141,8 +139,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
     int mBellSoundId;
 
-    Animation mOnBellAnimation;
-
     private final BroadcastReceiver mBroadcastReceiever = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -213,13 +209,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        mOnBellAnimation = AnimationUtils.loadAnimation(this, R.anim.on_bell);
-
         mSettings = new TermuxPreferences(this);
 
         setContentView(R.layout.drawer_layout);
         mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
-        mTerminalView.setOnKeyListener(new TermuxKeyListener(this));
+        mTerminalView.setOnKeyListener(new TermuxViewClient(this));
 
         mTerminalView.setTextSize(mSettings.getFontSize());
         mFullScreenHelper.setImmersive(mSettings.isFullScreen());
@@ -254,7 +248,9 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                             TerminalSession session = getCurrentTermSession();
                             if (session != null) {
                                 if (session.isRunning()) {
-                                    session.write(editText.getText().toString() + "\n");
+                                    String textToSend = editText.getText().toString();
+                                    if (textToSend.length() == 0) textToSend = "\n";
+                                    session.write(textToSend);
                                 } else {
                                     removeFinishedSession(session);
                                 }
@@ -401,7 +397,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             @Override
             public void onClipboardText(TerminalSession session, String text) {
                 if (!mIsVisible) return;
-                showToast("Clipboard:\n\"" + text + "\"", false);
                 ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
                 clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(text)));
             }
@@ -410,8 +405,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             public void onBell(TerminalSession session) {
                 if (!mIsVisible) return;
 
-                mTerminalView.startAnimation(mOnBellAnimation);
-
                 switch (mSettings.mBellBehaviour) {
                     case TermuxPreferences.BELL_BEEP:
                         mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
@@ -500,17 +493,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                     public void run() {
                         if (mTermService == null) return; // Activity might have been destroyed.
                         try {
-                            if (TermuxPreferences.isShowWelcomeDialog(TermuxActivity.this)) {
-                                new AlertDialog.Builder(TermuxActivity.this).setTitle(R.string.welcome_dialog_title).setMessage(R.string.welcome_dialog_body)
-                                    .setCancelable(false).setPositiveButton(android.R.string.ok, null)
-                                    .setNegativeButton(R.string.welcome_dialog_dont_show_again_button, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            TermuxPreferences.disableWelcomeDialog(TermuxActivity.this);
-                                            dialog.dismiss();
-                                        }
-                                    }).show();
-                            }
                             addNewSession(false, null);
                         } catch (WindowManager.BadTokenException e) {
                             // Activity finished - ignore.
@@ -523,7 +505,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             }
         } else {
             Intent i = getIntent();
-            if (i != null && i.getAction().equals(Intent.ACTION_RUN)) {
+            if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
                 // Android 7.1 app shortcut from res/xml/shortcuts.xml.
                 addNewSession(false, null);
             } else {

app/src/main/java/com/termux/app/TermuxHelpActivity.java

@@ -39,7 +39,7 @@ public final class TermuxHelpActivity extends Activity {
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (url.startsWith("https://termux.com")) {
+                if (url.startsWith("https://wiki.termux.com")) {
                     // Inline help.
                     setContentView(progressLayout);
                     return false;
@@ -60,7 +60,7 @@ public final class TermuxHelpActivity extends Activity {
                 setContentView(mWebView);
             }
         });
-        mWebView.loadUrl("https://termux.com/help.html");
+        mWebView.loadUrl("https://wiki.termux.com/wiki/Main_Page");
     }
 
     @Override

app/src/main/java/com/termux/app/TermuxInstaller.java

@@ -43,7 +43,7 @@ import java.util.zip.ZipInputStream;
  * (4) The architecture is determined and an appropriate bootstrap zip url is determined in {@link #determineZipUrl()}.
  * <p/>
  * (5) The zip, containing entries relative to the $PREFIX, is is downloaded and extracted by a zip input stream
- * continously encountering zip file entries:
+ * continuously encountering zip file entries:
  * <p/>
  * (5.1) If the zip entry encountered is SYMLINKS.txt, go through it and remember all symlinks to setup.
  * <p/>

app/src/main/java/com/termux/app/TermuxOpenReceiver.java

@@ -0,0 +1,190 @@
+package com.termux.app;
+
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
+import android.support.annotation.NonNull;
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+
+import com.termux.terminal.EmulatorDebug;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class TermuxOpenReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final Uri data = intent.getData();
+        if (data == null) {
+            Log.e(EmulatorDebug.LOG_TAG, "termux-open: Called without intent data");
+            return;
+        }
+
+        final String filePath = data.getPath();
+        final String contentTypeExtra = intent.getStringExtra("content-type");
+        final boolean useChooser = intent.getBooleanExtra("chooser", false);
+        final String intentAction = intent.getAction() == null ? Intent.ACTION_VIEW : intent.getAction();
+        switch (intentAction) {
+            case Intent.ACTION_SEND:
+            case Intent.ACTION_VIEW:
+                // Ok.
+                break;
+            default:
+                Log.e(EmulatorDebug.LOG_TAG, "Invalid action '" + intentAction + "', using 'view'");
+                break;
+        }
+
+        final boolean isExternalUrl = data.getScheme() != null && !data.getScheme().equals("file");
+        if (isExternalUrl) {
+            Intent urlIntent = new Intent(intentAction, data);
+            if (intentAction.equals(Intent.ACTION_SEND)) {
+                urlIntent.putExtra(Intent.EXTRA_TEXT, data.toString());
+                urlIntent.setData(null);
+            } else if (contentTypeExtra != null) {
+                urlIntent.setDataAndType(data, contentTypeExtra);
+            }
+            urlIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            try {
+                context.startActivity(urlIntent);
+            } catch (ActivityNotFoundException e) {
+                Log.e(EmulatorDebug.LOG_TAG, "termux-open: No app handles the url " + data);
+            }
+            return;
+        }
+
+        final File fileToShare = new File(filePath);
+        if (!(fileToShare.isFile() && fileToShare.canRead())) {
+            Log.e(EmulatorDebug.LOG_TAG, "termux-open: Not a readable file: '" + fileToShare.getAbsolutePath() + "'");
+            return;
+        }
+
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(intentAction);
+        sendIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+        String contentTypeToUse;
+        if (contentTypeExtra == null) {
+            String fileName = fileToShare.getName();
+            int lastDotIndex = fileName.lastIndexOf('.');
+            String fileExtension = fileName.substring(lastDotIndex + 1, fileName.length());
+            MimeTypeMap mimeTypes = MimeTypeMap.getSingleton();
+            // Lower casing makes it work with e.g. "JPG":
+            contentTypeToUse = mimeTypes.getMimeTypeFromExtension(fileExtension.toLowerCase());
+            if (contentTypeToUse == null) contentTypeToUse = "application/octet-stream";
+        } else {
+            contentTypeToUse = contentTypeExtra;
+        }
+
+        Uri uriToShare = Uri.withAppendedPath(Uri.parse("content://com.termux.files/"), filePath);
+
+        if (Intent.ACTION_SEND.equals(intentAction)) {
+            sendIntent.putExtra(Intent.EXTRA_STREAM, uriToShare);
+            sendIntent.setType(contentTypeToUse);
+        } else {
+            sendIntent.setDataAndType(uriToShare, contentTypeToUse);
+        }
+
+        if (useChooser) {
+            sendIntent = Intent.createChooser(sendIntent, null).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+
+        try {
+            context.startActivity(sendIntent);
+        } catch (ActivityNotFoundException e) {
+            Log.e(EmulatorDebug.LOG_TAG, "termux-open: No app handles the url " + data);
+        }
+    }
+
+    public static class ContentProvider extends android.content.ContentProvider {
+
+        @Override
+        public boolean onCreate() {
+            return true;
+        }
+
+        @Override
+        public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+            File file = new File(uri.getPath());
+
+            if (projection == null) {
+                projection = new String[]{
+                    MediaStore.MediaColumns.DISPLAY_NAME,
+                    MediaStore.MediaColumns.SIZE,
+                    MediaStore.MediaColumns._ID
+                };
+            }
+
+            Object[] row = new Object[projection.length];
+            for (int i = 0; i < projection.length; i++) {
+                String column = projection[i];
+                Object value;
+                switch (column) {
+                    case MediaStore.MediaColumns.DISPLAY_NAME:
+                        value = file.getName();
+                        break;
+                    case MediaStore.MediaColumns.SIZE:
+                        value = (int) file.length();
+                        break;
+                    case MediaStore.MediaColumns._ID:
+                        value = 1;
+                        break;
+                    default:
+                        value = null;
+                }
+                row[i] = value;
+            }
+
+            MatrixCursor cursor = new MatrixCursor(projection);
+            cursor.addRow(row);
+            return cursor;
+        }
+
+        @Override
+        public String getType(@NonNull Uri uri) {
+            return null;
+        }
+
+        @Override
+        public Uri insert(@NonNull Uri uri, ContentValues values) {
+            return null;
+        }
+
+        @Override
+        public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
+            File file = new File(uri.getPath());
+            try {
+                String path = file.getCanonicalPath();
+                String storagePath = Environment.getExternalStorageDirectory().getCanonicalPath();
+                // See https://support.google.com/faqs/answer/7496913:
+                if (!(path.startsWith(TermuxService.FILES_PATH) || path.startsWith(storagePath))) {
+                    throw new IllegalArgumentException("Invalid path: " + path);
+                }
+            } catch (IOException e) {
+                throw new IllegalArgumentException(e);
+            }
+            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+        }
+    }
+
+}

app/src/main/java/com/termux/app/TermuxPreferences.java

@@ -36,7 +36,6 @@ final class TermuxPreferences {
     private static final String SHOW_EXTRA_KEYS_KEY = "show_extra_keys";
     private static final String FONTSIZE_KEY = "fontsize";
     private static final String CURRENT_SESSION_KEY = "current_session";
-    private static final String SHOW_WELCOME_DIALOG_KEY = "intro_dialog";
 
     private boolean mFullScreen;
     private int mFontSize;
@@ -117,14 +116,6 @@ final class TermuxPreferences {
         return null;
     }
 
-    public static boolean isShowWelcomeDialog(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SHOW_WELCOME_DIALOG_KEY, true);
-    }
-
-    public static void disableWelcomeDialog(Context context) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SHOW_WELCOME_DIALOG_KEY, false).apply();
-    }
-
     public void reloadFromProperties(Context context) {
         try {
             File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");

app/src/main/java/com/termux/app/TermuxService.java

@@ -14,6 +14,7 @@ import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 import android.widget.ArrayAdapter;
 
@@ -23,7 +24,6 @@ import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -104,7 +104,8 @@ public final class TermuxService extends Service implements SessionChangedCallba
                 mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG);
                 mWakeLock.acquire();
 
-                WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+                // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
+                WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
                 mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, EmulatorDebug.LOG_TAG);
                 mWifiLock.acquire();
 
@@ -152,6 +153,11 @@ public final class TermuxService extends Service implements SessionChangedCallba
             Log.e(EmulatorDebug.LOG_TAG, "Unknown TermuxService action: '" + action + "'");
         }
 
+        if ((flags & START_FLAG_REDELIVERY) == 0) {
+            // Service is started by WBR, not restarted by system, so release the WakeLock from WBR.
+            WakefulBroadcastReceiver.completeWakefulIntent(intent);
+        }
+
         // If this service really do get killed, there is no point restarting it automatically - let the user do on next
         // start of {@link Term):
         return Service.START_NOT_STICKY;
@@ -168,7 +174,7 @@ public final class TermuxService extends Service implements SessionChangedCallba
     }
 
     /** Update the shown foreground service notification after making any changes that affect it. */
-    private void updateNotification() {
+    void updateNotification() {
         if (mWakeLock == null && mTerminalSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
             // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             stopSelf();
@@ -251,28 +257,11 @@ public final class TermuxService extends Service implements SessionChangedCallba
         boolean isLoginShell = false;
 
         if (executablePath == null) {
-            File shell = new File(HOME_PATH, ".termux/shell");
-            if (shell.exists()) {
-                try {
-                    File canonicalFile = shell.getCanonicalFile();
-                    if (canonicalFile.isFile() && canonicalFile.canExecute()) {
-                        executablePath = canonicalFile.getName().equals("busybox") ? (PREFIX_PATH + "/bin/ash") : canonicalFile.getAbsolutePath();
-                    } else {
-                        Log.w(EmulatorDebug.LOG_TAG, "$HOME/.termux/shell points to non-executable shell: " + canonicalFile.getAbsolutePath());
-                    }
-                } catch (IOException e) {
-                    Log.e(EmulatorDebug.LOG_TAG, "Error checking $HOME/.termux/shell", e);
-                }
-            }
-
-            if (executablePath == null) {
-                // Try bash, zsh and ash in that order:
-                for (String shellBinary : new String[]{"bash", "zsh", "ash"}) {
-                    File shellFile = new File(PREFIX_PATH + "/bin/" + shellBinary);
-                    if (shellFile.canExecute()) {
-                        executablePath = shellFile.getAbsolutePath();
-                        break;
-                    }
+            for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
+                File shellFile = new File(PREFIX_PATH + "/bin/" + shellBinary);
+                if (shellFile.canExecute()) {
+                    executablePath = shellFile.getAbsolutePath();
+                    break;
                 }
             }
 

app/src/main/java/com/termux/app/TermuxViewClient.java

@@ -12,18 +12,18 @@ import android.view.inputmethod.InputMethodManager;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
-import com.termux.view.TerminalKeyListener;
+import com.termux.view.TerminalViewClient;
 
 import java.util.List;
 
-public final class TermuxKeyListener implements TerminalKeyListener {
+public final class TermuxViewClient implements TerminalViewClient {
 
     final TermuxActivity mActivity;
 
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
-    public TermuxKeyListener(TermuxActivity activity) {
+    public TermuxViewClient(TermuxActivity activity) {
         this.mActivity = activity;
     }
 
@@ -256,6 +256,11 @@ public final class TermuxKeyListener implements TerminalKeyListener {
         return false;
     }
 
+    @Override
+    public boolean onLongPress(MotionEvent event) {
+        return false;
+    }
+
     /** Handle dedicated volume buttons as virtual keys if applicable. */
     private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         InputDevice inputDevice = event.getDevice();

app/src/main/res/anim/on_bell.xml

@@ -1,7 +0,0 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:duration="30"
-               android:fromXDelta="-1%"
-               android:repeatCount="1"
-               android:repeatMode="reverse"
-               android:toXDelta="1%"/>
-</set>

app/src/main/res/drawable/ic_service_notification.xml

@@ -24,7 +24,7 @@
 
     <!-- Block cursor. -->
     <path android:fillColor="#000"
-          android:pathData="M12,12
+          android:pathData="M14,14
                             l5,0
                             l0,10
                             l-5,0"

app/src/main/res/values/strings.xml

@@ -11,10 +11,6 @@
    <string name="share_transcript_title">Terminal transcript</string>
    <string name="help">Help</string>
 
-   <string name="welcome_dialog_title">Welcome to Termux</string>
-   <string name="welcome_dialog_body">Long press and select <i>More…</i> to show a menu where <i>Help</i> is available.\n\nExecute <b>apt update</b> to update the packages list before installing packages.</string>
-   <string name="welcome_dialog_dont_show_again_button">Do not show again</string>
-
    <string name="bootstrap_installer_body">Installing…</string>
    <string name="bootstrap_error_title">Unable to install</string>
    <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.\n\nCheck your network connection and try again.</string>
@@ -34,10 +30,6 @@
   <string name="select_url_copied_to_clipboard">URL copied to clipboard</string>
   <string name="share_transcript_chooser_title">Send text to:</string>
 
-  <string name="paste_text">Paste</string>
-  <string name="copy_text">Copy</string>
-  <string name="text_selection_more">More…</string>
-
   <string name="kill_process">Kill process (%d)</string>
   <string name="confirm_kill_process">Really kill this session?</string>
 

app/src/main/res/values/styles.xml

@@ -5,6 +5,7 @@
     <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
     <style name="Theme.Termux" parent="@android:style/Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">#000000</item>
+        <item name="android:colorPrimary">#FF000000</item>
         <item name="android:windowBackground">@android:color/black</item>
 
         <!-- Seen in buttons on left drawer: -->
@@ -13,6 +14,10 @@
         <!-- Avoid action mode toolbar pushing down terminal content when
              selecting text on pre-6.0 (non-floating toolbar). -->
         <item name="android:windowActionModeOverlay">true</item>
+
+        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
     </style>
 
 	<style name="TermuxAlertDialogStyle" parent="@android:style/Theme.Material.Light.Dialog.Alert">

app/src/main/res/xml/shortcuts.xml

@@ -1,9 +1,11 @@
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+<shortcuts xmlns:tools="http://schemas.android.com/tools"
+           xmlns:android="http://schemas.android.com/apk/res/android">
     <shortcut
         android:shortcutId="new_session"
         android:enabled="true"
         android:icon="@drawable/ic_new_session"
-        android:shortcutShortLabel="@string/new_session">
+        android:shortcutShortLabel="@string/new_session"
+        tools:targetApi="n_mr1">
         <intent
             android:action="android.intent.action.RUN"
             android:targetPackage="com.termux"

art/copy-to-other-apps.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+for DENSITY in mdpi hdpi xhdpi xxhdpi xxxhdpi; do
+	FOLDER=../app/src/main/res/mipmap-$DENSITY
+
+	for FILE in ic_launcher ic_launcher_round; do
+		PNG=$FOLDER/$FILE.png
+
+		# Update other apps:
+		for APP in api boot styling tasker widget; do
+			APPDIR=../../termux-$APP
+			if [ -d $APPDIR ]; then
+				APP_FOLDER=$APPDIR/app/src/main/res/mipmap-$DENSITY
+				mkdir -p $APP_FOLDER
+				cp $PNG $APP_FOLDER/$FILE.png
+			fi
+		done
+	done
+
+done

art/feature-graphic.svg

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+  This is a feature graphic:
+    https://support.google.com/googleplay/android-developer/answer/1078870
+  - 1024px by 500px, no alpha
+  - Don't include any copy or important visual information near the borders of the asset,
+    specifically near the bottom third of the frame.
+  - Try to center align any logo/copy information in the vertical and horizontal center of the frame.
+  - If adding text, use large font sizes.
+  - Your graphic may be displayed alone without the app icon.
+ -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     version="1.1"
+     viewBox="0 0 1024 500">
+
+ <rect fill="#0" width="100%" height="100%" />
+
+ <text id="shell_prompt"
+       x="130"
+       y="330"
+       style="fill: #ffffff; font-size: 124px; font-family: Menlo;">
+       <!--
+   <tspan>$</tspan>
+   <tspan x="290">Termux</tspan>
+   <tspan x="734">█</tspan>
+   -->
+   <tspan>$ Termux █</tspan>
+ </text>
+
+</svg>

art/generate-feature-graphic.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "Generating feature graphics to ~/termux-icons/termux-feature-graphic.png..."
+mkdir -p ~/termux-icons/
+rsvg-convert feature-graphic.svg > ~/termux-icons/feature-graphic.png

art/generate-tv-banner.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Generating feature graphics to ~/termux-icons/termux-feature-graphic.png..."
+mkdir -p ~/termux-icons/
+
+# The Android TV banner on google play (1280x720) has same aspect ratio
+# as the banner in the app (320x180).
+rsvg-convert -w 1280 -h 720 tv-banner.svg > ~/termux-icons/tv-banner.png
+rsvg-convert -w  320 -h 180 tv-banner.svg > ../app/src/main/res/drawable/banner.png

art/ic_launcher.svg

@@ -4,20 +4,20 @@
     <path fill="#000"
           stroke="#BFCBCD"
           stroke-width="2"
-          d="M7,4
-             l34,0
+          d="M9,6
+             l30,0
              q3 0,3 3
-             l0,34
+             l0,30
              q0 3, -3 3
-             l-34,0
+             l-30,0
              q-3 0, -3-3
-             l0 -34
+             l0 -30
              q0 -3, 3 -3"
     />
 
     <!-- Block cursor. -->
     <path fill="#FFF"
-          d="M12,12
+          d="M14,14
              l5,0
              l0,10
              l-5,0"

art/tv-banner.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+  This is a tv banner graphic:
+    https://developer.android.com/design/tv/patterns.html#banner
+  - Size: 320 x 180 px, xhdpi resource in app
+  - Size: 1280 x 720 in google play.
+  - Text must be included in the image. If your app is available in more
+    than one language, you must provide versions of the banner image for each supported language.
+ -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     version="1.1"
+     viewBox="0 0 1280 720">
+
+ <rect fill="#0" width="100%" height="100%" />
+
+ <text id="shell_prompt"
+       x="200"
+       y="410"
+       style="fill: #ffffff; font-size: 210px; font-family: Menlo, Monospace;">
+   <tspan>Termux  ▌</tspan>
+ </text>
+
+</svg>

build.gradle

@@ -1,17 +1,19 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Dec 04 17:26:05 CET 2016
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

scripts/bintray-publish.gradle

@@ -0,0 +1,78 @@
+// Start https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle
+apply plugin: 'com.github.dcendents.android-maven'
+group = publishedGroupId // Maven Group ID for the artifact
+install {
+    repositories.mavenInstaller {
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                licenses {
+                    license {
+                        name 'GNU General Public License version 3'
+                        url 'https://opensource.org/licenses/gpl-3.0.html'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id 'fornwall'
+                        name 'Fredrik Fornwall'
+                        email 'fredrik@fornwall.net'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+// End https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle
+
+// Start https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle
+apply plugin: 'com.jfrog.bintray'
+
+version = libraryVersion
+
+task sourcesJar(type: Jar) {
+	classifier = 'sources'
+	from android.sourceSets.main.java.srcDirs
+}
+
+artifacts {
+	archives sourcesJar
+}
+
+bintray {
+	user = System.getenv('BINTRAY_USER')
+	key = System.getenv('BINTRAY_API_KEY')
+
+	configurations = ['archives']
+	pkg {
+		repo = 'maven'
+		name = bintrayName
+		userOrg = 'termux'
+		desc = libraryDescription
+		websiteUrl = siteUrl
+		vcsUrl = gitUrl
+		licenses = ['GPL-3.0']
+		publish = true
+		publicDownloadNumbers = true
+		version {
+			desc = libraryDescription
+			gpg {
+				sign = false //Determines whether to GPG sign the files. The default is false
+				// passphrase = properties.getProperty("bintray.gpg.password")
+			}
+		}
+	}
+}

settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':app', ':terminal-emulator', ':terminal-view'

terminal-emulator/build.gradle

@@ -0,0 +1,62 @@
+plugins {
+    id "com.jfrog.bintray" version "1.7.3"
+    id "com.github.dcendents.android-maven" version "2.0"
+}
+
+apply plugin: 'com.android.library'
+
+ext {
+    bintrayName = 'terminal-emulator'
+    publishedGroupId = 'com.termux'
+    libraryName = 'TerminalEmulator'
+    artifact = 'terminal-emulator'
+    libraryDescription = 'The terminal emulator used in Termux'
+    siteUrl = 'https://github.com/termux/termux'
+    gitUrl = 'https://github.com/termux/termux.git'
+    libraryVersion = '0.51'
+}
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "27.0.0"
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 26
+
+        externalNativeBuild {
+            ndkBuild {
+                cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
+            }
+        }
+
+        ndk {
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path "src/main/jni/Android.mk"
+        }
+    }
+}
+
+tasks.withType(Test) {
+    testLogging {
+        events "started", "passed", "skipped", "failed"
+    }
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+}
+
+apply from: '../scripts/bintray-publish.gradle'

terminal-emulator/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/fornwall/lib/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

terminal-emulator/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest package="com.termux.terminal">
+</manifest>

terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java

@@ -3,7 +3,7 @@ package com.termux.terminal;
 /**
  * A circular buffer of {@link TerminalRow}:s which keeps notes about what is visible on a logical screen and the scroll
  * history.
- * <p/>
+ * <p>
  * See {@link #externalToInternalRow(int)} for how to map from logical screen rows to array indices.
  */
 public final class TerminalBuffer {
@@ -92,22 +92,20 @@ public final class TerminalBuffer {
 
     /**
      * Convert a row value from the public external coordinate system to our internal private coordinate system.
-     * <p/>
-     * <ul>
-     * <li>External coordinate system: -mActiveTranscriptRows to mScreenRows-1, with the screen being 0..mScreenRows-1.
-     * <li>Internal coordinate system: the mScreenRows lines starting at mScreenFirstRow comprise the screen, while the
-     * mActiveTranscriptRows lines ending at mScreenFirstRow-1 form the transcript (as a circular buffer).
-     * </ul>
-     * <p/>
-     * External <---> Internal:
-     * <p/>
+     *
      * <pre>
-     * [ ...                            ]           [ ...                                     ]
-     * [ -mActiveTranscriptRows         ]           [ mScreenFirstRow - mActiveTranscriptRows ]
-     * [ ...                            ]           [ ...                                     ]
-     * [ 0 (visible screen starts here) ]  <----->  [ mScreenFirstRow                         ]
-     * [ ...                            ]           [ ...                                     ]
-     * [ mScreenRows-1                  ]           [ mScreenFirstRow + mScreenRows-1         ]
+     * - External coordinate system: -mActiveTranscriptRows to mScreenRows-1, with the screen being 0..mScreenRows-1.
+     * - Internal coordinate system: the mScreenRows lines starting at mScreenFirstRow comprise the screen, while the
+     *   mActiveTranscriptRows lines ending at mScreenFirstRow-1 form the transcript (as a circular buffer).
+     *
+     * External ↔ Internal:
+     *
+     * [ ...                            ]     [ ...                                     ]
+     * [ -mActiveTranscriptRows         ]     [ mScreenFirstRow - mActiveTranscriptRows ]
+     * [ ...                            ]     [ ...                                     ]
+     * [ 0 (visible screen starts here) ]  ↔  [ mScreenFirstRow                         ]
+     * [ ...                            ]     [ ...                                     ]
+     * [ mScreenRows-1                  ]     [ mScreenFirstRow + mScreenRows-1         ]
      * </pre>
      *
      * @param externalRow a row in the external coordinate system.

terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java

@@ -56,8 +56,6 @@ public final class TerminalEmulator {
     private static final int ESC_SELECT_LEFT_PAREN = 3;
     /** Escape processing: Have seen ESC and a character-set-select ) char */
     private static final int ESC_SELECT_RIGHT_PAREN = 4;
-    /** Escape processing: Have seen ESC and a character-set-select + char */
-    // private static final int ESC_SELECT_PLUS = 5;
     /** Escape processing: "ESC [" or CSI (Control Sequence Introducer). */
     private static final int ESC_CSI = 6;
     /** Escape processing: ESC [ ? */
@@ -225,6 +223,7 @@ public final class TerminalEmulator {
 
     private byte mUtf8ToFollow, mUtf8Index;
     private final byte[] mUtf8InputBuffer = new byte[4];
+    private int mLastEmittedCodePoint = -1;
 
     public final TerminalColors mColors = new TerminalColors();
 
@@ -421,10 +420,11 @@ public final class TerminalEmulator {
                     mUtf8Index = mUtf8ToFollow = 0;
 
                     if (codePoint >= 0x80 && codePoint <= 0x9F) {
-                        // Sequence decoded to a C1 control character which is the same as escape followed by
-                        // ((code & 0x7F) + 0x40).
-                        processCodePoint(/* escape (hexadecimal=0x1B, octal=033): */27);
-                        processCodePoint((codePoint & 0x7F) + 0x40);
+                        // Sequence decoded to a C1 control character which we ignore. They are
+                        // not used nowadays and increases the risk of messing up the terminal state
+                        // on binary input. XTerm does not allow them in utf-8:
+                        // "It is not possible to use a C1 control obtained from decoding the
+                        // UTF-8 text" - http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
                     } else {
                         switch (Character.getType(codePoint)) {
                             case Character.UNASSIGNED:
@@ -634,6 +634,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.
@@ -967,6 +968,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;
@@ -983,6 +985,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);
@@ -1189,12 +1192,20 @@ public final class TerminalEmulator {
     }
 
     private void doLinefeed() {
+        boolean belowScrollingRegion = mCursorRow >= mBottomMargin;
         int newCursorRow = mCursorRow + 1;
-        if (newCursorRow >= mBottomMargin) {
-            scrollDownOneLine();
-            newCursorRow = mBottomMargin - 1;
+        if (belowScrollingRegion) {
+            // Move down (but not scroll) as long as we are above the last row.
+            if (mCursorRow != mRows - 1) {
+                setCursorRow(newCursorRow);
+            }
+        } else {
+            if (newCursorRow == mBottomMargin) {
+                scrollDownOneLine();
+                newCursorRow = mBottomMargin - 1;
+            }
+            setCursorRow(newCursorRow);
         }
-        setCursorRow(newCursorRow);
     }
 
     private void continueSequence(int state) {
@@ -1309,6 +1320,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;
@@ -1320,6 +1333,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;
@@ -1503,6 +1518,11 @@ public final class TerminalEmulator {
             case '`': // Horizontal position absolute (HPA - http://www.vt100.net/docs/vt510-rm/HPA).
                 setCursorColRespectingOriginMode(getArg0(1) - 1);
                 break;
+            case 'b': // Repeat the preceding graphic character Ps times (REP).
+                if (mLastEmittedCodePoint == -1) break;
+                final int numRepeat = getArg0(1);
+                for (int i = 0; i < numRepeat; i++) emitCodePoint(mLastEmittedCodePoint);
+                break;
             case 'c': // Primary Device Attributes (http://www.vt100.net/docs/vt510-rm/DA1) if argument is missing or zero.
                 // The important part that may still be used by some (tmux stores this value but does not currently use it)
                 // is the first response parameter identifying the terminal service class, where we send 64 for "vt420".
@@ -1559,7 +1579,7 @@ public final class TerminalEmulator {
                 break;
             case 'r': // "CSI${top};${bottom}r" - set top and bottom Margins (DECSTBM).
             {
-                // http://www.vt100.net/docs/vt510-rm/DECSTBM
+                // https://vt100.net/docs/vt510-rm/DECSTBM.html
                 // The top margin defaults to 1, the bottom margin defaults to mRows.
                 // The escape sequence numbers top 1..23, but we number top 0..22.
                 // The escape sequence numbers bottom 2..24, and so do we (because we use a zero based numbering
@@ -1568,6 +1588,7 @@ public final class TerminalEmulator {
                 // Also require that top + 2 <= bottom.
                 mTopMargin = Math.max(0, Math.min(getArg0(1) - 1, mRows - 2));
                 mBottomMargin = Math.max(mTopMargin + 2, Math.min(getArg1(mRows), mRows));
+
                 // DECSTBM moves the cursor to column 1, line 1 of the page respecting origin mode.
                 setCursorPosition(0, 0);
             }
@@ -1641,6 +1662,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) {
@@ -2051,6 +2073,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) {
@@ -2083,6 +2106,7 @@ public final class TerminalEmulator {
      * @param codePoint The code point of the character to display
      */
     private void emitCodePoint(int codePoint) {
+        mLastEmittedCodePoint = codePoint;
         if (mUseLineDrawingUsesG0 ? mUseLineDrawingG0 : mUseLineDrawingG1) {
             // http://www.vt100.net/docs/vt102-ug/table5-15.html.
             switch (codePoint) {
@@ -2265,8 +2289,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;
@@ -2320,7 +2344,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;
     }

terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java

@@ -4,7 +4,7 @@ import java.util.Arrays;
 
 /**
  * A row in a terminal, composed of a fixed number of cells.
- * <p/>
+ * <p>
  * The text in the row is stored in a char[] array, {@link #mText}, for quick access during rendering.
  */
 public final class TerminalRow {

terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java

@@ -19,13 +19,13 @@ import java.util.UUID;
 
 /**
  * A terminal session, consisting of a process coupled to a terminal interface.
- * <p/>
+ * <p>
  * The subprocess will be executed by the constructor, and when the size is made known by a call to
  * {@link #updateSize(int, int)} terminal emulation will begin and threads will be spawned to handle the subprocess I/O.
  * All terminal emulation and callback methods will be performed on the main thread.
- * <p/>
+ * <p>
  * The child process may be exited forcefully by using the {@link #finishIfRunning()} method.
- * <p/>
+ * <p>
  * NOTE: The terminal session may outlive the EmulatorView, so be careful with callbacks!
  */
 public final class TerminalSession extends TerminalOutput {
@@ -123,12 +123,12 @@ public final class TerminalSession extends TerminalOutput {
                 String exitDescription = "\r\n[Process completed";
                 if (exitCode > 0) {
                     // Non-zero process exit.
-                    exitDescription += " with code " + exitCode;
+                    exitDescription += " (code " + exitCode + ")";
                 } else if (exitCode < 0) {
                     // Negated signal.
-                    exitDescription += " with signal " + (-exitCode);
+                    exitDescription += " (signal " + (-exitCode) + ")";
                 }
-                exitDescription += " - press Enter to close]";
+                exitDescription += " - press Enter]";
 
                 byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
                 mEmulator.append(bytesToWrite, bytesToWrite.length);

terminal-emulator/src/main/java/com/termux/terminal/TextStyle.java

@@ -1,10 +1,13 @@
 package com.termux.terminal;
 
 /**
+ * <p>
  * Encodes effects, foreground and background colors into a 64 bit long, which are stored for each cell in a terminal
  * row in {@link TerminalRow#mStyle}.
- * <p/>
+ * </p>
+ * <p>
  * The bit layout is:
+ * </p>
  * - 16 flags (11 currently used).
  * - 24 for foreground color (only 9 first bits if a color index).
  * - 24 for background color (only 9 first bits if a color index).
@@ -20,9 +23,10 @@ public final class TextStyle {
     public final static int CHARACTER_ATTRIBUTE_STRIKETHROUGH = 1 << 6;
     /**
      * The selective erase control functions (DECSED and DECSEL) can only erase characters defined as erasable.
-     * <p/>
+     * <p>
      * This bit is set if DECSCA (Select Character Protection Attribute) has been used to define the characters that
      * come after it as erasable from the screen.
+     * </p>
      */
     public final static int CHARACTER_ATTRIBUTE_PROTECTED = 1 << 7;
     /** Dim colors. Also known as faint or half intensity. */

terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java

@@ -29,4 +29,21 @@ 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", "   ");
+	}
+
+    /** CSI Ps b  Repeat the preceding graphic character Ps times (REP). */
+    public void testRepeat() {
+        withTerminalSized(3, 2).enterString("a\033[b").assertLinesAre("aa ", "   ");
+        withTerminalSized(3, 2).enterString("a\033[2b").assertLinesAre("aaa", "   ");
+        // When no char has been output we ignore REP:
+        withTerminalSized(3, 2).enterString("\033[b").assertLinesAre("   ", "   ");
+        // This shows that REP outputs the last emitted code point and not the one relative to the
+        // current cursor position:
+        withTerminalSized(5, 2).enterString("abcde\033[2G\033[2b\n").assertLinesAre("aeede", "     ");
+    }
+
 }

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));
+	}
+
 }

terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java

@@ -98,4 +98,13 @@ public class ScrollRegionTest extends TerminalTestCase {
 		withTerminalSized(2, 5).enterString("1\r\n2\r\n3\r\n4\r\n5").assertLinesAre("1 ", "2 ", "3 ", "4 ", "5 ");
 		enterString("\033[3r").enterString("\033[2T").assertLinesAre("1 ", "2 ", "  ", "  ", "3 ");
 	}
+
+	public void testScrollDownBelowScrollRegion() {
+		withTerminalSized(2, 5).enterString("1\r\n2\r\n3\r\n4\r\n5").assertLinesAre("1 ", "2 ", "3 ", "4 ", "5 ");
+		enterString("\033[1;3r"); // DECSTBM margins.
+		enterString("\033[4;1H"); // Place cursor just below bottom margin.
+		enterString("QQ\r\nRR\r\n\r\n\r\nYY");
+		assertLinesAre("1 ", "2 ", "3 ", "QQ", "YY");
+	}
+
 }

terminal-emulator/src/test/java/com/termux/terminal/TerminalRowTest.java

@@ -27,6 +27,7 @@ public class TerminalRowTest extends TestCase {
 
 	@Override
 	protected void setUp() throws Exception {
+		super.setUp();
 		row = new TerminalRow(COLUMNS, TextStyle.NORMAL);
 	}
 

terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java

@@ -103,6 +103,7 @@ public abstract class TerminalTestCase extends TestCase {
 
 	@Override
 	protected void setUp() throws Exception {
+		super.setUp();
 		mOutput = new MockTerminalOutput();
 	}
 

terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java

@@ -19,6 +19,7 @@ public class WcWidthTest extends TestCase {
         assertWidthIs(1, 'å');
         assertWidthIs(1, 'ä');
         assertWidthIs(1, 'ö');
+        assertWidthIs(1, 0x23F2);
     }
 
 	public void testSomeWide() {
@@ -45,6 +46,7 @@ public class WcWidthTest extends TestCase {
 	public void testCombining() {
         assertWidthIs(0, 0x0302);
         assertWidthIs(0, 0x0308);
+        assertWidthIs(0, 0xFE0F);
     }
 
     public void testWordJoiner() {

terminal-view/build.gradle

@@ -0,0 +1,46 @@
+plugins {
+    id "com.jfrog.bintray" version "1.7"
+    id "com.github.dcendents.android-maven" version "1.5"
+}
+
+apply plugin: 'com.android.library'
+
+ext {
+    bintrayName = 'terminal-view'
+    publishedGroupId = 'com.termux'
+    libraryName = 'TerminalView'
+    artifact = 'terminal-view'
+    libraryDescription = 'The terminal view used in Termux'
+    siteUrl = 'https://github.com/termux/termux'
+    gitUrl = 'https://github.com/termux/termux.git'
+    libraryVersion = '0.49'
+}
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "27.0.0"
+
+    dependencies {
+        compile 'com.android.support:support-annotations:25.3.1'
+        compile project(":terminal-emulator")
+    }
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 26
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+}
+
+apply from: '../scripts/bintray-publish.gradle'

terminal-view/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/fornwall/lib/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

terminal-view/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest package="com.termux.view">
+</manifest>

terminal-view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java

@@ -6,7 +6,7 @@ import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 
 /** A combination of {@link GestureDetector} and {@link ScaleGestureDetector}. */
-public final class GestureAndScaleRecognizer {
+final class GestureAndScaleRecognizer {
 
     public interface Listener {
         boolean onSingleTapUp(MotionEvent e);

terminal-view/src/main/java/com/termux/view/TerminalView.java

@@ -29,7 +29,6 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.widget.Scroller;
 
-import com.termux.R;
 import com.termux.terminal.EmulatorDebug;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalBuffer;
@@ -49,7 +48,7 @@ public final class TerminalView extends View {
 
     TerminalRenderer mRenderer;
 
-    TerminalKeyListener mOnKeyListener;
+    TerminalViewClient mClient;
 
     /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
     int mTopRow;
@@ -106,7 +105,7 @@ public final class TerminalView extends View {
                 requestFocus();
                 if (!mEmulator.isMouseTrackingActive()) {
                     if (!e.isFromSource(InputDevice.SOURCE_MOUSE)) {
-                        mOnKeyListener.onSingleTapUp(e);
+                        mClient.onSingleTapUp(e);
                         return true;
                     }
                 }
@@ -136,7 +135,7 @@ public final class TerminalView extends View {
             public boolean onScale(float focusX, float focusY, float scale) {
                 if (mEmulator == null || mIsSelectingText) return true;
                 mScaleFactor *= scale;
-                mScaleFactor = mOnKeyListener.onScale(mScaleFactor);
+                mScaleFactor = mClient.onScale(mScaleFactor);
                 return true;
             }
 
@@ -189,7 +188,9 @@ public final class TerminalView extends View {
 
             @Override
             public void onLongPress(MotionEvent e) {
-                if (!mGestureRecognizer.isInProgress() && !mIsSelectingText) {
+                if (mGestureRecognizer.isInProgress()) return;
+                if (mClient.onLongPress(e)) return;
+                if (!mIsSelectingText) {
                     performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
                     toggleSelectingText(e);
                 }
@@ -202,8 +203,8 @@ public final class TerminalView extends View {
      * @param onKeyListener Listener for all kinds of key events, both hardware and IME (which makes it different from that
      *                      available with {@link View#setOnKeyListener(OnKeyListener)}.
      */
-    public void setOnKeyListener(TerminalKeyListener onKeyListener) {
-        this.mOnKeyListener = onKeyListener;
+    public void setOnKeyListener(TerminalViewClient onKeyListener) {
+        this.mClient = onKeyListener;
     }
 
     /**
@@ -238,9 +239,9 @@ public final class TerminalView extends View {
         // https://github.com/termux/termux-app/issues/137 (japanese chars and TYPE_NULL).
         outAttrs.inputType = InputType.TYPE_NULL;
 
-        outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_FULLSCREEN |
-                               EditorInfo.IME_FLAG_NO_ENTER_ACTION |
-                               EditorInfo.IME_ACTION_NONE;
+        // Note that IME_ACTION_NONE cannot be used as that makes it impossible to input newlines using the on-screen
+        // keyboard on Android TV (see https://github.com/termux/termux-app/issues/221).
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
 
         return new BaseInputConnection(this, true) {
 
@@ -298,6 +299,14 @@ public final class TerminalView extends View {
 
                     boolean ctrlHeld = false;
                     if (codePoint <= 31 && codePoint != 27) {
+                        if (codePoint == '\n') {
+                            // The AOSP keyboard and descendants seems to send \n as text when the enter key is pressed,
+                            // instead of a key event like most other keyboard apps. A terminal expects \r for the enter
+                            // key (although when icrnl is enabled this doesn't make a difference - run 'stty -icrnl' to
+                            // check the behaviour).
+                            codePoint = '\r';
+                        }
+
                         // E.g. penti keyboard for ctrl input.
                         ctrlHeld = true;
                         switch (codePoint) {
@@ -547,7 +556,7 @@ public final class TerminalView extends View {
             if (mIsSelectingText) {
                 toggleSelectingText(null);
                 return true;
-            } else if (mOnKeyListener.shouldBackButtonBeMappedToEscape()) {
+            } else if (mClient.shouldBackButtonBeMappedToEscape()) {
                 // Intercept back button to treat it as escape:
                 switch (event.getAction()) {
                     case KeyEvent.ACTION_DOWN:
@@ -566,10 +575,10 @@ public final class TerminalView extends View {
             Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
         if (mEmulator == null) return true;
 
-        if (mOnKeyListener.onKeyDown(keyCode, event, mTermSession)) {
+        if (mClient.onKeyDown(keyCode, event, mTermSession)) {
             invalidate();
             return true;
-        } else if (event.isSystem() && (!mOnKeyListener.shouldBackButtonBeMappedToEscape() || keyCode != KeyEvent.KEYCODE_BACK)) {
+        } else if (event.isSystem() && (!mClient.shouldBackButtonBeMappedToEscape() || keyCode != KeyEvent.KEYCODE_BACK)) {
             return super.onKeyDown(keyCode, event);
         } else if (event.getAction() == KeyEvent.ACTION_MULTIPLE && keyCode == KeyEvent.KEYCODE_UNKNOWN) {
             mTermSession.write(event.getCharacters());
@@ -633,10 +642,10 @@ public final class TerminalView extends View {
                 + leftAltDownFromEvent + ")");
         }
 
-        final boolean controlDown = controlDownFromEvent || mOnKeyListener.readControlKey();
-        final boolean altDown = leftAltDownFromEvent || mOnKeyListener.readAltKey();
+        final boolean controlDown = controlDownFromEvent || mClient.readControlKey();
+        final boolean altDown = leftAltDownFromEvent || mClient.readAltKey();
 
-        if (mOnKeyListener.onCodePoint(codePoint, controlDown, mTermSession)) return;
+        if (mClient.onCodePoint(codePoint, controlDown, mTermSession)) return;
 
         if (controlDown) {
             if (codePoint >= 'a' && codePoint <= 'z') {
@@ -705,7 +714,7 @@ public final class TerminalView extends View {
             Log.i(EmulatorDebug.LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
         if (mEmulator == null) return true;
 
-        if (mOnKeyListener.onKeyUp(keyCode, event)) {
+        if (mClient.onKeyUp(keyCode, event)) {
             invalidate();
             return true;
         } else if (event.isSystem()) {
@@ -773,7 +782,7 @@ public final class TerminalView extends View {
     @TargetApi(23)
     public void toggleSelectingText(MotionEvent ev) {
         mIsSelectingText = !mIsSelectingText;
-        mOnKeyListener.copyModeChanged(mIsSelectingText);
+        mClient.copyModeChanged(mIsSelectingText);
 
         if (mIsSelectingText) {
             if (mLeftSelectionHandle == null) {
@@ -825,6 +834,10 @@ public final class TerminalView extends View {
 
                 @Override
                 public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                    if (!mIsSelectingText) {
+                        // Fix issue where the dialog is pressed while being dismissed.
+                        return true;
+                    }
                     switch (item.getItemId()) {
                         case 1:
                             String selectedText = mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2).trim();

terminal-view/src/main/java/com/termux/view/TerminalViewClient.java

@@ -8,16 +8,19 @@ import com.termux.terminal.TerminalSession;
 
 /**
  * Input and scale listener which may be set on a {@link TerminalView} through
- * {@link TerminalView#setOnKeyListener(TerminalKeyListener)}.
+ * {@link TerminalView#setOnKeyListener(TerminalViewClient)}.
  * <p/>
- * TODO: Rename to TerminalViewClient.
  */
-public interface TerminalKeyListener {
+public interface TerminalViewClient {
 
-    /** Callback function on scale events according to {@link ScaleGestureDetector#getScaleFactor()}. */
+    /**
+     * Callback function on scale events according to {@link ScaleGestureDetector#getScaleFactor()}.
+     */
     float onScale(float scale);
 
-    /** On a single tap on the terminal if terminal mouse reporting not enabled. */
+    /**
+     * On a single tap on the terminal if terminal mouse reporting not enabled.
+     */
     void onSingleTapUp(MotionEvent e);
 
     boolean shouldBackButtonBeMappedToEscape();
@@ -34,4 +37,6 @@ public interface TerminalKeyListener {
 
     boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session);
 
+    boolean onLongPress(MotionEvent event);
+
 }

terminal-view/src/main/res/values/strings.xml

@@ -0,0 +1,5 @@
+<resources>
+  <string name="paste_text">Paste</string>
+  <string name="copy_text">Copy</string>
+  <string name="text_selection_more">More…</string>
+</resources>