Enable x86_64 and bump version code

Remove attempt of icons at popup menu actions
Tweak the IME mode (from password to URI)
2016-08-01 01:47:51 +02:00 · 2016-08-01 00:30:11 +02:00 · 2016-07-31 22:55:54 +02:00 · 2016-07-31 22:28:17 +02:00 · 2016-07-31 22:13:50 +02:00 · 2016-07-31 22:13:24 +02:00
85 changed files with 8571 additions and 10391 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,5 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
+indent_style = space
+indent_size = 4
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@

 # Built application files
 build/
+*.apk
+*.so

 # Crashlytics configuations
 com_crashlytics_export_strings.xml
@@ -29,6 +31,7 @@ local.properties
 .idea/modules.xml
 .idea/scopes/scope_settings.xml
 .idea/vcs.xml
+.idea/dictionaries/
 *.iml

 # OS-specific files
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value />
+        </option>
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+            <emptyLine />
+          </value>
+        </option>
+        <option name="RIGHT_MARGIN" value="100" />
+        <AndroidXmlCodeStyleSettings>
+          <option name="USE_CUSTOM_SETTINGS" value="true" />
+        </AndroidXmlCodeStyleSettings>
+        <Objective-C-extensions>
+          <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
+          <option name="RELEASE_STYLE" value="IVAR" />
+          <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
+          <file>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+          </file>
+          <class>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+          </class>
+          <extensions>
+            <pair source="cpp" header="h" />
+            <pair source="c" header="h" />
+          </extensions>
+        </Objective-C-extensions>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="XML">
+          <option name="FORCE_REARRANGE_MODE" value="1" />
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          </indentOptions>
+          <arrangement>
+            <rules>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:android</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:id</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:name</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>name</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>style</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>.*</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+            </rules>
+          </arrangement>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,15 +3,21 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
+        <option name="disableWrapperSourceDistributionNotification" value="true" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
+        <option name="myModules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
      </GradleProjectSettings>
    </option>
  </component>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,71 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintLogConditional" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AndroidLintNegativeMargin" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AssignmentUsedAsCondition" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="DeprecatedAPI" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateSwitchCase" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_reportEmptyBlocks" value="true" />
+    </inspection_tool>
+    <inspection_tool class="EndlessLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualityInConditionalOperator" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Finalize" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreTrivialFinalizers" value="true" />
+    </inspection_tool>
+    <inspection_tool class="FinalizeNotProtected" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="FormatSpecifiers" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FunctionImplicitDeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HidesUpperScope" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HidingNonVirtualFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ImplicitIntegerAndEnumConversion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ImplicitPointerAndIntegerConversion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompatibleEnums" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompatibleInitializers" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompatiblePointers" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InstanceofChain" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreInstanceofOnLibraryClasses" value="false" />
+    </inspection_tool>
+    <inspection_tool class="KRUnspecifiedParameters" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LocalValueEscapesScope" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+    </inspection_tool>
+    <inspection_tool class="MissingReturn" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MissingSwitchCase" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NotImplementedFunctions" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NotInitializedVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NotSuperclass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCDFAInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCLoopDoesntUseConditionVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCSimplifyInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCUnusedGlobalDeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCUnusedMacroInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCUnusedStructInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCUnusedTemplateParameterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OnDemandImport" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PrivateMemberAccessBetweenOuterAndInnerClass" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ResourceNotFoundInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SamePackageImport" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SignednessMismatch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_ignoreJavadoc" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnreachableCode" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedExpressionResult" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedImportStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedLocalization" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedParameter" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ValueMayNotFitIntoReceiver" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="VariableNotUsedInsideIf" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
-language: android
 sudo: false
+language: android
+jdk: oraclejdk8

 env:
  global:
@@ -11,9 +12,9 @@ android:
  components:
    - platform-tools
    - tools
-    - build-tools-23.0.1
-    - android-23
-    - sys-img-x86-android-23
+    - build-tools-24.0.1
+    - android-24
+    - extra-android-m2repository

 script:
  - ./gradlew testDebugUnitTest
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 Termux app
 ==========
 [![Travis build status](https://travis-ci.org/termux/termux-app.svg?branch=master)](https://travis-ci.org/termux/termux-app)
+[![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)


 Termux is an Android terminal app and Linux environment.
@@ -19,7 +20,7 @@ Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html). Conta

 Building JNI libraries
 ======================
-For ease of use, the JNI libraries are checked into version control. Execute the `build-jnilibs.sh` script to rebuild them.
+Execute the `build-jnilibs.sh` script to build the required JNI libraries.

 Terminal resources
 ==================
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,44 +1,33 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"

-    sourceSets {
-	    main {
-		    jni.srcDirs = []
-	    }
+    dependencies {
+        compile 'com.android.support:support-annotations:24.1.1'
+        compile "com.android.support:support-v4:24.1.1"
    }

    defaultConfig {
        applicationId "com.termux"
        minSdkVersion 21
-        targetSdkVersion 22
-        versionCode 19
-        versionName "0.19"
-    }
+        targetSdkVersion 24
+        versionCode 36
+        versionName "0.35"

-    signingConfigs {
-	release {
-	    if (System.getenv("TRAVIS")) {
-		    storeFile rootProject.file('travis.keystore')
-		    storePassword 'abcdef'
-		    keyAlias 'travis'
-		    keyPassword 'abcdef'
-	    } else {
-		    storeFile new File(TERMUX_KEYSTORE_FILE)
-		    storePassword TERMUX_KEYSTORE_PASSWORD
-		    keyAlias TERMUX_KEYSTORE_ALIAS
-		    keyPassword TERMUX_KEYSTORE_PASSWORD
-	    }
+        ndk {
+            moduleName "libtermux"
+            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            cFlags "-std=c11 -Wall -Wextra -Os -fno-stack-protector -nostdlib -Wl,--gc-sections"
        }
    }

    buildTypes {
        release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-	    signingConfig signingConfigs.release
        }
    }
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@

    <application
        android:allowBackup="true"
+        android:fullBackupContent="@xml/backupscheme"
        android:icon="@drawable/ic_launcher"
        android:banner="@drawable/banner"
        android:label="@string/application_name"
@@ -38,32 +39,50 @@
        <activity
            android:name="com.termux.app.TermuxHelpActivity"
            android:exported="false"
-            android:label="@string/application_help" />
+            android:theme="@android:style/Theme.Material.Light.DarkActionBar"
+            android:parentActivityName=".app.TermuxActivity"
+            android:label="@string/application_name" />

        <activity
-            android:name="com.termux.filepicker.TermuxFilePickerActivity"
+            android:name="com.termux.filepicker.TermuxFileReceiverActivity"
            android:label="@string/application_name"
-            android:theme="@android:style/Theme.Material"
+            android:taskAffinity="com.termux.filereceiver"
+            android:excludeFromRecents="true"
            android:noHistory="true">
+            <!-- Accept multiple file types when sending. -->
            <intent-filter>
-                <!--
-                  http://stackoverflow.com/questions/6486716/using-intent-action-pick-for-specific-path
-                  "That said, you should consider ACTION_PICK deprecated. The modern action is ACTION_GET_CONTENT
-                  which is much better supported; you will find support of ACTION_PICK spotty and inconsistent.
-                  Unfortunately ACTION_GET_CONTENT also does not let you specify a directory."
-                -->
-                <action android:name="android.intent.action.GET_CONTENT" />
+                <action android:name="android.intent.action.SEND"/>
                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.OPENABLE" />
-                <data android:mimeType="*/*" />
+                <data android:mimeType="application/*" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="message/*" />
+                <data android:mimeType="multipart/*" />
+                <data android:mimeType="text/*" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <!-- Be more restrictive for viewing files, restricting ourselves to text files. -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/*" />
+                <data android:mimeType="application/json" />
+                <data android:mimeType="application/*xml*" />
+                <data android:mimeType="application/*latex*" />
+                <data android:mimeType="application/javascript" />
            </intent-filter>
        </activity>

-        <provider android:authorities="com.termux.filepicker.provider"
-            android:readPermission="com.termux.filepickder.READ"
-            android:exported="true"
+        <provider
+            android:name=".filepicker.TermuxDocumentsProvider"
+            android:authorities="com.termux.documents"
            android:grantUriPermissions="true"
-            android:name="com.termux.filepicker.TermuxFilePickerProvider" />
+            android:exported="true"
+            android:permission="android.permission.MANAGE_DOCUMENTS">
+            <intent-filter>
+                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+            </intent-filter>
+        </provider>

        <service
            android:name="com.termux.app.TermuxService"
--- a/app/src/main/assets/help.html
+++ b/app/src/main/assets/help.html
@@ -1,229 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, user-scalable=no" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>Termux Help</title>
-
-    <style>
-	html { font-family: 'sans-serif-light', sans-serif; height: 100%; margin: auto; padding: 0; color: black; background-color: white; }
-	.page { max-width: 820px; margin: auto; padding: 0 1em; }
-	body { margin-left: auto; margin-right: auto; margin-top: 0; padding: 0; width: 100%; }
-	p { font-size: 16px; line-height: 1.3em; }
-	ul.index { padding-left: 0; }
-	.index li { list-style-type: none;  line-height: 1.8em; }
-	dt { margin-left: 1em; list-style-type: bullet; }
-	a, a:visited { color: #0000EE }
-    </style>
-  </head>
-  <body>
-    <div class="page help">
-      <h1 id="index">Termux Help</h1>
-
-      <ul class="index">
-      <li><a href="#introduction">Introduction</a></li>
-      <li><a href="#user_interface">User interface</a></li>
-      <li><a href="#touch_keyboard">Using a touch keyboard</a></li>
-      <li><a href="#hardware_keyboard">Using a hardware keyboard</a></li>
-      <li><a href="#package_management">Package management</a></li>
-      <li><a href="#text_editing">Text editing</a></li>
-      <li><a href="#using_ssh">Using SSH</a></li>
-      <li><a href="#interactive_shells">Interactive shells</a></li>
-      <li><a href="#termux_android">Termux and Android</a></li>
-      <li><a href="#add_on_api">Add-on: API</a></li>
-      <li><a href="#add_on_float">Add-on: Float</a></li>
-      <li><a href="#add_on_styling">Add-on: Styling</a></li>
-      <li><a href="#add_on_widget">Add-on: Widget</a></li>
-      <li><a href="#source_and_licenses">Source and licenses</a>
-      </ul>
-
-     <h2 id="introduction">Introduction</h2>
-     <p>Termux is a terminal emulator for Android combined with a collection of packages for command line software. This help
-     explains both the terminal interface and the packaging tool available from inside the terminal.</p>
-     <p>Want to ask a question, report a bug or have an idea for a new package or feature?
-     Visit the <a href="https://plus.google.com/communities/101692629528551299417">Google+ Termux Community</a>!</p>
-
-     <h2 id="user_interface">User interface</h2>
-     <p>At launch Termux shows a terminal interface, whose text size can be adjusted by pinch zooming or double tapping
-     and pulling the content towards or from you.</p>
-     <p>Besides the terminal (with keyboard shortcuts explained below) there are three additional interface elements available:
-     A <strong>context menu</strong>, <strong>navigation drawer</strong>
-     and <strong>notification</strong>.</p>
-     <p>The <strong>context menu</strong> can be shown by long pressing anywhere on the terminal. It provides menu entries for:</p>
-     <ul>
-     	<li>Selecting and pasting text.</li>
-     	<li>Sharing text from the terminal to other apps (e.g. email or SMS)</li>
-	<li>Resetting the terminal if it gets stuck.</li>
-	<li>Switching the terminal to full-screen.</li>
-     	<li>Hangup (exiting the current terminal session).</li>
-     	<li>Styling the terminal by selecting a font and a color scheme.</li>
-     	<li>Showing this help page.</li>
-     </ul>
-     <p>The <strong>navigation drawer</strong> is revealed by swiping from the left part of the screen. It has three
-     elements:</p>
-     <ul>
-	<li>A list of sessions. Clicking on a session shows it in the terminal while long pressing allows you to specify a session title.</li>
-     	<li>A button to toggle visibility of the touch keyboard.</li>
-	<li>A button to create new terminal sessions (long press for creating a named session or a fail-safe one).</li>
-     </ul>
-     <p>The <strong>notification</strong>, available when a terminal session is running, is available by pulling down the notification menu.
-     Pressing the notification leads to the most current terminal session. The notification may also be expanded
-     (by pinch-zooming or performing a single-finger glide) to expose three actions:</p>
-     <ul>
-     	<li>Exiting all running terminal sessions.</li>
-	<li>Use a wake lock to avoid entering sleep mode.</li>
-	<li>Use a high performance wifi lock to maximize wifi performance.</li>
-     </ul>
-     <p>With a wake or wifi lock held the notification and Termux background processes will be available even if no terminal
-     session is running, which allows server and other background processes to run more reliably.</p>
- 
-     <h2 id="touch_keyboard">Using a touch keyboard</h2>
-     <p>Using the Ctrl key is necessary for working with a terminal - but most touch keyboards
-     does not include one. For that purpose Termux uses the <em>Volume down</em> button to emulate
-     the Ctrl key. For example, pressing <em>Volume down+L</em> on a touch keyboard sends the same input as
-     pressing <em>Ctrl+L</em> on a hardware keyboard. The result of using Ctrl in combination
-     with a key depends on which program is used, but for many command line tools the following
-     shortcuts works:</p>
-     <ul>
-     	<li>Ctrl+A → Move cursor to the beginning of line.</li>
-     	<li>Ctrl+C → Abort (send SIGINT to) current process.</li>
-     	<li>Ctrl+D → Logout of a terminal session.</li>
-     	<li>Ctrl+E → Move cursor to the end of line.</li>
-     	<li>Ctrl+K → Delete from cursor to the end of line.</li>
-     	<li>Ctrl+L → Clear the terminal.</li>
-     	<li>Ctrl+Z → Suspend (send SIGTSTP to) current process.</li>
-     </ul>
-     <p>The <em>Volume up</em> key also serves as a special key to produce certain input:</p>
-     <ul>
-     	<li>Volume Up+L → | (the pipe character).</li>
-     	<li>Volume Up+E → Escape key.</li>
-     	<li>Volume Up+T → Tab key.</li>
-     	<li>Volume Up+1 → F1 (and Volume Up+2 → F2, etc).</li>
-     	<li>Volume Up+B → Alt+B, back a word when using readline.</li>
-     	<li>Volume Up+F → Alt+F, forward a word when using readline.</li>
-     	<li>Volume Up+W → Up arrow key.</li>
-     	<li>Volume Up+A → Left arrow key.</li>
-     	<li>Volume Up+S → Down arrow key.</li>
-     	<li>Volume Up+D → Right arrow key.</li>
-     </ul>
-
-     <h2 id="hardware_keyboard">Using a hardware keyboard</h2>
-     <p>The following shortcuts are available when using Termux with a hardware (e.g. bluetooth) keyboard by combining them with <em>Ctrl+Shift</em>:</p>
-     <ul>
-     	<li>'C' → Create new session</li>
-     	<li>'R' → Rename current session</li>
-     	<li>Down arrow (or 'N') → Next session</li>
-	<li>Up arrow (or 'P') → Previous session</li>
-	<li>Right arrow → Open drawer</li>
-	<li>Left arrow → Close drawer</li>
-	<li>'F' → Toggle full screen</li>
-	<li>'M' → Show menu</li>
-	<li>'V' → Paste</li>
-	<li>+/- → Adjust text size</li>
-	<li>1-9 → Go to numbered session</li>
-     </ul>
-
-     <h2 id="package_management">Package management</h2>
-     <p>A minimal base system consisting of the Apt package manager and the busybox collection of system utilities
-     is installed when first starting Termux. Additional packages are available using the apt command:</p>
-     <dl>
-       <dt>apt update</dt><dd>Updates the list of available packages. This commands needs to be run initially directly after installation
-       and regularly afterwards to receive updates.</dd>
-       <dt>apt search &lt;query&gt;</dt><dd>Search among available packages.</dd>
-       <dt>apt install &lt;package&gt;</dt><dd>Install a new package.</dd>
-       <dt>apt upgrade</dt><dd>Upgrade outdated packages. For Apt to know about newer packages you will need to update the package index, so you will normally want to run <em>apt update</em> before upgrading.</dd>
-       <dt>apt show &lt;package&gt;</dt><dd>Show information about a package.</dd>
-       <dt>apt list</dt><dd>List all available packages.</dd>
-       <dt>apt list --installed</dt><dd>List all installed packages.</dd>
-       <dt>apt remove &lt;package&gt;</dt><dd>Remove an installed package.</dd>
-     </dl>
-
-     <p>Apt as a package manager uses a package format named <em>dpkg</em>. Normally direct use of dpkg is not necessary, but the
-     following two commands may be of use:</p>
-     <dl>
-     	<dt>dpkg -L &lt;package&gt;</dt>
-	<dd>List installed files of a package.</dd>
-     	<dt>dpkg --verify</dt>
-	<dd>Verify the integrity of installed packages.</dd>
-     </dl>
-     <p>View the apt manual page (execute <em>apt install man</em> to install a man page viewer first) for more information.</p>
-
-     <h2 id="text_editing">Text editing</h2>
-     <p>By default the busybox version of <em>vi</em> is available. This is a barebone and somewhat unfriendly editor -
-     install <a href="http://www.nano-editor.org/dist/v2.2/nano.html">nano</a> for a more straight-forward editor and
-     <a href="http://vimdoc.sourceforge.net/htmldoc/usr_toc.html">vim</a> for a more powerful one.</p>
-
-     <h2 id="using_ssh">Using SSH</h2>
-     <p>By installing the <strong>openssh</strong> package (by executing <em>apt install openssh</em>) you may SSH into remote systems,
-     optionally putting private keys or configuration under $HOME/.ssh/.</p>
-     <p>If you wish to use an SSH agent to avoid entering passwords, the Termux openssh package provides
-     a wrapper script named <strong>ssha</strong> (note the 'a' at the end) for ssh which:</p>
-     <ol>
-     	<li>Starts the ssh agent if necessary (or connect to it if already running).</li>
-     	<li>Runs <strong>ssh-add</strong> if necessary.</li>
-	<li>Runs <strong>ssh</strong> with the provided arguments.</li>
-     </ol>
-     <p>This means that the agent will prompt for a key password at first run, but remember the authorization for subsequent ones.</p>
-
-     <h2 id="interactive_shells">Interactive shells</h2>
-     <p>The base system that is installed when first starting Termux uses the <em>bash</em> shell while zsh is available as
-     an installable alternative:</p>
-     <ul>
-       <li>bash - the default shell on most Linux distributions, with resources such as
-       <a href="http://www.tldp.org/LDP/Bash-Beginners-Guide/html/">Bash Guide for Beginners</a>,
-       the <a href="https://www.gnu.org/software/bash/manual/bash.html">Bash Reference Manual</a>
-       or the <a href="http://www.tldp.org/LDP/abs/html/">Advanced Bash-Scripting Guide</a> available.</li>
-       <li>zsh - a powerful shell with information available at
-       <a href="http://zsh.sourceforge.net/Guide/zshguide.html">A User's Guide to the Z-Shell</a>, the
-       <a href="http://zsh.sourceforge.net/Doc/Release/zsh_toc.html">Z Shell Manual</a> or
-       <a href="http://www.rayninfo.co.uk/tips/zshtips.html">ZSH Tips by ZZapper</a>.
-       After installing zsh through <em>apt install zsh</em>, execute <em>chsh -s zsh</em> to set it as the default login shell when starting Termux
-       (and change back with <em>chsh -s bash</em> if necessary).</li>
-     </ul>
-
-     <h2 id="termux_android">Termux and Android</h2>
-     <p>Termux is designed to cope with the restrictions of running as an ordinary Android app without requiring root, which
-     leads to several differences between Termux and a traditional desktop system. The file system layout is drastically different:</p>
-     <ul>
-       <li>Common folders such as /bin, /usr/, /var and /etc does not exist.</li>
-       <li>The Android system provides a basic non-standard file system hierarchy, where e.g. /system/bin contains some system binaries.</li>
-       <li>The user folder $HOME is inside the private file area exposed to Termux as an ordinary Android app.
-       Uninstalling Termux will cause this file area to be wiped - so save important files outside this area such as in /sdcard
-       or use a version control system such as <em>git</em>.</li>
-       <li>Termux installs its packages in a folder exposed through the $PREFIX environment variable (with e.g. binaries in $PREFIX/bin,
-       and configuration in $PREFIX/etc).</li>
-       <li>Shared libraries are installed in $PREFIX/lib, which are available from binaries due to Termux setting the $LD_LIBRARY_PATH
-       environment variable. These may clash with Android system binaries in /system/bin, which may force LD_LIBRARY_PATH to be
-       cleared before running system binaries.</li>
-     </ul>
-     <p>Besides the file system being different, Termux is running as a single-user system without root - each Android app is running as
-     its own Linux user, so running commands inside Termux may not interfere with other installed applications.</p>
-     <p>Running as non-root implies that ports below 1024 cannot be bound to. Many packages have been configured to have compatible
-     default values - the ftpd, httpd, and sshd servers default to 8021, 8080 and 8022, respectively.</p>
-
-     <h2 id="add_on_api">Add-on: API</h2>
-     <p>The API add-on exposes Android system functionality such as SMS messages, GPS location or the Text-to-speech functionality through command line tools.</p>
-     <ul><li><a href="http://play.google.com/store/apps/details?id=com.termux.api">See more and install from Google Play</a></li></ul>
-
-     <h2 id="add_on_float">Add-on: Float</h2>
-     <p>The Float add-on consists of a floating terminal window visible while running other apps.</p>
-     <ul><li><a href="http://play.google.com/store/apps/details?id=com.termux.window">See more and install from Google Play</a></li></ul>
-
-     <h2 id="add_on_styling">Add-on: Styling</h2>
-     <p>The Styling add-on provides color schemes and fonts to beabeautify and customize the appearance of the Termux terminal.</p>
-     <ul><li><a href="http://play.google.com/store/apps/details?id=com.termux.styling">See more and install from Google Play</a></li></ul>
-
-     <h2 id="add_on_widget">Add-on: Widget</h2>
-     <p>The Widget add-on brings a widget to your homescreen, providing links to run scripts in your $HOME/.shortcuts/ folder.</p>
-     <ul><li><a href="http://play.google.com/store/apps/details?id=com.termux.widget">See more and install from Google Play</a></li></ul>
-
-     <h2 id="source_and_licenses">Source and licenses</h2>
-     <p>Termux uses terminal emulation code from <a href="https://github.com/jackpal/Android-Terminal-Emulator">Terminal Emulator for Android</a>
-     which is under the <a href="https://raw.githubusercontent.com/jackpal/Android-Terminal-Emulator/master/NOTICE">Apache License, Version 2.0</a>.
-     Packages available through Termux are distributed under their respective licenses with scripts and patches used to build them
-     <a href="https://github.com/termux/termux-packages">available on github</a>.</p>
-
-    </div>
-  </body>
-</html>
--- a/app/src/main/java/com/termux/app/BackgroundJob.java
+++ b/app/src/main/java/com/termux/app/BackgroundJob.java
@@ -0,0 +1,112 @@
+package com.termux.app;
+
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * A background job launched by Termux.
+ */
+public final class BackgroundJob {
+
+    private static final String LOG_TAG = "termux-background";
+
+    final Process mProcess;
+
+    public BackgroundJob(File cwd, File fileToExecute, String[] args) throws IOException {
+        String[] env = buildEnvironment(false, cwd.getAbsolutePath());
+
+        String[] progArray = new String[args.length + 1];
+
+        mProcess = Runtime.getRuntime().exec(progArray, env, cwd);
+
+        new Thread() {
+            @Override
+            public void run() {
+                while (true) {
+                    try {
+                        int exitCode = mProcess.waitFor();
+                        if (exitCode == 0) {
+                            Log.i(LOG_TAG, "exited normally");
+                            return;
+                        } else {
+                            Log.i(LOG_TAG, "exited with exit code: " + exitCode);
+                        }
+                    } catch (InterruptedException e) {
+                        // Ignore.
+                    }
+                }
+            }
+        }.start();
+
+        new Thread() {
+            @Override
+            public void run() {
+                InputStream stdout = mProcess.getInputStream();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
+                String line;
+                try {
+                    // FIXME: Long lines.
+                    while ((line = reader.readLine()) != null) {
+                        Log.i(LOG_TAG, line);
+                    }
+                } catch (IOException e) {
+                    // Ignore.
+                }
+            }
+        }.start();
+
+
+        new Thread() {
+            @Override
+            public void run() {
+                InputStream stderr = mProcess.getErrorStream();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stderr, StandardCharsets.UTF_8));
+                String line;
+                try {
+                    // FIXME: Long lines.
+                    while ((line = reader.readLine()) != null) {
+                        Log.e(LOG_TAG, line);
+                    }
+                } catch (IOException e) {
+                    // Ignore.
+                }
+            }
+        };
+    }
+
+    public String[] buildEnvironment(boolean failSafe, String cwd) {
+        new File(TermuxService.HOME_PATH).mkdirs();
+
+        if (cwd == null) cwd = TermuxService.HOME_PATH;
+
+        final String termEnv = "TERM=xterm-256color";
+        final String homeEnv = "HOME=" + TermuxService.HOME_PATH;
+        final String prefixEnv = "PREFIX=" + TermuxService.PREFIX_PATH;
+        final String androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT");
+        final String androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA");
+        // 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");
+            return new String[]{termEnv, homeEnv, prefixEnv, androidRootEnv, androidDataEnv, pathEnv, externalStorageEnv};
+        } else {
+            final String ps1Env = "PS1=$ ";
+            final String ldEnv = "LD_LIBRARY_PATH=" + TermuxService.PREFIX_PATH + "/lib";
+            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;
+
+            return new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv};
+        }
+    }
+
+}
--- a/app/src/main/java/com/termux/app/DialogUtils.java
+++ b/app/src/main/java/com/termux/app/DialogUtils.java
@@ -3,21 +3,44 @@ package com.termux.app;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.text.Selection;
 import android.util.TypedValue;
+import android.view.KeyEvent;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;

-final class DialogUtils {
+import android.R;
+
+public final class DialogUtils {

    public interface TextSetListener {
        void onTextSet(String text);
    }

-	static void textInput(Activity activity, int titleText, int positiveButtonText, String initialText, final TextSetListener onPositive) {
+    public static void textInput(Activity activity, int titleText, String initialText,
+                                 int positiveButtonText, final TextSetListener onPositive,
+                                 int neutralButtonText, final TextSetListener onNeutral,
+                                 int negativeButtonText, final TextSetListener onNegative,
+                                 final DialogInterface.OnDismissListener onDismiss) {
        final EditText input = new EditText(activity);
        input.setSingleLine();
-		if (initialText != null) input.setText(initialText);
+        if (initialText != null) {
+            input.setText(initialText);
+            Selection.setSelection(input.getText(), initialText.length());
+        }
+
+        final AlertDialog[] dialogHolder = new AlertDialog[1];
+        input.setImeActionLabel(activity.getResources().getString(positiveButtonText), KeyEvent.KEYCODE_ENTER);
+        input.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                onPositive.onTextSet(input.getText().toString());
+                dialogHolder[0].dismiss();
+                return true;
+            }
+        });

        float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, activity.getResources().getDisplayMetrics());
        // https://www.google.com/design/spec/components/dialogs.html#dialogs-specs
@@ -27,17 +50,43 @@ final class DialogUtils {
        LinearLayout layout = new LinearLayout(activity);
        layout.setOrientation(LinearLayout.VERTICAL);
        layout.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
-		// layout.setGravity(Gravity.CLIP_VERTICAL);
        layout.setPadding(paddingTopAndSides, paddingTopAndSides, paddingTopAndSides, paddingBottom);
        layout.addView(input);

-		new AlertDialog.Builder(activity).setTitle(titleText).setView(layout).setPositiveButton(positiveButtonText, new DialogInterface.OnClickListener() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+            .setTitle(titleText).setView(layout)
+            .setPositiveButton(positiveButtonText, new DialogInterface.OnClickListener() {
                @Override
                public void onClick(DialogInterface d, int whichButton) {
                    onPositive.onTextSet(input.getText().toString());
                }
-		}).setNegativeButton(android.R.string.cancel, null).show();
-		input.requestFocus();
+            });
+
+        if (onNeutral != null) {
+            builder.setNeutralButton(neutralButtonText, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    onNeutral.onTextSet(input.getText().toString());
+                }
+            });
+        }
+
+        if (onNegative == null) {
+            builder.setNegativeButton(R.string.cancel, null);
+        } else {
+            builder.setNegativeButton(negativeButtonText, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    onNegative.onTextSet(input.getText().toString());
+                }
+            });
+        }
+
+        if (onDismiss != null) builder.setOnDismissListener(onDismiss);
+
+        dialogHolder[0] = builder.create();
+        dialogHolder[0].setCanceledOnTouchOutside(false);
+        dialogHolder[0].show();
    }

 }
--- a/app/src/main/java/com/termux/app/ExtraKeysView.java
+++ b/app/src/main/java/com/termux/app/ExtraKeysView.java
@@ -0,0 +1,177 @@
+package com.termux.app;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.GridLayout;
+import android.widget.ToggleButton;
+
+import com.termux.R;
+import com.termux.terminal.TerminalSession;
+import com.termux.view.TerminalView;
+
+/**
+ * A view showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
+ * keyboard.
+ */
+public final class ExtraKeysView extends GridLayout {
+
+    private static final int TEXT_COLOR = 0xFFFFFFFF;
+
+    public ExtraKeysView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        reload();
+    }
+
+    static void sendKey(View view, String keyName) {
+        int keyCode = 0;
+        String chars = null;
+        switch (keyName) {
+            case "ESC":
+                keyCode = KeyEvent.KEYCODE_ESCAPE;
+                break;
+            case "TAB":
+                keyCode = KeyEvent.KEYCODE_TAB;
+                break;
+            case "▲":
+                keyCode = KeyEvent.KEYCODE_DPAD_UP;
+                break;
+            case "◀":
+                keyCode = KeyEvent.KEYCODE_DPAD_LEFT;
+                break;
+            case "▶":
+                keyCode = KeyEvent.KEYCODE_DPAD_RIGHT;
+                break;
+            case "▼":
+                keyCode = KeyEvent.KEYCODE_DPAD_DOWN;
+                break;
+            case "―":
+                chars = "-";
+                break;
+            default:
+                chars = keyName;
+        }
+
+        if (keyCode > 0) {
+            view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
+            view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyCode));
+        } else {
+            TerminalView terminalView = (TerminalView) view.findViewById(R.id.terminal_view);
+            TerminalSession session = terminalView.getCurrentSession();
+            if (session != null) session.write(chars);
+        }
+    }
+
+    private ToggleButton controlButton;
+    private ToggleButton altButton;
+    private ToggleButton fnButton;
+
+    public boolean readControlButton() {
+        if (controlButton.isPressed()) return true;
+        boolean result = controlButton.isChecked();
+        if (result) {
+            controlButton.setChecked(false);
+            controlButton.setTextColor(TEXT_COLOR);
+        }
+        return result;
+    }
+
+    public boolean readAltButton() {
+        if (altButton.isPressed()) return true;
+        boolean result = altButton.isChecked();
+        if (result) {
+            altButton.setChecked(false);
+            altButton.setTextColor(TEXT_COLOR);
+        }
+        return result;
+    }
+
+    public boolean readFnButton() {
+        if (fnButton.isPressed()) return true;
+        boolean result = fnButton.isChecked();
+        if (result) {
+            fnButton.setChecked(false);
+            fnButton.setTextColor(TEXT_COLOR);
+        }
+        return result;
+    }
+
+    void reload() {
+        altButton = controlButton = null;
+        removeAllViews();
+
+        String[][] buttons = {
+            {"ESC", "CTRL", "ALT", "TAB", "―", "/", "|"}
+        };
+
+        final int rows = buttons.length;
+        final int cols = buttons[0].length;
+
+        setRowCount(rows);
+        setColumnCount(cols);
+
+        for (int row = 0; row < rows; row++) {
+            for (int col = 0; col < cols; col++) {
+                final String buttonText = buttons[row][col];
+
+                Button button;
+                switch (buttonText) {
+                    case "CTRL":
+                        button = controlButton = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                        button.setClickable(true);
+                        break;
+                    case "ALT":
+                        button = altButton = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                        button.setClickable(true);
+                        break;
+                    case "FN":
+                        button = fnButton = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                        button.setClickable(true);
+                        break;
+                    default:
+                        button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                        break;
+                }
+
+                button.setText(buttonText);
+                button.setTextColor(TEXT_COLOR);
+
+                final Button finalButton = button;
+                button.setOnClickListener(new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        View root = getRootView();
+                        switch (buttonText) {
+                            case "CTRL":
+                            case "ALT":
+                            case "FN":
+                                ToggleButton self = (ToggleButton) finalButton;
+                                self.setChecked(self.isChecked());
+                                self.setTextColor(self.isChecked() ? 0xFF80DEEA : TEXT_COLOR);
+                                break;
+                            default:
+                                sendKey(root, buttonText);
+                                break;
+                        }
+                    }
+                });
+
+                GridLayout.LayoutParams param = new GridLayout.LayoutParams();
+                param.height = param.width = 0;
+                param.rightMargin = param.topMargin = 0;
+                param.setGravity(Gravity.LEFT);
+                float weight = "▲▼◀▶".contains(buttonText) ? 0.7f : 1.f;
+                param.columnSpec = GridLayout.spec(col, weight);
+                param.rowSpec = GridLayout.spec(row, 1.f);
+                button.setLayoutParams(param);
+
+                addView(button);
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/termux/app/FullScreenHelper.java
+++ b/app/src/main/java/com/termux/app/FullScreenHelper.java
@@ -1,68 +1,67 @@
 package com.termux.app;

-import android.app.Activity;
-import android.graphics.Rect;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.FrameLayout.LayoutParams;
+
+import com.termux.R;

 /**
- * Utility to make the touch keyboard and immersive mode work with full screen activities.
- * 
+ * Utility to manage full screen immersive mode.
+ * <p/>
 * See https://code.google.com/p/android/issues/detail?id=5497
 */
-final class FullScreenHelper implements ViewTreeObserver.OnGlobalLayoutListener {
+final class FullScreenHelper {

    private boolean mEnabled = false;
-	private final Activity mActivity;
-	private final Rect mWindowRect = new Rect();
+    final TermuxActivity mActivity;

-	public FullScreenHelper(Activity activity) {
+    public FullScreenHelper(TermuxActivity activity) {
        this.mActivity = activity;
    }

    public void setImmersive(boolean enabled) {
-		Window win = mActivity.getWindow();
-
-		if (enabled == mEnabled) {
-			if (!enabled) win.setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-			return;
-		}
+        if (enabled == mEnabled) return;
        mEnabled = enabled;

-		final View childViewOfContent = ((FrameLayout) mActivity.findViewById(android.R.id.content)).getChildAt(0);
+        View decorView = mActivity.getWindow().getDecorView();
+
        if (enabled) {
-			win.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-			setImmersiveMode();
-			childViewOfContent.getViewTreeObserver().addOnGlobalLayoutListener(this);
-		} else {
-			win.setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-			win.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-			childViewOfContent.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-			((LayoutParams) childViewOfContent.getLayoutParams()).height = android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-		}
-	}
-
-	private void setImmersiveMode() {
-		mActivity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
-	}
-
+            decorView.setOnSystemUiVisibilityChangeListener
+                (new View.OnSystemUiVisibilityChangeListener() {
                    @Override
-	public void onGlobalLayout() {
-		final View childViewOfContent = ((FrameLayout) mActivity.findViewById(android.R.id.content)).getChildAt(0);
-
-		if (mEnabled) setImmersiveMode();
-
-		childViewOfContent.getWindowVisibleDisplayFrame(mWindowRect);
-		int usableHeightNow = Math.min(mWindowRect.height(), childViewOfContent.getRootView().getHeight());
-		FrameLayout.LayoutParams layout = (LayoutParams) childViewOfContent.getLayoutParams();
-		if (layout.height != usableHeightNow) {
-			layout.height = usableHeightNow;
-			childViewOfContent.requestLayout();
+                    public void onSystemUiVisibilityChange(int visibility) {
+                        if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
+                            if (mActivity.mSettings.isShowExtraKeys()) {
+                                mActivity.findViewById(R.id.viewpager).setVisibility(View.VISIBLE);
+                            }
+                            setImmersiveMode();
+                        } else {
+                            mActivity.findViewById(R.id.viewpager).setVisibility(View.GONE);
+                        }
+                    }
+                });
+            setImmersiveMode();
+        } else {
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+            decorView.setOnSystemUiVisibilityChangeListener(null);
        }
    }

+    private static boolean isColorLight(int color) {
+        double darkness = 1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255;
+        return darkness < 0.5;
+    }
+
+    void setImmersiveMode() {
+        int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+            | View.SYSTEM_UI_FLAG_FULLSCREEN;
+        int color = ((ColorDrawable) mActivity.getWindow().getDecorView().getBackground()).getColor();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isColorLight(color))
+            flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+        mActivity.getWindow().getDecorView().setSystemUiVisibility(flags);
+    }
+
 }
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -1,19 +1,8 @@
 package com.termux.app;

-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.termux.R;
-import com.termux.drawer.DrawerLayout;
-import com.termux.terminal.TerminalSession;
-import com.termux.terminal.TerminalSession.SessionChangedCallback;
-import com.termux.view.TerminalKeyListener;
-import com.termux.view.TerminalView;
-
+import android.Manifest;
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
@@ -27,18 +16,27 @@ import android.content.DialogInterface.OnShowListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.content.res.Resources;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
+import android.media.AudioAttributes;
+import android.media.SoundPool;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Vibrator;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v4.widget.DrawerLayout;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -46,10 +44,8 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -58,13 +54,32 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;

+import com.termux.R;
+import com.termux.terminal.EmulatorDebug;
+import com.termux.terminal.TerminalColors;
+import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TerminalSession.SessionChangedCallback;
+import com.termux.terminal.TextStyle;
+import com.termux.view.TerminalView;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
 * A terminal emulator activity.
- * 
+ * <p/>
 * See
 * <ul>
 * <li>http://www.mongrel-phones.com.au/default/how_to_make_a_local_service_and_bind_to_it_in_android</li>
@@ -74,7 +89,8 @@ import android.widget.Toast;
 */
 public final class TermuxActivity extends Activity implements ServiceConnection {

-	private static final int CONTEXTMENU_SELECT_ID = 0;
+    private static final int CONTEXTMENU_SELECT_URL_ID = 0;
+    private static final int CONTEXTMENU_SHARE_TRANSCRIPT_ID = 1;
    private static final int CONTEXTMENU_PASTE_ID = 3;
    private static final int CONTEXTMENU_KILL_PROCESS_ID = 4;
    private static final int CONTEXTMENU_RESET_TERMINAL_ID = 5;
@@ -84,11 +100,17 @@ public final class TermuxActivity extends Activity implements ServiceConnection

    private static final int MAX_SESSIONS = 8;

+    private static final int REQUESTCODE_PERMISSION_STORAGE = 1234;
+
    private static final String RELOAD_STYLE_ACTION = "com.termux.app.reload_style";

-	/** The main view of the activity showing the terminal. */
+    /** The main view of the activity showing the terminal. Initialized in onCreate(). */
+    @SuppressWarnings("NullableProblems")
+    @NonNull
    TerminalView mTerminalView;

+    ExtraKeysView mExtraKeysView;
+
    final FullScreenHelper mFullScreenHelper = new FullScreenHelper(this);

    TermuxPreferences mSettings;
@@ -112,162 +134,169 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     */
    boolean mIsVisible;

+    final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
+        new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+            .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
+    int mBellSoundId;
+
    private final BroadcastReceiver mBroadcastReceiever = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            if (mIsVisible) {
                String whatToReload = intent.getStringExtra(RELOAD_STYLE_ACTION);
-				if (whatToReload == null || "colors".equals(whatToReload)) mTerminalView.checkForColors();
-				if (whatToReload == null || "font".equals(whatToReload)) mTerminalView.checkForTypeface();
+                if ("storage".equals(whatToReload)) {
+                    if (ensureStoragePermissionGranted())
+                        TermuxInstaller.setupStorageSymlinks(TermuxActivity.this);
+                    return;
+                }
+                checkForFontAndColors();
+                mSettings.reloadFromProperties(TermuxActivity.this);
            }
        }
    };

+    void checkForFontAndColors() {
+        try {
+            // Hard-coded paths since this file is used also in Termux:Float.
+            @SuppressLint("SdCardPath") File fontFile = new File("/data/data/com.termux/files/home/.termux/font.ttf");
+            @SuppressLint("SdCardPath") File colorsFile = new File("/data/data/com.termux/files/home/.termux/colors.properties");
+
+            final Properties props = new Properties();
+            if (colorsFile.isFile()) {
+                try (InputStream in = new FileInputStream(colorsFile)) {
+                    props.load(in);
+                }
+            }
+
+            TerminalColors.COLOR_SCHEME.updateWith(props);
+            TerminalSession session = getCurrentTermSession();
+            if (session != null && session.getEmulator() != null) {
+                session.getEmulator().mColors.reset();
+            }
+            updateBackgroundColor();
+
+            final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
+            mTerminalView.setTypeface(newTypeface);
+        } catch (Exception e) {
+            Log.e(EmulatorDebug.LOG_TAG, "Error in checkForFontAndColors()", e);
+        }
+    }
+
+    void updateBackgroundColor() {
+        TerminalSession session = getCurrentTermSession();
+        if (session != null && session.getEmulator() != null) {
+            getWindow().getDecorView().setBackgroundColor(session.getEmulator().mColors.mCurrentColors[TextStyle.COLOR_INDEX_BACKGROUND]);
+        }
+    }
+
+    /** For processes to access shared internal storage (/sdcard) we need this permission. */
+    @TargetApi(Build.VERSION_CODES.M)
+    public boolean ensureStoragePermissionGranted() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                return true;
+            } else {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUESTCODE_PERMISSION_STORAGE);
+                return false;
+            }
+        } else {
+            // Always granted before Android 6.0.
+            return true;
+        }
+    }
+
    @Override
    public void onCreate(Bundle bundle) {
        super.onCreate(bundle);

-		// Prevent overdraw:
-		getWindow().getDecorView().setBackground(null);
+        mSettings = new TermuxPreferences(this);

        setContentView(R.layout.drawer_layout);
        mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
-		mSettings = new TermuxPreferences(this);
+        mTerminalView.setOnKeyListener(new TermuxKeyListener(this));
+
        mTerminalView.setTextSize(mSettings.getFontSize());
        mFullScreenHelper.setImmersive(mSettings.isFullScreen());
        mTerminalView.requestFocus();

-		OnKeyListener keyListener = new OnKeyListener() {
+        final ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
+        if (mSettings.isShowExtraKeys()) viewPager.setVisibility(View.VISIBLE);
+
+        viewPager.setAdapter(new PagerAdapter() {
            @Override
-			public boolean onKey(View v, int keyCode, KeyEvent event) {
-				if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
+            public int getCount() {
+                return 2;
+            }

-				final TerminalSession currentSession = getCurrentTermSession();
+            @Override
+            public boolean isViewFromObject(View view, Object object) {
+                return view == object;
+            }

-				if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
-					// Return pressed with finished session - remove it.
-					currentSession.finishIfRunning();
-
-					int index = mTermService.removeTermSession(currentSession);
-					mListViewAdapter.notifyDataSetChanged();
-					if (mTermService.getSessions().isEmpty()) {
-						// There are no sessions to show, so finish the activity.
-						finish();
+            @Override
+            public Object instantiateItem(ViewGroup collection, int position) {
+                LayoutInflater inflater = LayoutInflater.from(TermuxActivity.this);
+                View layout;
+                if (position == 0) {
+                    layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false);
                } else {
-						if (index >= mTermService.getSessions().size()) {
-							index = mTermService.getSessions().size() - 1;
-						}
-						switchToSession(mTermService.getSessions().get(index));
-					}
-					return true;
-				} else if (!(event.isCtrlPressed() && event.isShiftPressed())) {
-					// Only hook shortcuts with Ctrl+Shift down.
-					return false;
-				}
-
-				// Get the unmodified code point:
-				int unicodeChar = event.getUnicodeChar(0);
-
-				if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || unicodeChar == 'n'/* next */) {
-					int index = mTermService.getSessions().indexOf(currentSession);
-					if (++index >= mTermService.getSessions().size()) index = 0;
-					switchToSession(mTermService.getSessions().get(index));
-				} else if (keyCode == KeyEvent.KEYCODE_DPAD_UP || unicodeChar == 'p' /* previous */) {
-					int index = mTermService.getSessions().indexOf(currentSession);
-					if (--index < 0) index = mTermService.getSessions().size() - 1;
-					switchToSession(mTermService.getSessions().get(index));
-				} else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
-					getDrawer().openDrawer(Gravity.START);
-				} else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
-					getDrawer().closeDrawers();
-				} else if (unicodeChar == 'f'/* full screen */) {
-					toggleImmersive();
-				} else if (unicodeChar == 'm'/* menu */) {
-					mTerminalView.showContextMenu();
-				} else if (unicodeChar == 'r'/* rename */) {
-					renameSession(currentSession);
-				} else if (unicodeChar == 'c'/* create */) {
-					addNewSession(false, null);
-				} else if (unicodeChar == 'u' /* urls */) {
-					showUrlSelection();
-				} else if (unicodeChar == 'v') {
-					doPaste();
-				} else if (unicodeChar == '+' || event.getUnicodeChar(KeyEvent.META_SHIFT_ON) == '+') {
-					// We also check for the shifted char here since shift may be required to produce '+',
-					// see https://github.com/termux/termux-api/issues/2
-					changeFontSize(true);
-				} else if (unicodeChar == '-') {
-					changeFontSize(false);
-				} else if (unicodeChar >= '1' && unicodeChar <= '9') {
-					int num = unicodeChar - '1';
-					if (mTermService.getSessions().size() > num) switchToSession(mTermService.getSessions().get(num));
-				}
+                    layout = inflater.inflate(R.layout.extra_keys_right, collection, false);
+                    final EditText editText = (EditText) layout.findViewById(R.id.text_input);
+                    editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+                        @Override
+                        public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                            String s = editText.getText().toString() + "\n";
+                            getCurrentTermSession().write(s);
+                            editText.setText("");
                            return true;
                        }
-		};
-		mTerminalView.setOnKeyListener(keyListener);
-		findViewById(R.id.left_drawer_list).setOnKeyListener(keyListener);
-
-		mTerminalView.setOnKeyListener(new TerminalKeyListener() {
-			@Override
-			public float onScale(float scale) {
-				if (scale < 0.9f || scale > 1.1f) {
-					boolean increase = scale > 1.f;
-					changeFontSize(increase);
-					return 1.0f;
+                    });
                }
-				return scale;
+                collection.addView(layout);
+                return layout;
            }

            @Override
-			public void onLongPress(MotionEvent event) {
-				mTerminalView.showContextMenu();
+            public void destroyItem(ViewGroup collection, int position, Object view) {
+                collection.removeView((View) view);
            }
-
-			@Override
-			public void onSingleTapUp(MotionEvent e) {
-				// Toggle keyboard visibility if tapping with a finger:
-				InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-				imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
-			}
-
        });

-		findViewById(R.id.new_session_button).setOnClickListener(new OnClickListener() {
+        viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 0) {
+                    mTerminalView.requestFocus();
+                } else {
+                    final EditText editText = (EditText) viewPager.findViewById(R.id.text_input);
+                    if (editText != null) editText.requestFocus();
+                }
+            }
+        });
+
+        View newSessionButton = findViewById(R.id.new_session_button);
+        newSessionButton.setOnClickListener(new OnClickListener() {
            @Override
            public void onClick(View v) {
                addNewSession(false, null);
            }
        });
-
-		findViewById(R.id.new_session_button).setOnLongClickListener(new OnLongClickListener() {
+        newSessionButton.setOnLongClickListener(new OnLongClickListener() {
            @Override
            public boolean onLongClick(View v) {
-				Resources res = getResources();
-				new AlertDialog.Builder(TermuxActivity.this).setTitle(R.string.new_session)
-						.setItems(new String[] { res.getString(R.string.new_session_normal_unnamed), res.getString(R.string.new_session_normal_named),
-								res.getString(R.string.new_session_failsafe) }, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						switch (which) {
-						case 0:
-							addNewSession(false, null);
-							break;
-						case 1:
-							DialogUtils.textInput(TermuxActivity.this, R.string.session_new_named_title, R.string.session_new_named_positive_button, null,
+                DialogUtils.textInput(TermuxActivity.this, R.string.session_new_named_title, null, R.string.session_new_named_positive_button,
                    new DialogUtils.TextSetListener() {
                        @Override
                        public void onTextSet(String text) {
                            addNewSession(false, text);
                        }
-							});
-							break;
-						case 2:
-							addNewSession(true, null);
-							break;
+                    }, R.string.new_session_failsafe, new DialogUtils.TextSetListener() {
+                        @Override
+                        public void onTextSet(String text) {
+                            addNewSession(true, text);
                        }
                    }
-				}).show();
+                    , -1, null, null);
                return true;
            }
        });
@@ -281,15 +310,35 @@ public final class TermuxActivity extends Activity implements ServiceConnection
            }
        });

+        findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(new OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                toggleShowExtraKeys();
+                return true;
+            }
+        });
+
        registerForContextMenu(mTerminalView);

        Intent serviceIntent = new Intent(this, TermuxService.class);
        // Start the service and make it run regardless of who is bound to it:
        startService(serviceIntent);
-		if (!bindService(serviceIntent, this, 0)) throw new RuntimeException("bindService() failed");
+        if (!bindService(serviceIntent, this, 0))
+            throw new RuntimeException("bindService() failed");

-		mTerminalView.checkForTypeface();
-		mTerminalView.checkForColors();
+        checkForFontAndColors();
+
+        mBellSoundId = mBellSoundPool.load(this, R.raw.bell, 1);
+    }
+
+    void toggleShowExtraKeys() {
+        final ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
+        final boolean showNow = mSettings.toggleShowExtraKeys(TermuxActivity.this);
+        viewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
+        if (showNow && viewPager.getCurrentItem() == 1) {
+            // Focus the text input view if just revealed.
+            findViewById(R.id.text_input).requestFocus();
+        }
    }

    /**
@@ -331,7 +380,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                    // Show toast for non-current sessions that exit.
                    int indexOfSession = mTermService.getSessions().indexOf(finishedSession);
                    // Verify that session was not removed before we got told about it finishing:
-					if (indexOfSession >= 0) showToast(toToastTitle(finishedSession) + " - exited", true);
+                    if (indexOfSession >= 0)
+                        showToast(toToastTitle(finishedSession) + " - exited", true);
                }
                mListViewAdapter.notifyDataSetChanged();
            }
@@ -339,14 +389,32 @@ public final class TermuxActivity extends Activity implements ServiceConnection
            @Override
            public void onClipboardText(TerminalSession session, String text) {
                if (!mIsVisible) return;
-				showToast("Clipboard set:\n\"" + text + "\"", true);
+                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)));
            }

            @Override
            public void onBell(TerminalSession session) {
-				if (mIsVisible) ((Vibrator) getSystemService(VIBRATOR_SERVICE)).vibrate(50);
+                if (mIsVisible) {
+                    switch (mSettings.mBellBehaviour) {
+                        case TermuxPreferences.BELL_BEEP:
+                            mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                            break;
+                        case TermuxPreferences.BELL_VIBRATE:
+                            ((Vibrator) getSystemService(VIBRATOR_SERVICE)).vibrate(50);
+                            break;
+                        case TermuxPreferences.BELL_IGNORE:
+                            // Ignore the bell character.
+                            break;
+                    }
+
+                }
+            }
+
+            @Override
+            public void onColorsChanged(TerminalSession changedSession) {
+                if (getCurrentTermSession() == changedSession) updateBackgroundColor();
            }
        };

@@ -415,6 +483,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                TermuxInstaller.setupIfNeeded(TermuxActivity.this, new Runnable() {
                    @Override
                    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)
@@ -442,15 +511,25 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        }
    }

+    public void switchToSession(boolean forward) {
+        TerminalSession currentSession = getCurrentTermSession();
+        int index = mTermService.getSessions().indexOf(currentSession);
+        if (forward) {
+            if (++index >= mTermService.getSessions().size()) index = 0;
+        } else {
+            if (--index < 0) index = mTermService.getSessions().size() - 1;
+        }
+        switchToSession(mTermService.getSessions().get(index));
+    }
+
    @SuppressLint("InflateParams")
    void renameSession(final TerminalSession sessionToRename) {
-		DialogUtils.textInput(this, R.string.session_rename_title, R.string.session_rename_positive_button, sessionToRename.mSessionName,
-				new DialogUtils.TextSetListener() {
+        DialogUtils.textInput(this, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, new DialogUtils.TextSetListener() {
            @Override
            public void onTextSet(String text) {
                sessionToRename.mSessionName = text;
            }
-				});
+        }, -1, null, -1, null, null);
    }

    @Override
@@ -461,6 +540,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        }
    }

+    @Nullable
    TerminalSession getCurrentTermSession() {
        return mTerminalView.getCurrentSession();
    }
@@ -477,6 +557,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        }

        registerReceiver(mBroadcastReceiever, new IntentFilter(RELOAD_STYLE_ACTION));
+
+        // The current terminal session may have changed while being away, force
+        // a refresh of the displayed terminal:
+        mTerminalView.onScreenUpdated();
    }

    @Override
@@ -491,11 +575,12 @@ public final class TermuxActivity extends Activity implements ServiceConnection

    @Override
    public void onBackPressed() {
-		if (getDrawer().isDrawerOpen(Gravity.START))
+        if (getDrawer().isDrawerOpen(Gravity.LEFT)) {
            getDrawer().closeDrawers();
-		else
+        } else {
            finish();
        }
+    }

    @Override
    public void onDestroy() {
@@ -529,7 +614,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection

    /** Try switching to session and note about it, but do nothing if already displaying the session. */
    void switchToSession(TerminalSession session) {
-		if (mTerminalView.attachSession(session)) noteSessionInfo();
+        if (mTerminalView.attachSession(session)) {
+            noteSessionInfo();
+            updateBackgroundColor();
+        }
    }

    String toToastTitle(TerminalSession session) {
@@ -563,11 +651,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        TerminalSession currentSession = getCurrentTermSession();
        if (currentSession == null) return;

-		ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-		menu.add(Menu.NONE, CONTEXTMENU_PASTE_ID, Menu.NONE, R.string.paste_text).setEnabled(clipboard.hasPrimaryClip());
-		menu.add(Menu.NONE, CONTEXTMENU_SELECT_ID, Menu.NONE, R.string.select);
+        menu.add(Menu.NONE, CONTEXTMENU_SELECT_URL_ID, Menu.NONE, R.string.select_url);
+        menu.add(Menu.NONE, CONTEXTMENU_SHARE_TRANSCRIPT_ID, Menu.NONE, R.string.select_all_and_share);
        menu.add(Menu.NONE, CONTEXTMENU_RESET_TERMINAL_ID, Menu.NONE, R.string.reset_terminal);
-		menu.add(Menu.NONE, CONTEXTMENU_KILL_PROCESS_ID, Menu.NONE, R.string.kill_process).setEnabled(currentSession.isRunning());
+        menu.add(Menu.NONE, CONTEXTMENU_KILL_PROCESS_ID, Menu.NONE, getResources().getString(R.string.kill_process, getCurrentTermSession().getPid())).setEnabled(currentSession.isRunning());
        menu.add(Menu.NONE, CONTEXTMENU_TOGGLE_FULLSCREEN_ID, Menu.NONE, R.string.toggle_fullscreen).setCheckable(true).setChecked(mSettings.isFullScreen());
        menu.add(Menu.NONE, CONTEXTMENU_STYLING_ID, Menu.NONE, R.string.style_terminal);
        menu.add(Menu.NONE, CONTEXTMENU_HELP_ID, Menu.NONE, R.string.help);
@@ -580,12 +667,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        return false;
    }

-	void showUrlSelection() {
-		String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptText();
+    static LinkedHashSet<CharSequence> extractUrls(String text) {
        // Pattern for recognizing a URL, based off RFC 3986
        // http://stackoverflow.com/questions/5713558/detect-and-extract-url-from-a-string
        final Pattern urlPattern = Pattern.compile(
-				"(?:^|[\\W])((ht|f)tp(s?):\\/\\/|www\\.)" + "(([\\w\\-]+\\.){1,}?([\\w\\-.~]+\\/?)*" + "[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
+            "(?:^|[\\W])((ht|f)tp(s?)://|www\\.)" + "(([\\w\\-]+\\.)+?([\\w\\-.~]+/?)*" + "[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
        LinkedHashSet<CharSequence> urlSet = new LinkedHashSet<>();
        Matcher matcher = urlPattern.matcher(text);
@@ -595,7 +681,12 @@ public final class TermuxActivity extends Activity implements ServiceConnection
            String url = text.substring(matchStart, matchEnd);
            urlSet.add(url);
        }
+        return urlSet;
+    }

+    void showUrlSelection() {
+        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptText();
+        LinkedHashSet<CharSequence> urlSet = extractUrls(text);
        if (urlSet.isEmpty()) {
            new AlertDialog.Builder(this).setMessage(R.string.select_url_no_found).show();
            return;
@@ -625,7 +716,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
                        dialog.dismiss();
                        String url = (String) urls[position];
-						startActivity(Intent.createChooser(new Intent(Intent.ACTION_VIEW, Uri.parse(url)), null));
+                        Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                        try {
+                            startActivity(i, null);
+                        } catch (ActivityNotFoundException e) {
+                            // If no applications match, Android displays a system message.
+                            startActivity(Intent.createChooser(i, null));
+                        }
                        return true;
                    }
                });
@@ -637,22 +734,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection

    @Override
    public boolean onContextItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case CONTEXTMENU_SELECT_ID:
-			CharSequence[] items = new CharSequence[] { getString(R.string.select_text), getString(R.string.select_url),
-					getString(R.string.select_all_and_share) };
-			new AlertDialog.Builder(this).setItems(items, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					switch (which) {
-					case 0:
-						mTerminalView.toggleSelectingText();
-						break;
-					case 1:
-						showUrlSelection();
-						break;
-					case 2:
        TerminalSession session = getCurrentTermSession();
+
+        switch (item.getItemId()) {
+            case CONTEXTMENU_SELECT_URL_ID:
+                showUrlSelection();
+                return true;
+            case CONTEXTMENU_SHARE_TRANSCRIPT_ID:
                if (session != null) {
                    Intent intent = new Intent(Intent.ACTION_SEND);
                    intent.setType("text/plain");
@@ -660,11 +748,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                    intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_transcript_title));
                    startActivity(Intent.createChooser(intent, getString(R.string.share_transcript_chooser_title)));
                }
-						break;
-					}
-					dialog.dismiss();
-				}
-			}).show();
                return true;
            case CONTEXTMENU_PASTE_ID:
                doPaste();
@@ -684,7 +767,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                b.show();
                return true;
            case CONTEXTMENU_RESET_TERMINAL_ID: {
-			TerminalSession session = getCurrentTermSession();
                if (session != null) {
                    session.reset();
                    showToast(getResources().getString(R.string.reset_toast_notification), true);
@@ -696,9 +778,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                stylingIntent.setClassName("com.termux.styling", "com.termux.styling.TermuxStyleActivity");
                try {
                    startActivity(stylingIntent);
-			} catch (ActivityNotFoundException e) {
+                } catch (ActivityNotFoundException | IllegalArgumentException e) {
+                    // The startActivity() call is not documented to throw IllegalArgumentException.
+                    // However, crash reporting shows that it sometimes does, so catch it here.
                    new AlertDialog.Builder(this).setMessage(R.string.styling_not_installed)
-						.setPositiveButton(R.string.styling_install, new android.content.DialogInterface.OnClickListener() {
+                        .setPositiveButton(R.string.styling_install, new DialogInterface.OnClickListener() {
                            @Override
                            public void onClick(DialogInterface dialog, int which) {
                                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://play.google.com/store/apps/details?id=com.termux.styling")));
@@ -718,6 +802,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        }
    }

+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+        if (requestCode == REQUESTCODE_PERMISSION_STORAGE && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            TermuxInstaller.setupStorageSymlinks(this);
+        }
+    }
+
    void toggleImmersive() {
        boolean newValue = !mSettings.isFullScreen();
        mSettings.setFullScreen(this, newValue);
@@ -734,7 +825,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
        ClipData clipData = clipboard.getPrimaryClip();
        if (clipData == null) return;
        CharSequence paste = clipData.getItemAt(0).coerceToText(this);
-		if (!TextUtils.isEmpty(paste)) getCurrentTermSession().getEmulator().paste(paste.toString());
+        if (!TextUtils.isEmpty(paste))
+            getCurrentTermSession().getEmulator().paste(paste.toString());
    }

    /** The current session as stored or the last one if that does not exist. */
--- a/app/src/main/java/com/termux/app/TermuxHelpActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxHelpActivity.java
@@ -5,33 +5,62 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.ViewGroup;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;

-/** Basic embedded browser for viewing the bundled help page. */
+/** Basic embedded browser for viewing help pages. */
 public final class TermuxHelpActivity extends Activity {

-	private WebView mWebView;
+    WebView mWebView;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+
+        final RelativeLayout progressLayout = new RelativeLayout(this);
+        RelativeLayout.LayoutParams lParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        lParams.addRule(RelativeLayout.CENTER_IN_PARENT);
+        ProgressBar progressBar = new ProgressBar(this);
+        progressBar.setIndeterminate(true);
+        progressBar.setLayoutParams(lParams);
+        progressLayout.addView(progressBar);
+
        mWebView = new WebView(this);
-		setContentView(mWebView);
+        WebSettings settings = mWebView.getSettings();
+        settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
+        settings.setAppCacheEnabled(false);
+        setContentView(progressLayout);
+        mWebView.clearCache(true);
+
        mWebView.setWebViewClient(new WebViewClient() {
            @Override
            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                if (url.startsWith("https://termux.com")) {
+                    // Inline help.
+                    setContentView(progressLayout);
+                    return false;
+                }
+
                try {
                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                } catch (ActivityNotFoundException e) {
-					// TODO: Android TV does not have a system browser - but needs better method of getting back
-					// than navigating deep here.
+                    // Android TV does not have a system browser.
+                    setContentView(progressLayout);
                    return false;
                }
                return true;
            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                setContentView(mWebView);
+            }
        });
-		mWebView.loadUrl("file:///android_asset/help.html");
+        mWebView.loadUrl("https://termux.com/help.html");
    }

    @Override
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -1,16 +1,5 @@
 package com.termux.app;

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -18,6 +7,9 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.DialogInterface.OnDismissListener;
+import android.os.Build;
+import android.os.Environment;
+import android.os.UserManager;
 import android.system.Os;
 import android.util.Log;
 import android.util.Pair;
@@ -26,23 +18,35 @@ import android.view.WindowManager;
 import com.termux.R;
 import com.termux.terminal.EmulatorDebug;

+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
 /**
 * Install the Termux bootstrap packages if necessary by following the below steps:
- * 
+ * <p/>
 * (1) If $PREFIX already exist, assume that it is correct and be done. Note that this relies on that we do not create a
 * broken $PREFIX folder below.
- * 
+ * <p/>
 * (2) A progress dialog is shown with "Installing..." message and a spinner.
- * 
+ * <p/>
 * (3) A staging folder, $STAGING_PREFIX, is {@link #deleteFolder(File)} if left over from broken installation below.
- * 
+ * <p/>
 * (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:
- * 
+ * <p/>
 * (5.1) If the zip entry encountered is SYMLINKS.txt, go through it and remember all symlinks to setup.
- * 
+ * <p/>
 * (5.2) For every other zip entry, extract it into $STAGING_PREFIX and set execute permissions if necessary.
 */
 final class TermuxInstaller {
@@ -51,7 +55,7 @@ final class TermuxInstaller {
    static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
        // Termux can only be run as the primary user (device owner) since only that
        // account has the expected file system paths. Verify that:
-		android.os.UserManager um = (android.os.UserManager) activity.getSystemService(Context.USER_SERVICE);
+        UserManager um = (UserManager) activity.getSystemService(Context.USER_SERVICE);
        boolean isPrimaryUser = um.getSerialNumberForUser(android.os.Process.myUserHandle()) == 0;
        if (!isPrimaryUser) {
            new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(R.string.bootstrap_error_not_primary_user_message)
@@ -94,7 +98,8 @@ final class TermuxInstaller {
                                String line;
                                while ((line = symlinksReader.readLine()) != null) {
                                    String[] parts = line.split("←");
-									if (parts.length != 2) throw new RuntimeException("Malformed symlink line: " + line);
+                                    if (parts.length != 2)
+                                        throw new RuntimeException("Malformed symlink line: " + line);
                                    String oldPath = parts[0];
                                    String newPath = STAGING_PREFIX_PATH + "/" + parts[1];
                                    symlinks.add(Pair.create(oldPath, newPath));
@@ -103,7 +108,8 @@ final class TermuxInstaller {
                                String zipEntryName = zipEntry.getName();
                                File targetFile = new File(STAGING_PREFIX_PATH, zipEntryName);
                                if (zipEntry.isDirectory()) {
-									if (!targetFile.mkdirs()) throw new RuntimeException("Failed to create directory: " + targetFile.getAbsolutePath());
+                                    if (!targetFile.mkdirs())
+                                        throw new RuntimeException("Failed to create directory: " + targetFile.getAbsolutePath());
                                } else {
                                    try (FileOutputStream outStream = new FileOutputStream(targetFile)) {
                                        int readBytes;
@@ -119,7 +125,8 @@ final class TermuxInstaller {
                        }
                    }

-					if (symlinks.isEmpty()) throw new RuntimeException("No SYMLINKS.txt encountered");
+                    if (symlinks.isEmpty())
+                        throw new RuntimeException("No SYMLINKS.txt encountered");
                    for (Pair<String, String> symlink : symlinks) {
                        Os.symlink(symlink.first, symlink.second);
                    }
@@ -177,14 +184,25 @@ final class TermuxInstaller {

    /** Get bootstrap zip url for this systems cpu architecture. */
    static URL determineZipUrl() throws MalformedURLException {
-		String arch = System.getProperty("os.arch");
-		if (arch.startsWith("arm") || arch.equals("aarch64")) {
-			// Handle different arm variants such as armv7l:
-			arch = "arm";
-		} else if (arch.equals("x86_64")) {
-			arch = "i686";
+        String termuxArch = null;
+        // Note that we cannot use System.getProperty("os.arch") since that may give e.g. "aarch64"
+        // while a 64-bit runtime may not be installed (like on the Samsung Galaxy S5 Neo).
+        // Instead we search through the supported abi:s on the device, see:
+        // http://developer.android.com/ndk/guides/abis.html
+        // Note that we search for abi:s in preferred order, and want to avoid installing arm on
+        // an x86 system where arm emulation is available.
+        final String[] androidArchNames = {"arm64-v8a", "x86_64", "x86", "armeabi-v7a"};
+        final String[] termuxArchNames = {"aarch64", "x86_64", "i686", "arm"};
+
+        final List<String> supportedArches = Arrays.asList(Build.SUPPORTED_ABIS);
+        for (int i = 0; i < termuxArchNames.length; i++) {
+            if (supportedArches.contains(androidArchNames[i])) {
+                termuxArch = termuxArchNames[i];
+                break;
            }
-		return new URL("http://apt.termux.com/bootstrap/bootstrap-" + arch + ".zip");
+        }
+
+        return new URL("https://termux.net/bootstrap/bootstrap-" + termuxArch + ".zip");
    }

    /** Delete a folder and all its content or throw. */
@@ -200,4 +218,51 @@ final class TermuxInstaller {
        }
    }

+    public static void setupStorageSymlinks(final Context context) {
+        final String LOG_TAG = "termux-storage";
+        new Thread() {
+            public void run() {
+                try {
+                    File storageDir = new File(TermuxService.HOME_PATH, "storage");
+
+                    if (storageDir.exists() && !storageDir.delete()) {
+                        Log.e(LOG_TAG, "Could not delete old $HOME/storage");
+                        return;
+                    }
+
+                    if (!storageDir.mkdirs()) {
+                        Log.e(LOG_TAG, "Unable to mkdirs() for $HOME/storage");
+                        return;
+                    }
+
+                    File sharedDir = Environment.getExternalStorageDirectory();
+                    Os.symlink(sharedDir.getAbsolutePath(), new File(storageDir, "shared").getAbsolutePath());
+
+                    File downloadsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+                    Os.symlink(downloadsDir.getAbsolutePath(), new File(storageDir, "downloads").getAbsolutePath());
+
+                    File dcimDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
+                    Os.symlink(dcimDir.getAbsolutePath(), new File(storageDir, "dcim").getAbsolutePath());
+
+                    File picturesDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
+                    Os.symlink(picturesDir.getAbsolutePath(), new File(storageDir, "pictures").getAbsolutePath());
+
+                    File musicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC);
+                    Os.symlink(musicDir.getAbsolutePath(), new File(storageDir, "music").getAbsolutePath());
+
+                    File moviesDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES);
+                    Os.symlink(moviesDir.getAbsolutePath(), new File(storageDir, "movies").getAbsolutePath());
+
+                    final File[] dirs = context.getExternalFilesDirs(null);
+                    if (dirs != null && dirs.length >= 2) {
+                        final File externalDir = dirs[1];
+                        Os.symlink(externalDir.getAbsolutePath(), new File(storageDir, "external").getAbsolutePath());
+                    }
+                } catch (Exception e) {
+                    Log.e(LOG_TAG, "Error setting up link", e);
+                }
+            }
+        }.start();
+    }
+
 }
--- a/app/src/main/java/com/termux/app/TermuxKeyListener.java
+++ b/app/src/main/java/com/termux/app/TermuxKeyListener.java
@@ -0,0 +1,284 @@
+package com.termux.app;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.support.v4.widget.DrawerLayout;
+import android.view.Gravity;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+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 java.util.List;
+
+public final class TermuxKeyListener implements TerminalKeyListener {
+
+    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) {
+        this.mActivity = activity;
+    }
+
+    @Override
+    public float onScale(float scale) {
+        if (scale < 0.9f || scale > 1.1f) {
+            boolean increase = scale > 1.f;
+            mActivity.changeFontSize(increase);
+            return 1.0f;
+        }
+        return scale;
+    }
+
+    @Override
+    public void onSingleTapUp(MotionEvent e) {
+        InputMethodManager mgr = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        mgr.showSoftInput(mActivity.mTerminalView, InputMethodManager.SHOW_IMPLICIT);
+    }
+
+    @Override
+    public boolean shouldBackButtonBeMappedToEscape() {
+        return mActivity.mSettings.mBackIsEscape;
+    }
+
+    @Override
+    public void copyModeChanged(boolean copyMode) {
+        // Disable drawer while copying.
+        mActivity.getDrawer().setDrawerLockMode(copyMode ? DrawerLayout.LOCK_MODE_LOCKED_CLOSED : DrawerLayout.LOCK_MODE_UNLOCKED);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession currentSession) {
+        if (handleVirtualKeys(keyCode, e, true)) return true;
+
+        TermuxService service = mActivity.mTermService;
+
+        if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
+            // Return pressed with finished session - remove it.
+            currentSession.finishIfRunning();
+
+            int index = service.removeTermSession(currentSession);
+            mActivity.mListViewAdapter.notifyDataSetChanged();
+            if (mActivity.mTermService.getSessions().isEmpty()) {
+                // There are no sessions to show, so finish the activity.
+                mActivity.finish();
+            } else {
+                if (index >= service.getSessions().size()) {
+                    index = service.getSessions().size() - 1;
+                }
+                mActivity.switchToSession(service.getSessions().get(index));
+            }
+            return true;
+        } else if (e.isCtrlPressed() && e.isShiftPressed()) {
+            // Get the unmodified code point:
+            int unicodeChar = e.getUnicodeChar(0);
+
+            if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || unicodeChar == 'n'/* next */) {
+                mActivity.switchToSession(true);
+            } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP || unicodeChar == 'p' /* previous */) {
+                mActivity.switchToSession(false);
+            } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
+                mActivity.getDrawer().openDrawer(Gravity.LEFT);
+            } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
+                mActivity.getDrawer().closeDrawers();
+            } else if (unicodeChar == 'f'/* full screen */) {
+                mActivity.toggleImmersive();
+            } else if (unicodeChar == 'k'/* keyboard */) {
+                InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+            } else if (unicodeChar == 'm'/* menu */) {
+                mActivity.mTerminalView.showContextMenu();
+            } else if (unicodeChar == 'r'/* rename */) {
+                mActivity.renameSession(currentSession);
+            } else if (unicodeChar == 'c'/* create */) {
+                mActivity.addNewSession(false, null);
+            } else if (unicodeChar == 'u' /* urls */) {
+                mActivity.showUrlSelection();
+            } else if (unicodeChar == 'v') {
+                mActivity.doPaste();
+            } else if (unicodeChar == '+' || e.getUnicodeChar(KeyEvent.META_SHIFT_ON) == '+') {
+                // We also check for the shifted char here since shift may be required to produce '+',
+                // see https://github.com/termux/termux-api/issues/2
+                mActivity.changeFontSize(true);
+            } else if (unicodeChar == '-') {
+                mActivity.changeFontSize(false);
+            } else if (unicodeChar >= '1' && unicodeChar <= '9') {
+                int num = unicodeChar - '1';
+                if (service.getSessions().size() > num)
+                    mActivity.switchToSession(service.getSessions().get(num));
+            }
+            return true;
+        }
+
+        return false;
+
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent e) {
+        return handleVirtualKeys(keyCode, e, false);
+    }
+
+    @Override
+    public boolean readControlKey() {
+        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readControlButton()) || mVirtualControlKeyDown;
+    }
+
+    @Override
+    public boolean readAltKey() {
+        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readAltButton());
+    }
+
+    @Override
+    public boolean onCodePoint(final int codePoint, boolean ctrlDown, TerminalSession session) {
+        if (mVirtualFnKeyDown) {
+            int resultingKeyCode = -1;
+            int resultingCodePoint = -1;
+            boolean altDown = false;
+            int lowerCase = Character.toLowerCase(codePoint);
+            switch (lowerCase) {
+                // Arrow keys.
+                case 'w':
+                    resultingKeyCode = KeyEvent.KEYCODE_DPAD_UP;
+                    break;
+                case 'a':
+                    resultingKeyCode = KeyEvent.KEYCODE_DPAD_LEFT;
+                    break;
+                case 's':
+                    resultingKeyCode = KeyEvent.KEYCODE_DPAD_DOWN;
+                    break;
+                case 'd':
+                    resultingKeyCode = KeyEvent.KEYCODE_DPAD_RIGHT;
+                    break;
+
+                // Page up and down.
+                case 'p':
+                    resultingKeyCode = KeyEvent.KEYCODE_PAGE_UP;
+                    break;
+                case 'n':
+                    resultingKeyCode = KeyEvent.KEYCODE_PAGE_DOWN;
+                    break;
+
+                // Some special keys:
+                case 't':
+                    resultingKeyCode = KeyEvent.KEYCODE_TAB;
+                    break;
+                case 'i':
+                    resultingKeyCode = KeyEvent.KEYCODE_INSERT;
+                    break;
+                case 'h':
+                    resultingKeyCode = KeyEvent.KEYCODE_MOVE_HOME;
+                    break;
+
+                // Special characters to input.
+                case 'u':
+                    resultingCodePoint = '_';
+                    break;
+                case 'l':
+                    resultingCodePoint = '|';
+                    break;
+
+                // Function keys.
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    resultingKeyCode = (codePoint - '1') + KeyEvent.KEYCODE_F1;
+                    break;
+                case '0':
+                    resultingKeyCode = KeyEvent.KEYCODE_F10;
+                    break;
+
+                // Other special keys.
+                case 'e':
+                    resultingCodePoint = /*Escape*/ 27;
+                    break;
+                case '.':
+                    resultingCodePoint = /*^.*/ 28;
+                    break;
+
+                case 'b': // alt+b, jumping backward in readline.
+                case 'f': // alf+f, jumping forward in readline.
+                case 'x': // alt+x, common in emacs.
+                    resultingCodePoint = lowerCase;
+                    altDown = true;
+                    break;
+
+                // Volume control.
+                case 'v':
+                    resultingCodePoint = -1;
+                    AudioManager audio = (AudioManager) mActivity.getSystemService(Context.AUDIO_SERVICE);
+                    audio.adjustSuggestedStreamVolume(AudioManager.ADJUST_SAME, AudioManager.USE_DEFAULT_STREAM_TYPE, AudioManager.FLAG_SHOW_UI);
+                    break;
+
+                // Writing mode:
+                case 'q':
+                    mActivity.toggleShowExtraKeys();
+                    break;
+            }
+
+            if (resultingKeyCode != -1) {
+                TerminalEmulator term = session.getEmulator();
+                session.write(KeyHandler.getCode(resultingKeyCode, 0, term.isCursorKeysApplicationMode(), term.isKeypadApplicationMode()));
+            } else if (resultingCodePoint != -1) {
+                session.writeCodePoint(altDown, resultingCodePoint);
+            }
+            return true;
+        } else if (ctrlDown) {
+            List<TermuxPreferences.KeyboardShortcut> shortcuts = mActivity.mSettings.shortcuts;
+            if (!shortcuts.isEmpty()) {
+                for (int i = shortcuts.size() - 1; i >= 0; i--) {
+                    TermuxPreferences.KeyboardShortcut shortcut = shortcuts.get(i);
+                    if (codePoint == shortcut.codePoint) {
+                        switch (shortcut.shortcutAction) {
+                            case TermuxPreferences.SHORTCUT_ACTION_CREATE_SESSION:
+                                mActivity.addNewSession(false, null);
+                                return true;
+                            case TermuxPreferences.SHORTCUT_ACTION_PREVIOUS_SESSION:
+                                mActivity.switchToSession(false);
+                                return true;
+                            case TermuxPreferences.SHORTCUT_ACTION_NEXT_SESSION:
+                                mActivity.switchToSession(true);
+                                return true;
+                            case TermuxPreferences.SHORTCUT_ACTION_RENAME_SESSION:
+                                mActivity.renameSession(mActivity.getCurrentTermSession());
+                                return true;
+                        }
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /** Handle dedicated volume buttons as virtual keys if applicable. */
+    private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
+        InputDevice inputDevice = event.getDevice();
+        if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+            // Do not steal dedicated buttons from a full external keyboard.
+            return false;
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+            mVirtualControlKeyDown = down;
+            return true;
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+            mVirtualFnKeyDown = down;
+            return true;
+        }
+        return false;
+    }
+
+
+}
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -1,17 +1,39 @@
 package com.termux.app;

-import com.termux.terminal.TerminalSession;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.support.annotation.IntDef;
+import android.util.Log;
 import android.util.TypedValue;
+import android.widget.Toast;
+
+import com.termux.terminal.TerminalSession;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;

 final class TermuxPreferences {

+    @IntDef({BELL_VIBRATE, BELL_BEEP, BELL_IGNORE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface AsciiBellBehaviour {
+    }
+
+    static final int BELL_VIBRATE = 1;
+    static final int BELL_BEEP = 2;
+    static final int BELL_IGNORE = 3;
+
    private final int MIN_FONTSIZE;
    private static final int MAX_FONTSIZE = 256;
+
    private static final String FULLSCREEN_KEY = "fullscreen";
+    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";
@@ -19,7 +41,14 @@ final class TermuxPreferences {
    private boolean mFullScreen;
    private int mFontSize;

+    @AsciiBellBehaviour
+    int mBellBehaviour = BELL_VIBRATE;
+
+    boolean mBackIsEscape;
+    boolean mShowExtraKeys;
+
    TermuxPreferences(Context context) {
+        reloadFromProperties(context);
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, context.getResources().getDisplayMetrics());
@@ -29,6 +58,7 @@ final class TermuxPreferences {
        MIN_FONTSIZE = (int) (4f * dipInPixels);

        mFullScreen = prefs.getBoolean(FULLSCREEN_KEY, false);
+        mShowExtraKeys = prefs.getBoolean(SHOW_EXTRA_KEYS_KEY, false);

        // http://www.google.com/design/spec/style/typography.html#typography-line-height
        int defaultFontSize = Math.round(12 * dipInPixels);
@@ -49,8 +79,17 @@ final class TermuxPreferences {

    void setFullScreen(Context context, boolean newValue) {
        mFullScreen = newValue;
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-		prefs.edit().putBoolean(FULLSCREEN_KEY, newValue).apply();
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(FULLSCREEN_KEY, newValue).apply();
+    }
+
+    boolean isShowExtraKeys() {
+        return mShowExtraKeys;
+    }
+
+    boolean toggleShowExtraKeys(Context context) {
+        mShowExtraKeys = !mShowExtraKeys;
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SHOW_EXTRA_KEYS_KEY, mShowExtraKeys).apply();
+        return mShowExtraKeys;
    }

    int getFontSize() {
@@ -86,4 +125,83 @@ final class TermuxPreferences {
        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");
+            if (!propsFile.exists())
+                propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
+
+            Properties props = new Properties();
+            if (propsFile.isFile() && propsFile.canRead()) {
+                try (FileInputStream in = new FileInputStream(propsFile)) {
+                    props.load(in);
+                }
+            }
+
+            switch (props.getProperty("bell-character", "vibrate")) {
+                case "beep":
+                    mBellBehaviour = BELL_BEEP;
+                    break;
+                case "ignore":
+                    mBellBehaviour = BELL_IGNORE;
+                    break;
+                default: // "vibrate".
+                    mBellBehaviour = BELL_VIBRATE;
+                    break;
+            }
+
+            mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
+
+            shortcuts.clear();
+            parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);
+            parseAction("shortcut.next-session", SHORTCUT_ACTION_NEXT_SESSION, props);
+            parseAction("shortcut.previous-session", SHORTCUT_ACTION_PREVIOUS_SESSION, props);
+            parseAction("shortcut.rename-session", SHORTCUT_ACTION_RENAME_SESSION, props);
+        } catch (Exception e) {
+            Toast.makeText(context, "Error loading properties: " + e.getMessage(), Toast.LENGTH_LONG).show();
+            Log.e("termux", "Error loading props", e);
+        }
+    }
+
+    public static final int SHORTCUT_ACTION_CREATE_SESSION = 1;
+    public static final int SHORTCUT_ACTION_NEXT_SESSION = 2;
+    public static final int SHORTCUT_ACTION_PREVIOUS_SESSION = 3;
+    public static final int SHORTCUT_ACTION_RENAME_SESSION = 4;
+
+    public final static class KeyboardShortcut {
+
+        public KeyboardShortcut(int codePoint, int shortcutAction) {
+            this.codePoint = codePoint;
+            this.shortcutAction = shortcutAction;
+        }
+
+        final int codePoint;
+        final int shortcutAction;
+    }
+
+    final List<KeyboardShortcut> shortcuts = new ArrayList<>();
+
+    private void parseAction(String name, int shortcutAction, Properties props) {
+        String value = props.getProperty(name);
+        if (value == null) return;
+        String[] parts = value.trim().split("\\+");
+        String input = parts.length == 2 ? parts[1].trim() : null;
+        if (!(parts.length == 2 && parts[0].trim().equalsIgnoreCase("ctrl")) || input.isEmpty() || input.length() > 2) {
+            Log.e("termux", "Keyboard shortcut '" + name + "' is not Ctrl+<something>");
+            return;
+        }
+
+        char c = input.charAt(0);
+        int codePoint = c;
+        if (Character.isLowSurrogate(c)) {
+            if (input.length() != 2 || Character.isHighSurrogate(input.charAt(1))) {
+                Log.e("termux", "Keyboard shortcut '" + name + "' is not Ctrl+<something>");
+                return;
+            } else {
+                codePoint = Character.toCodePoint(input.charAt(1), c);
+            }
+        }
+        shortcuts.add(new KeyboardShortcut(codePoint, shortcutAction));
+    }
+
 }
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -1,15 +1,5 @@
 package com.termux.app;

-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.termux.R;
-import com.termux.terminal.EmulatorDebug;
-import com.termux.terminal.TerminalSession;
-import com.termux.terminal.TerminalSession.SessionChangedCallback;
-
 import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -26,15 +16,25 @@ import android.os.PowerManager;
 import android.util.Log;
 import android.widget.ArrayAdapter;

+import com.termux.R;
+import com.termux.terminal.EmulatorDebug;
+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;
+
 /**
 * A service holding a list of terminal sessions, {@link #mTerminalSessions}, showing a foreground notification while
 * running so that it is not terminated. The user interacts with the session through {@link TermuxActivity}, but this
 * service may outlive the activity when the user or the system disposes of the activity. In that case the user may
 * restart {@link TermuxActivity} later to yet again access the sessions.
- * 
+ * <p/>
 * In order to keep both terminal sessions and spawned processes (who may outlive the terminal sessions) alive as long
 * as wanted by the user this service is a foreground service, {@link Service#startForeground(int, Notification)}.
- * 
+ * <p/>
 * Optionally may hold a wake and a wifi lock, in which case that is shown in the notification - see
 * {@link #buildNotification()}.
 */
@@ -55,7 +55,11 @@ public final class TermuxService extends Service implements SessionChangedCallba
    /** Intent action to toggle the wifi lock, {@link #mWifiLock}, which this service may hold. */
    private static final String ACTION_LOCK_WIFI = "com.termux.service_toggle_wifi_lock";
    /** Intent action to launch a new terminal session. Executed from TermuxWidgetProvider. */
-	private static final String ACTION_EXECUTE = "com.termux.service_execute";
+    public static final String ACTION_EXECUTE = "com.termux.service_execute";
+
+    public static final String EXTRA_ARGUMENTS = "com.termux.execute.arguments";
+
+    public static final String EXTRA_CURRENT_WORKING_DIRECTORY = "com.termux.execute.cwd";

    /** This service is only bound from inside the same process and never uses IPC. */
    class LocalBinder extends Binder {
@@ -66,7 +70,7 @@ public final class TermuxService extends Service implements SessionChangedCallba

    /**
     * The terminal sessions which this service manages.
-	 *
+     * <p/>
     * Note that this list is observed by {@link TermuxActivity#mListViewAdapter}, so any changes must be made on the UI
     * thread and followed by a call to {@link ArrayAdapter#notifyDataSetChanged()} }.
     */
@@ -113,8 +117,8 @@ public final class TermuxService extends Service implements SessionChangedCallba
        } else if (ACTION_EXECUTE.equals(action)) {
            Uri executableUri = intent.getData();
            String executablePath = (executableUri == null ? null : executableUri.getPath());
-			String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra("com.termux.execute.arguments"));
-			String cwd = intent.getStringExtra("com.termux.execute.cwd");
+            String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra(EXTRA_ARGUMENTS));
+            String cwd = intent.getStringExtra(EXTRA_CURRENT_WORKING_DIRECTORY);
            TerminalSession newSession = createTermSession(executablePath, arguments, cwd, false);

            // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
@@ -237,17 +241,22 @@ public final class TermuxService extends Service implements SessionChangedCallba
        final String prefixEnv = "PREFIX=" + PREFIX_PATH;
        final String androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT");
        final String androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA");
+        // 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) {
-			env = new String[] { termEnv, homeEnv, prefixEnv, androidRootEnv, androidDataEnv };
+            // Keep the default path so that system binaries can be used in the failsafe session.
+            final String pathEnv = "PATH=" + System.getenv("PATH");
+            env = new String[]{termEnv, homeEnv, prefixEnv, androidRootEnv, androidDataEnv, pathEnv, externalStorageEnv};
        } else {
            final String ps1Env = "PS1=$ ";
            final String ldEnv = "LD_LIBRARY_PATH=" + PREFIX_PATH + "/lib";
            final String langEnv = "LANG=en_US.UTF-8";
-			final String pathEnv = "PATH=" + PREFIX_PATH + "/bin:" + PREFIX_PATH + "/bin/applets:" + System.getenv("PATH");
+            final String pathEnv = "PATH=" + PREFIX_PATH + "/bin:" + PREFIX_PATH + "/bin/applets";
            final String pwdEnv = "PWD=" + cwd;

-			env = new String[] { termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv };
+            env = new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv};
        }

        String shellName;
@@ -325,7 +334,8 @@ public final class TermuxService extends Service implements SessionChangedCallba

    @Override
    public void onSessionFinished(final TerminalSession finishedSession) {
-		if (mSessionChangeCallback != null) mSessionChangeCallback.onSessionFinished(finishedSession);
+        if (mSessionChangeCallback != null)
+            mSessionChangeCallback.onSessionFinished(finishedSession);
    }

    @Override
@@ -343,4 +353,9 @@ public final class TermuxService extends Service implements SessionChangedCallba
        if (mSessionChangeCallback != null) mSessionChangeCallback.onBell(session);
    }

+    @Override
+    public void onColorsChanged(TerminalSession session) {
+        if (mSessionChangeCallback != null) mSessionChangeCallback.onColorsChanged(session);
+    }
+
 }
--- a/app/src/main/java/com/termux/drawer/DrawerLayout.java
+++ b/app/src/main/java/com/termux/drawer/DrawerLayout.java
--- a/app/src/main/java/com/termux/drawer/DrawerLayoutCompatApi21.java
+++ b/app/src/main/java/com/termux/drawer/DrawerLayoutCompatApi21.java
@@ -1,88 +0,0 @@
-package com.termux.drawer;
-
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowInsets;
-
-/**
- * Provides functionality for DrawerLayout unique to API 21
- */
-@SuppressLint("RtlHardcoded")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-class DrawerLayoutCompatApi21 {
-
-	private static final int[] THEME_ATTRS = { android.R.attr.colorPrimaryDark };
-
-	public static void configureApplyInsets(DrawerLayout drawerLayout) {
-		drawerLayout.setOnApplyWindowInsetsListener(new InsetsListener());
-		drawerLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-	}
-
-	public static void dispatchChildInsets(View child, Object insets, int gravity) {
-		WindowInsets wi = (WindowInsets) insets;
-		if (gravity == Gravity.LEFT) {
-			wi = wi.replaceSystemWindowInsets(wi.getSystemWindowInsetLeft(), wi.getSystemWindowInsetTop(), 0, wi.getSystemWindowInsetBottom());
-		} else if (gravity == Gravity.RIGHT) {
-			wi = wi.replaceSystemWindowInsets(0, wi.getSystemWindowInsetTop(), wi.getSystemWindowInsetRight(), wi.getSystemWindowInsetBottom());
-		}
-		child.dispatchApplyWindowInsets(wi);
-	}
-
-	public static void applyMarginInsets(ViewGroup.MarginLayoutParams lp, Object insets, int gravity) {
-		WindowInsets wi = (WindowInsets) insets;
-		if (gravity == Gravity.LEFT) {
-			wi = wi.replaceSystemWindowInsets(wi.getSystemWindowInsetLeft(), wi.getSystemWindowInsetTop(), 0, wi.getSystemWindowInsetBottom());
-		} else if (gravity == Gravity.RIGHT) {
-			wi = wi.replaceSystemWindowInsets(0, wi.getSystemWindowInsetTop(), wi.getSystemWindowInsetRight(), wi.getSystemWindowInsetBottom());
-		}
-		lp.leftMargin = wi.getSystemWindowInsetLeft();
-		lp.topMargin = wi.getSystemWindowInsetTop();
-		lp.rightMargin = wi.getSystemWindowInsetRight();
-		lp.bottomMargin = wi.getSystemWindowInsetBottom();
-	}
-
-	public static int getTopInset(Object insets) {
-		return insets != null ? ((WindowInsets) insets).getSystemWindowInsetTop() : 0;
-	}
-
-	public static Drawable getDefaultStatusBarBackground(Context context) {
-		final TypedArray a = context.obtainStyledAttributes(THEME_ATTRS);
-		try {
-			return a.getDrawable(0);
-		} finally {
-			a.recycle();
-		}
-	}
-
-	static class InsetsListener implements View.OnApplyWindowInsetsListener {
-		@Override
-		public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
-			final DrawerLayout drawerLayout = (DrawerLayout) v;
-			drawerLayout.setChildInsets(insets, insets.getSystemWindowInsetTop() > 0);
-			return insets.consumeSystemWindowInsets();
-		}
-	}
-}
--- a/app/src/main/java/com/termux/drawer/ViewDragHelper.java
+++ b/app/src/main/java/com/termux/drawer/ViewDragHelper.java
--- a/app/src/main/java/com/termux/drawer/package-info.java
+++ b/app/src/main/java/com/termux/drawer/package-info.java
@@ -1,10 +0,0 @@
-/**
- * Extraction (and some minor cleanup to get rid of warnings) of DrawerLayout from the
- * <a href="http://developer.android.com/tools/support-library/index.html">Android Support Library</a>.
- * 
- * Source at:
- * https://android.googlesource.com/platform/frameworks/support/+/refs/heads/master/v4/java/android/support/v4/widget/DrawerLayout.java
- * https://android.googlesource.com/platform/frameworks/support/+/refs/heads/master/v4/java/android/support/v4/widget/ViewDragHelper.java
- */
-package com.termux.drawer;
-
--- a/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java
@@ -0,0 +1,242 @@
+package com.termux.filepicker;
+
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.graphics.Point;
+import android.os.CancellationSignal;
+import android.os.ParcelFileDescriptor;
+import android.provider.DocumentsContract.Document;
+import android.provider.DocumentsContract.Root;
+import android.provider.DocumentsProvider;
+import android.webkit.MimeTypeMap;
+
+import com.termux.R;
+import com.termux.app.TermuxService;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+
+/**
+ * A document provider for the Storage Access Framework which exposes the files in the
+ * $HOME/ folder to other apps.
+ * <p/>
+ * Note that this replaces providing an activity matching the ACTION_GET_CONTENT intent:
+ * <p/>
+ * "A document provider and ACTION_GET_CONTENT should be considered mutually exclusive. If you
+ * support both of them simultaneously, your app will appear twice in the system picker UI,
+ * offering two different ways of accessing your stored data. This would be confusing for users."
+ * - http://developer.android.com/guide/topics/providers/document-provider.html#43
+ */
+public class TermuxDocumentsProvider extends DocumentsProvider {
+
+    private static final String ALL_MIME_TYPES = "*/*";
+
+    private static final File BASE_DIR = new File(TermuxService.HOME_PATH);
+
+
+    // The default columns to return information about a root if no specific
+    // columns are requested in a query.
+    private static final String[] DEFAULT_ROOT_PROJECTION = new String[]{
+        Root.COLUMN_ROOT_ID,
+        Root.COLUMN_MIME_TYPES,
+        Root.COLUMN_FLAGS,
+        Root.COLUMN_ICON,
+        Root.COLUMN_TITLE,
+        Root.COLUMN_SUMMARY,
+        Root.COLUMN_DOCUMENT_ID,
+        Root.COLUMN_AVAILABLE_BYTES
+    };
+
+    // The default columns to return information about a document if no specific
+    // columns are requested in a query.
+    private static final String[] DEFAULT_DOCUMENT_PROJECTION = new String[]{
+        Document.COLUMN_DOCUMENT_ID,
+        Document.COLUMN_MIME_TYPE,
+        Document.COLUMN_DISPLAY_NAME,
+        Document.COLUMN_LAST_MODIFIED,
+        Document.COLUMN_FLAGS,
+        Document.COLUMN_SIZE
+    };
+
+    @Override
+    public Cursor queryRoots(String[] projection) throws FileNotFoundException {
+        final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_ROOT_PROJECTION);
+        @SuppressWarnings("ConstantConditions") final String applicationName = getContext().getString(R.string.application_name);
+
+        final MatrixCursor.RowBuilder row = result.newRow();
+        row.add(Root.COLUMN_ROOT_ID, getDocIdForFile(BASE_DIR));
+        row.add(Root.COLUMN_DOCUMENT_ID, getDocIdForFile(BASE_DIR));
+        row.add(Root.COLUMN_SUMMARY, null);
+        row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH);
+        row.add(Root.COLUMN_TITLE, applicationName);
+        row.add(Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
+        row.add(Root.COLUMN_AVAILABLE_BYTES, BASE_DIR.getFreeSpace());
+        row.add(Root.COLUMN_ICON, R.drawable.ic_launcher);
+        return result;
+    }
+
+    @Override
+    public Cursor queryDocument(String documentId, String[] projection) throws FileNotFoundException {
+        final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION);
+        includeFile(result, documentId, null);
+        return result;
+    }
+
+    @Override
+    public Cursor queryChildDocuments(String parentDocumentId, String[] projection, String sortOrder) throws FileNotFoundException {
+        final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION);
+        final File parent = getFileForDocId(parentDocumentId);
+        for (File file : parent.listFiles()) {
+            if (!file.getName().startsWith(".")) {
+                includeFile(result, null, file);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public ParcelFileDescriptor openDocument(final String documentId, String mode, CancellationSignal signal) throws FileNotFoundException {
+        final File file = getFileForDocId(documentId);
+        final int accessMode = ParcelFileDescriptor.parseMode(mode);
+        return ParcelFileDescriptor.open(file, accessMode);
+    }
+
+    @Override
+    public AssetFileDescriptor openDocumentThumbnail(String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException {
+        final File file = getFileForDocId(documentId);
+        final ParcelFileDescriptor pfd = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+        return new AssetFileDescriptor(pfd, 0, file.length());
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public void deleteDocument(String documentId) throws FileNotFoundException {
+        File file = getFileForDocId(documentId);
+        if (!file.delete()) {
+            throw new FileNotFoundException("Failed to delete document with id " + documentId);
+        }
+    }
+
+    @Override
+    public String getDocumentType(String documentId) throws FileNotFoundException {
+        File file = getFileForDocId(documentId);
+        return getMimeType(file);
+    }
+
+    @Override
+    public Cursor querySearchDocuments(String rootId, String query, String[] projection) throws FileNotFoundException {
+        final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION);
+        final File parent = getFileForDocId(rootId);
+
+        // This example implementation searches file names for the query and doesn't rank search
+        // results, so we can stop as soon as we find a sufficient number of matches.  Other
+        // implementations might rank results and use other data about files, rather than the file
+        // name, to produce a match.
+        final LinkedList<File> pending = new LinkedList<>();
+        pending.add(parent);
+
+        final int MAX_SEARCH_RESULTS = 50;
+        while (!pending.isEmpty() && result.getCount() < MAX_SEARCH_RESULTS) {
+            final File file = pending.removeFirst();
+            // Avoid folders outside the $HOME folders linked in to symlinks (to avoid e.g. search
+            // through the whole SD card).
+            boolean isInsideHome;
+            try {
+                isInsideHome = file.getCanonicalPath().startsWith(TermuxService.HOME_PATH);
+            } catch (IOException e) {
+                isInsideHome = true;
+            }
+            final boolean isHidden = file.getName().startsWith(".");
+            if (isInsideHome && !isHidden) {
+                if (file.isDirectory()) {
+                    Collections.addAll(pending, file.listFiles());
+                } else {
+                    if (file.getName().toLowerCase().contains(query)) {
+                        includeFile(result, null, file);
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Get the document id given a file. This document id must be consistent across time as other
+     * applications may save the ID and use it to reference documents later.
+     * <p/>
+     * The reverse of @{link #getFileForDocId}.
+     */
+    private static String getDocIdForFile(File file) {
+        return file.getAbsolutePath();
+    }
+
+    /**
+     * Get the file given a document id (the reverse of {@link #getDocIdForFile(File)}).
+     */
+    private static File getFileForDocId(String docId) throws FileNotFoundException {
+        final File f = new File(docId);
+        if (!f.exists()) throw new FileNotFoundException(f.getAbsolutePath() + " not found");
+        return f;
+    }
+
+    private static String getMimeType(File file) {
+        if (file.isDirectory()) {
+            return Document.MIME_TYPE_DIR;
+        } else {
+            final String name = file.getName();
+            final int lastDot = name.lastIndexOf('.');
+            if (lastDot >= 0) {
+                final String extension = name.substring(lastDot + 1);
+                final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+                if (mime != null) return mime;
+            }
+            return "application/octet-stream";
+        }
+    }
+
+    /**
+     * Add a representation of a file to a cursor.
+     *
+     * @param result the cursor to modify
+     * @param docId  the document ID representing the desired file (may be null if given file)
+     * @param file   the File object representing the desired file (may be null if given docID)
+     */
+    private void includeFile(MatrixCursor result, String docId, File file)
+        throws FileNotFoundException {
+        if (docId == null) {
+            docId = getDocIdForFile(file);
+        } else {
+            file = getFileForDocId(docId);
+        }
+
+        int flags = 0;
+        if (file.isDirectory()) {
+            if (file.isDirectory() && file.canWrite()) flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
+        } else if (file.canWrite()) {
+            flags |= Document.FLAG_SUPPORTS_WRITE | Document.FLAG_SUPPORTS_DELETE;
+        }
+
+        final String displayName = file.getName();
+        final String mimeType = getMimeType(file);
+        if (mimeType.startsWith("image/")) flags |= Document.FLAG_SUPPORTS_THUMBNAIL;
+
+        final MatrixCursor.RowBuilder row = result.newRow();
+        row.add(Document.COLUMN_DOCUMENT_ID, docId);
+        row.add(Document.COLUMN_DISPLAY_NAME, displayName);
+        row.add(Document.COLUMN_SIZE, file.length());
+        row.add(Document.COLUMN_MIME_TYPE, mimeType);
+        row.add(Document.COLUMN_LAST_MODIFIED, file.lastModified());
+        row.add(Document.COLUMN_FLAGS, flags);
+        row.add(Document.COLUMN_ICON, R.drawable.ic_launcher);
+    }
+
+}
--- a/app/src/main/java/com/termux/filepicker/TermuxFilePickerActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFilePickerActivity.java
@@ -1,111 +0,0 @@
-package com.termux.filepicker;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.ListActivity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import com.termux.R;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/** Activity allowing picking files from the $HOME folder. */
-public class TermuxFilePickerActivity extends ListActivity {
-
-    @SuppressLint("SdCardPath")
-    final String TERMUX_HOME = "/data/data/com.termux/files/home";
-
-    private File mCurrentDirectory;
-    private final List<File> mFiles = new ArrayList<>();
-    private final List<String> mFileNames = new ArrayList<>();
-    private ArrayAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.file_picker);
-
-        mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, mFileNames);
-
-        enterDirectory(new File(TERMUX_HOME));
-        setListAdapter(mAdapter);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            enterDirectory(mCurrentDirectory.getParentFile());
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        super.onListItemClick(l, v, position, id);
-        File requestFile = mFiles.get(position);
-        if (requestFile.isDirectory()) {
-            enterDirectory(requestFile);
-        } else {
-            Uri returnUri = Uri.withAppendedPath(Uri.parse("content://com.termux.filepicker.provider/"), requestFile.getAbsolutePath());
-            Intent returnIntent = new Intent().setData(returnUri);
-            returnIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            setResult(Activity.RESULT_OK, returnIntent);
-            finish();
-        }
-    }
-
-    void enterDirectory(File directory) {
-        getActionBar().setDisplayHomeAsUpEnabled(!directory.getAbsolutePath().equals(TERMUX_HOME));
-
-        String title = directory.getAbsolutePath() + "/";
-        if (title.startsWith(TERMUX_HOME)) {
-            title = "~" + title.substring(TERMUX_HOME.length(), title.length());
-        }
-        setTitle(title);
-
-        mCurrentDirectory = directory;
-        mFiles.clear();
-        mFileNames.clear();
-        mFiles.addAll(Arrays.asList(mCurrentDirectory.listFiles()));
-
-        Collections.sort(mFiles, new Comparator<File>() {
-            @Override
-            public int compare(File f1, File f2) {
-                final String n1 = f1.getName();
-                final String n2 = f2.getName();
-                // Display dot folders last:
-                if (n1.startsWith(".") && !n2.startsWith(".")) {
-                    return 1;
-                } else if (n2.startsWith(".") && !n1.startsWith(".")) {
-                    return -1;
-                }
-                return n1.compareToIgnoreCase(n2);
-            }
-        });
-
-        for (File file : mFiles) {
-            mFileNames.add(file.getName() + (file.isDirectory() ? "/" : ""));
-        }
-        mAdapter.notifyDataSetChanged();
-    }
-
-}
--- a/app/src/main/java/com/termux/filepicker/TermuxFilePickerProvider.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFilePickerProvider.java
@@ -1,50 +0,0 @@
-package com.termux.filepicker;
-
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-/** Provider of files content uris picked from {@link com.termux.filepicker.TermuxFilePickerActivity}. */
-public class TermuxFilePickerProvider extends ContentProvider {
-    @Override
-    public boolean onCreate() {
-        return false;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        return null;
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        return null;
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        return null;
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        return 0;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        return 0;
-    }
-
-    @Override
-    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
-        File file = new File(uri.getPath());
-        return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
-    }
-}
--- a/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java
@@ -0,0 +1,217 @@
+package com.termux.filepicker;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.OpenableColumns;
+import android.util.Log;
+import android.util.Patterns;
+
+import com.termux.R;
+import com.termux.app.DialogUtils;
+import com.termux.app.TermuxService;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+public class TermuxFileReceiverActivity extends Activity {
+
+    static final String TERMUX_RECEIVEDIR = TermuxService.FILES_PATH + "/home/downloads";
+    static final String EDITOR_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-file-editor";
+    static final String URL_OPENER_PROGRAM = TermuxService.HOME_PATH + "/bin/termux-url-opener";
+
+    /**
+     * If the activity should be finished when the name input dialog is dismissed. This is disabled
+     * before showing an error dialog, since the act of showing the error dialog will cause the
+     * name input dialog to be implicitly dismissed, and we do not want to finish the activity directly
+     * when showing the error dialog.
+     */
+    boolean mFinishOnDismissNameDialog = true;
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        final Intent intent = getIntent();
+        final String action = intent.getAction();
+        final String type = intent.getType();
+        final String scheme = intent.getScheme();
+
+        if (Intent.ACTION_SEND.equals(action) && type != null) {
+            final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+
+            if (sharedText != null) {
+                if (Patterns.WEB_URL.matcher(sharedText).matches()) {
+                    handleUrlAndFinish(sharedText);
+                } else {
+                    String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+                    if (subject == null) subject = intent.getStringExtra(Intent.EXTRA_TITLE);
+                    if (subject != null) subject += ".txt";
+                    promptNameAndSave(new ByteArrayInputStream(sharedText.getBytes(StandardCharsets.UTF_8)), subject);
+                }
+            } else if (sharedUri != null) {
+                handleContentUri(sharedUri, intent.getStringExtra(Intent.EXTRA_TITLE));
+            } else {
+                showErrorDialogAndQuit("Send action without content - nothing to save.");
+            }
+        } else if ("content".equals(scheme)) {
+            handleContentUri(intent.getData(), intent.getStringExtra(Intent.EXTRA_TITLE));
+        } else if ("file".equals(scheme)) {
+            // When e.g. clicking on a downloaded apk:
+            String path = intent.getData().getPath();
+            File file = new File(path);
+            try {
+                FileInputStream in = new FileInputStream(file);
+                promptNameAndSave(in, file.getName());
+            } catch (FileNotFoundException e) {
+                showErrorDialogAndQuit("Cannot open file: " + e.getMessage() + ".");
+            }
+        } else {
+            showErrorDialogAndQuit("Unable to receive any file or URL.");
+        }
+    }
+
+    void showErrorDialogAndQuit(String message) {
+        mFinishOnDismissNameDialog = false;
+        new AlertDialog.Builder(this).setMessage(message).setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                finish();
+            }
+        }).setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                finish();
+            }
+        }).show();
+    }
+
+    void handleContentUri(final Uri uri, String subjectFromIntent) {
+        try {
+            String attachmentFileName = null;
+
+            String[] projection = new String[]{OpenableColumns.DISPLAY_NAME};
+            try (Cursor c = getContentResolver().query(uri, projection, null, null, null)) {
+                if (c != null && c.moveToFirst()) {
+                    final int fileNameColumnId = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                    if (fileNameColumnId >= 0) attachmentFileName = c.getString(fileNameColumnId);
+                }
+            }
+
+            if (attachmentFileName == null) attachmentFileName = subjectFromIntent;
+
+            InputStream in = getContentResolver().openInputStream(uri);
+            promptNameAndSave(in, attachmentFileName);
+        } catch (Exception e) {
+            showErrorDialogAndQuit("Unable to handle shared content:\n\n" + e.getMessage());
+            Log.e("termux", "handleContentUri(uri=" + uri + ") failed", e);
+        }
+    }
+
+    void promptNameAndSave(final InputStream in, final String attachmentFileName) {
+        DialogUtils.textInput(this, R.string.file_received_title, attachmentFileName, R.string.file_received_edit_button, new DialogUtils.TextSetListener() {
+                @Override
+                public void onTextSet(String text) {
+                    File outFile = saveStreamWithName(in, text);
+                    if (outFile == null) return;
+
+                    final File editorProgramFile = new File(EDITOR_PROGRAM);
+                    if (!editorProgramFile.isFile()) {
+                        showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-file-editor\n\n"
+                            + "Create this file as a script or a symlink - it will be called with the received file as only argument.");
+                        return;
+                    }
+
+                    // Do this for the user if necessary:
+                    //noinspection ResultOfMethodCallIgnored
+                    editorProgramFile.setExecutable(true);
+
+                    final Uri scriptUri = new Uri.Builder().scheme("file").path(EDITOR_PROGRAM).build();
+
+                    Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE, scriptUri);
+                    executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+                    executeIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, new String[]{outFile.getAbsolutePath()});
+                    startService(executeIntent);
+                    finish();
+                }
+            },
+            R.string.file_received_open_folder_button, new DialogUtils.TextSetListener() {
+                @Override
+                public void onTextSet(String text) {
+                    if (saveStreamWithName(in, text) == null) return;
+
+                    Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE);
+                    executeIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, TERMUX_RECEIVEDIR);
+                    executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+                    startService(executeIntent);
+                    finish();
+                }
+            },
+            android.R.string.cancel, new DialogUtils.TextSetListener() {
+                @Override
+                public void onTextSet(final String text) {
+                    finish();
+                }
+            }, new DialogInterface.OnDismissListener() {
+                @Override
+                public void onDismiss(DialogInterface dialog) {
+                    if (mFinishOnDismissNameDialog) finish();
+                }
+            });
+    }
+
+    public File saveStreamWithName(InputStream in, String attachmentFileName) {
+        File receiveDir = new File(TERMUX_RECEIVEDIR);
+        if (!receiveDir.isDirectory() && !receiveDir.mkdirs()) {
+            showErrorDialogAndQuit("Cannot create directory: " + receiveDir.getAbsolutePath());
+            return null;
+        }
+        try {
+            final File outFile = new File(receiveDir, attachmentFileName);
+            try (FileOutputStream f = new FileOutputStream(outFile)) {
+                byte[] buffer = new byte[4096];
+                int readBytes;
+                while ((readBytes = in.read(buffer)) > 0) {
+                    f.write(buffer, 0, readBytes);
+                }
+            }
+            return outFile;
+        } catch (IOException e) {
+            showErrorDialogAndQuit("Error saving file:\n\n" + e);
+            Log.e("termux", "Error saving file", e);
+            return null;
+        }
+    }
+
+    void handleUrlAndFinish(final String url) {
+        final File urlOpenerProgramFile = new File(URL_OPENER_PROGRAM);
+        if (!urlOpenerProgramFile.isFile()) {
+            showErrorDialogAndQuit("The following file does not exist:\n$HOME/bin/termux-url-opener\n\n"
+                + "Create this file as a script or a symlink - it will be called with the shared URL as only argument.");
+            return;
+        }
+
+        // Do this for the user if necessary:
+        //noinspection ResultOfMethodCallIgnored
+        urlOpenerProgramFile.setExecutable(true);
+
+        final Uri urlOpenerProgramUri = new Uri.Builder().scheme("file").path(URL_OPENER_PROGRAM).build();
+
+        Intent executeIntent = new Intent(TermuxService.ACTION_EXECUTE, urlOpenerProgramUri);
+        executeIntent.setClass(TermuxFileReceiverActivity.this, TermuxService.class);
+        executeIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, new String[]{url});
+        startService(executeIntent);
+        finish();
+    }
+
+}
--- a/app/src/main/java/com/termux/terminal/ByteQueue.java
+++ b/app/src/main/java/com/termux/terminal/ByteQueue.java
@@ -53,7 +53,7 @@ final class ByteQueue {

    /**
     * Attempt to write the specified portion of the provided buffer to the queue.
-	 * 
+     * <p/>
     * Returns whether the output was totally written, false if it was closed before.
     */
    public boolean write(byte[] buffer, int offset, int lengthToWrite) {
--- a/app/src/main/java/com/termux/terminal/JNI.java
+++ b/app/src/main/java/com/termux/terminal/JNI.java
@@ -12,23 +12,18 @@ final class JNI {
    /**
     * Create a subprocess. Differs from {@link ProcessBuilder} in that a pseudoterminal is used to communicate with the
     * subprocess.
-	 * 
+     * <p/>
     * Callers are responsible for calling {@link #close(int)} on the returned file descriptor.
     *
-	 * @param cmd
-	 *            The command to execute
-	 * @param cwd
-	 *            The current working directory for the executed command
-	 * @param args
-	 *            An array of arguments to the command
-	 * @param envVars
-	 *            An array of strings of the form "VAR=value" to be added to the environment of the process
-	 * @param processId
-	 *            A one-element array to which the process ID of the started process will be written.
+     * @param cmd       The command to execute
+     * @param cwd       The current working directory for the executed command
+     * @param args      An array of arguments to the command
+     * @param envVars   An array of strings of the form "VAR=value" to be added to the environment of the process
+     * @param processId A one-element array to which the process ID of the started process will be written.
     * @return the file descriptor resulting from opening /dev/ptmx master device. The sub process will have opened the
     * slave device counterpart (/dev/pts/$N) and have it as stdint, stdout and stderr.
     */
-	public static native int createSubprocess(String cmd, String cwd, String[] args, String[] envVars, int[] processId);
+    public static native int createSubprocess(String cmd, String cwd, String[] args, String[] envVars, int[] processId, int rows, int columns);

    /** Set the window size for a given pty, which allows connected programs to learn how large their screen is. */
    public static native void setPtyWindowSize(int fd, int rows, int cols);
@@ -40,15 +35,6 @@ final class JNI {
     */
    public static native int waitFor(int processId);

-	/**
-	 * Send SIGHUP to a process group.
-	 * 
-	 * There exists a kill(2) system call wrapper in {@link android.os.Process#sendSignal(int, int)}, but that makes a
-	 * "if (pid > 0)" check so cannot be used for sending to a process group:
-	 * https://android.googlesource.com/platform/frameworks/base/+/donut-release/core/jni/android_util_Process.cpp
-	 */
-	public static native void hangupProcessGroup(int processId);
-
    /** Close a file descriptor through the close(2) system call. */
    public static native void close(int fileDescriptor);

--- a/app/src/main/java/com/termux/terminal/KeyHandler.java
+++ b/app/src/main/java/com/termux/terminal/KeyHandler.java
@@ -1,5 +1,9 @@
 package com.termux.terminal;

+import java.util.HashMap;
+import java.util.Map;
+
+import static android.view.KeyEvent.KEYCODE_BACK;
 import static android.view.KeyEvent.KEYCODE_BREAK;
 import static android.view.KeyEvent.KEYCODE_DEL;
 import static android.view.KeyEvent.KEYCODE_DPAD_CENTER;
@@ -22,6 +26,7 @@ import static android.view.KeyEvent.KEYCODE_F7;
 import static android.view.KeyEvent.KEYCODE_F8;
 import static android.view.KeyEvent.KEYCODE_F9;
 import static android.view.KeyEvent.KEYCODE_FORWARD_DEL;
+import static android.view.KeyEvent.KEYCODE_HOME;
 import static android.view.KeyEvent.KEYCODE_INSERT;
 import static android.view.KeyEvent.KEYCODE_MOVE_END;
 import static android.view.KeyEvent.KEYCODE_NUMPAD_0;
@@ -45,14 +50,9 @@ import static android.view.KeyEvent.KEYCODE_NUMPAD_SUBTRACT;
 import static android.view.KeyEvent.KEYCODE_NUM_LOCK;
 import static android.view.KeyEvent.KEYCODE_PAGE_DOWN;
 import static android.view.KeyEvent.KEYCODE_PAGE_UP;
+import static android.view.KeyEvent.KEYCODE_SPACE;
 import static android.view.KeyEvent.KEYCODE_SYSRQ;
 import static android.view.KeyEvent.KEYCODE_TAB;
-import static android.view.KeyEvent.KEYCODE_HOME;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import android.view.KeyEvent;

 public final class KeyHandler {

@@ -61,6 +61,7 @@ public final class KeyHandler {
    public static final int KEYMOD_SHIFT = 0x20000000;

    private static final Map<String, Integer> TERMCAP_TO_KEYCODE = new HashMap<>();
+
    static {
        // terminfo: http://pubs.opengroup.org/onlinepubs/7990989799/xcurses/terminfo.html
        // termcap: http://man7.org/linux/man-pages/man5/termcap.5.html
@@ -97,7 +98,7 @@ public final class KeyHandler {
        TERMCAP_TO_KEYCODE.put("kb", KEYCODE_DEL); // backspace key

        TERMCAP_TO_KEYCODE.put("kd", KEYCODE_DPAD_DOWN); // terminfo=kcud1, down-arrow key
-		TERMCAP_TO_KEYCODE.put("kh", KeyEvent.KEYCODE_HOME);
+        TERMCAP_TO_KEYCODE.put("kh", KEYCODE_HOME);
        TERMCAP_TO_KEYCODE.put("kl", KEYCODE_DPAD_LEFT);
        TERMCAP_TO_KEYCODE.put("kr", KEYCODE_DPAD_RIGHT);

@@ -106,10 +107,10 @@ public final class KeyHandler {
        // t_K3 <kPageUp> keypad page-up key
        // t_K4 <kEnd> keypad end key
        // t_K5 <kPageDown> keypad page-down key
-		TERMCAP_TO_KEYCODE.put("K1", KeyEvent.KEYCODE_HOME);
-		TERMCAP_TO_KEYCODE.put("K3", KeyEvent.KEYCODE_PAGE_UP);
-		TERMCAP_TO_KEYCODE.put("K4", KeyEvent.KEYCODE_MOVE_END);
-		TERMCAP_TO_KEYCODE.put("K5", KeyEvent.KEYCODE_PAGE_DOWN);
+        TERMCAP_TO_KEYCODE.put("K1", KEYCODE_HOME);
+        TERMCAP_TO_KEYCODE.put("K3", KEYCODE_PAGE_UP);
+        TERMCAP_TO_KEYCODE.put("K4", KEYCODE_MOVE_END);
+        TERMCAP_TO_KEYCODE.put("K5", KEYCODE_PAGE_DOWN);

        TERMCAP_TO_KEYCODE.put("ku", KEYCODE_DPAD_UP);

@@ -161,7 +162,7 @@ public final class KeyHandler {
            case KEYCODE_DPAD_LEFT:
                return (keyMode == 0) ? (cursorApp ? "\033OD" : "\033[D") : transformForModifiers("\033[1", keyMode, 'D');

-		case KeyEvent.KEYCODE_HOME:
+            case KEYCODE_HOME:
                return (keyMode == 0) ? (cursorApp ? "\033OH" : "\033[H") : transformForModifiers("\033[1", keyMode, 'H');
            case KEYCODE_MOVE_END:
                return (keyMode == 0) ? (cursorApp ? "\033OF" : "\033[F") : transformForModifiers("\033[1", keyMode, 'F');
@@ -208,7 +209,7 @@ public final class KeyHandler {
                return "\033[34~"; // Pause/Break

            case KEYCODE_ESCAPE:
-		case KeyEvent.KEYCODE_BACK:
+            case KEYCODE_BACK:
                return "\033";

            case KEYCODE_INSERT:
@@ -224,12 +225,13 @@ public final class KeyHandler {
            case KEYCODE_PAGE_DOWN:
                return "\033[6~";
            case KEYCODE_DEL:
-			// Yes, this needs to U+007F and not U+0008!
-			return "\u007F";
+                String prefix = ((keyMode & KEYMOD_ALT) == 0) ? "" : "\033";
+                // Just do what xterm and gnome-terminal does:
+                return prefix + (((keyMode & KEYMOD_CTRL) == 0) ? "\u007F" : "\u0008");
            case KEYCODE_NUM_LOCK:
                return "\033OP";

-		case KeyEvent.KEYCODE_SPACE:
+            case KEYCODE_SPACE:
                // If ctrl is not down, return null so that it goes through normal input processing (which may e.g. cause a
                // combining accent to be written):
                return ((keyMode & KEYMOD_CTRL) == 0) ? null : "\0";
--- a/app/src/main/java/com/termux/terminal/TerminalBuffer.java
+++ b/app/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/>
 * See {@link #externalToInternalRow(int)} for how to map from logical screen rows to array indices.
 */
 public final class TerminalBuffer {
@@ -21,12 +21,9 @@ public final class TerminalBuffer {
    /**
     * Create a transcript screen.
     *
-	 * @param columns
-	 *            the width of the screen in characters.
-	 * @param totalRows
-	 *            the height of the entire text area, in rows of text.
-	 * @param screenRows
-	 *            the height of just the screen, not including the transcript that holds lines that have scrolled off
+     * @param columns    the width of the screen in characters.
+     * @param totalRows  the height of the entire text area, in rows of text.
+     * @param screenRows the height of just the screen, not including the transcript that holds lines that have scrolled off
     *                   the top of the screen.
     */
    public TerminalBuffer(int columns, int totalRows, int screenRows) {
@@ -61,6 +58,10 @@ public final class TerminalBuffer {
            TerminalRow lineObject = mLines[externalToInternalRow(row)];
            int x1Index = lineObject.findStartOfColumn(x1);
            int x2Index = (x2 < mColumns) ? lineObject.findStartOfColumn(x2) : lineObject.getSpaceUsed();
+            if (x2Index == x1Index) {
+                // Selected the start of a wide character.
+                x2Index = lineObject.findStartOfColumn(x2 + 1);
+            }
            char[] line = lineObject.mText;
            int lastPrintingCharIndex = -1;
            int i;
@@ -71,10 +72,11 @@ public final class TerminalBuffer {
            } else {
                for (i = x1Index; i < x2Index; ++i) {
                    char c = line[i];
-					if (c != ' ' && !Character.isLowSurrogate(c)) lastPrintingCharIndex = i;
+                    if (c != ' ') lastPrintingCharIndex = i;
                }
            }
-			if (lastPrintingCharIndex != -1) builder.append(line, x1Index, lastPrintingCharIndex - x1Index + 1);
+            if (lastPrintingCharIndex != -1)
+                builder.append(line, x1Index, lastPrintingCharIndex - x1Index + 1);
            if (!rowLineWrap && row < selY2 && row < mScreenRows - 1) builder.append('\n');
        }
        return builder.toString();
@@ -90,15 +92,15 @@ 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 ]
@@ -108,8 +110,7 @@ public final class TerminalBuffer {
     * [ mScreenRows-1                  ]           [ mScreenFirstRow + mScreenRows-1         ]
     * </pre>
     *
-	 * @param externalRow
-	 *            a row in the external coordinate system.
+     * @param externalRow a row in the external coordinate system.
     * @return The row corresponding to the input argument in the private coordinate system.
     */
    public int externalToInternalRow(int externalRow) {
@@ -123,20 +124,21 @@ public final class TerminalBuffer {
        mLines[externalToInternalRow(row)].mLineWrap = true;
    }

-	private boolean getLineWrap(int row) {
+    public boolean getLineWrap(int row) {
        return mLines[externalToInternalRow(row)].mLineWrap;
    }

+    public void clearLineWrap(int row) {
+        mLines[externalToInternalRow(row)].mLineWrap = false;
+    }
+
    /**
     * Resize the screen which this transcript backs. Currently, this only works if the number of columns does not
     * change or the rows expand (that is, it only works when shrinking the number of rows).
     *
-	 * @param newColumns
-	 *            The number of columns the screen should have.
-	 * @param newRows
-	 *            The number of rows the screen should have.
-	 * @param cursor
-	 *            An int[2] containing the (column, row) cursor location.
+     * @param newColumns The number of columns the screen should have.
+     * @param newRows    The number of rows the screen should have.
+     * @param cursor     An int[2] containing the (column, row) cursor location.
     */
    public void resize(int newColumns, int newRows, int newTotalRows, int[] cursor, int currentStyle, boolean altScreen) {
        // newRows > mTotalRows should not normally happen since mTotalRows is TRANSCRIPT_ROWS (10000):
@@ -230,7 +232,8 @@ public final class TerminalBuffer {
                } else {
                    for (int i = 0; i < oldLine.getSpaceUsed(); i++)
                        // NEWLY INTRODUCED BUG! Should not index oldLine.mStyle with char indices
-						if (oldLine.mText[i] != ' '/* || oldLine.mStyle[i] != currentStyle */) lastNonSpaceIndex = i + 1;
+                        if (oldLine.mText[i] != ' '/* || oldLine.mStyle[i] != currentStyle */)
+                            lastNonSpaceIndex = i + 1;
                }

                int currentOldCol = 0;
@@ -294,10 +297,8 @@ public final class TerminalBuffer {
     * Block copy lines and associated metadata from one location to another in the circular buffer, taking wraparound
     * into account.
     *
-	 * @param srcInternal
-	 *            The first line to be copied.
-	 * @param len
-	 *            The number of lines to be copied.
+     * @param srcInternal The first line to be copied.
+     * @param len         The number of lines to be copied.
     */
    private void blockCopyLinesDown(int srcInternal, int len) {
        if (len == 0) return;
@@ -316,12 +317,9 @@ public final class TerminalBuffer {
    /**
     * Scroll the screen down one line. To scroll the whole screen of a 24 line screen, the arguments would be (0, 24).
     *
-	 * @param topMargin
-	 *            First line that is scrolled.
-	 * @param bottomMargin
-	 *            One line after the last line that is scrolled.
-	 * @param style
-	 *            the style for the newly exposed line.
+     * @param topMargin    First line that is scrolled.
+     * @param bottomMargin One line after the last line that is scrolled.
+     * @param style        the style for the newly exposed line.
     */
    public void scrollDownOneLine(int topMargin, int bottomMargin, int style) {
        if (topMargin > bottomMargin - 1 || topMargin < 0 || bottomMargin > mScreenRows)
@@ -352,18 +350,12 @@ public final class TerminalBuffer {
     * of the source and destination must be within the bounds of the screen, or else an InvalidParameterException will
     * be thrown.
     *
-	 * @param sx
-	 *            source X coordinate
-	 * @param sy
-	 *            source Y coordinate
-	 * @param w
-	 *            width
-	 * @param h
-	 *            height
-	 * @param dx
-	 *            destination X coordinate
-	 * @param dy
-	 *            destination Y coordinate
+     * @param sx source X coordinate
+     * @param sy source Y coordinate
+     * @param w  width
+     * @param h  height
+     * @param dx destination X coordinate
+     * @param dy destination Y coordinate
     */
    public void blockCopy(int sx, int sy, int w, int h, int dx, int dy) {
        if (w == 0) return;
--- a/app/src/main/java/com/termux/terminal/TerminalColorScheme.java
+++ b/app/src/main/java/com/termux/terminal/TerminalColorScheme.java
@@ -65,7 +65,7 @@ public final class TerminalColorScheme {
        reset();
    }

-	public void reset() {
+    private void reset() {
        System.arraycopy(DEFAULT_COLORSCHEME, 0, mDefaultColors, 0, TextStyle.NUM_INDEXED_COLORS);
    }

@@ -93,7 +93,8 @@ public final class TerminalColorScheme {
            }

            int colorValue = TerminalColors.parse(value);
-			if (colorValue == 0) throw new IllegalArgumentException("Property '" + key + "' has invalid color: '" + value + "'");
+            if (colorValue == 0)
+                throw new IllegalArgumentException("Property '" + key + "' has invalid color: '" + value + "'");

            mDefaultColors[colorIndex] = colorValue;
        }
--- a/app/src/main/java/com/termux/terminal/TerminalColors.java
+++ b/app/src/main/java/com/termux/terminal/TerminalColors.java
@@ -29,7 +29,7 @@ public final class TerminalColors {

    /**
     * Parse color according to http://manpages.ubuntu.com/manpages/intrepid/man3/XQueryColor.3.html
-	 * 
+     * <p/>
     * Highest bit is set if successful, so return value is 0xFF${R}${G}${B}. Return 0 if failed.
     */
    static int parse(String c) {
--- a/app/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/app/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1,18 +1,18 @@
 package com.termux.terminal;

+import android.util.Base64;
+import android.util.Log;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Stack;

-import android.util.Base64;
-import android.util.Log;
-
 /**
 * Renders text into a screen. Contains all the terminal-specific knowledge and state. Emulates a subset of the X Window
 * System xterm terminal, which in turn is an emulator for a subset of the Digital Equipment Corporation vt100 terminal.
- * 
+ * <p/>
 * References:
 * <ul>
 * <li>http://invisible-island.net/xterm/ctlseqs/ctlseqs.html</li>
@@ -33,8 +33,7 @@ public final class TerminalEmulator {
    private static final boolean LOG_ESCAPE_SEQUENCES = false;

    public static final int MOUSE_LEFT_BUTTON = 0;
-	public static final int MOUSE_MIDDLE_BUTTON = 1;
-	public static final int MOUSE_RIGHT_BUTTON = 2;
+
    /** Mouse moving while having left mouse button pressed. */
    public static final int MOUSE_LEFT_BUTTON_MOVED = 32;
    public static final int MOUSE_WHEELUP_BUTTON = 64;
@@ -146,7 +145,7 @@ public final class TerminalEmulator {
    /**
     * The alternate screen buffer, exactly as large as the display and contains no additional saved lines (so that when
     * the alternate screen buffer is active, you cannot scroll back to view saved lines).
-	 * 
+     * <p/>
     * See http://www.xfree86.org/current/ctlseqs.html#The%20Alternate%20Screen%20Buffer
     */
    final TerminalBuffer mAltBuffer;
@@ -219,7 +218,7 @@ public final class TerminalEmulator {
     */
    private int mScrollCounter = 0;

-	private int mUtf8ToFollow, mUtf8Index;
+    private byte mUtf8ToFollow, mUtf8Index;
    private final byte[] mUtf8InputBuffer = new byte[4];

    public final TerminalColors mColors = new TerminalColors();
@@ -295,8 +294,7 @@ public final class TerminalEmulator {
    }

    /**
-	 * @param mouseButton
-	 *            one of the MOUSE_* constants of this class.
+     * @param mouseButton one of the MOUSE_* constants of this class.
     */
    public void sendMouseEvent(int mouseButton, int column, int row, boolean pressed) {
        if (mouseButton == MOUSE_LEFT_BUTTON_MOVED && !isDecsetInternalBitSet(DECSET_BIT_MOUSE_TRACKING_BUTTON_EVENT)) {
@@ -391,10 +389,8 @@ public final class TerminalEmulator {
    /**
     * Accept bytes (typically from the pseudo-teletype) and process them.
     *
-	 * @param buffer
-	 *            a byte array containing the bytes to be processed
-	 * @param length
-	 *            the number of bytes in the array to process
+     * @param buffer a byte array containing the bytes to be processed
+     * @param length the number of bytes in the array to process
     */
    public void append(byte[] buffer, int length) {
        for (int i = 0; i < length; i++)
@@ -425,7 +421,11 @@ public final class TerminalEmulator {
                        processCodePoint(/* escape (hexadecimal=0x1B, octal=033): */27);
                        processCodePoint((codePoint & 0x7F) + 0x40);
                    } else {
-						if (Character.UNASSIGNED == Character.getType(codePoint)) codePoint = UNICODE_REPLACEMENT_CHAR;
+                        switch (Character.getType(codePoint)) {
+                            case Character.UNASSIGNED:
+                            case Character.SURROGATE:
+                                codePoint = UNICODE_REPLACEMENT_CHAR;
+                        }
                        processCodePoint(codePoint);
                    }
                }
@@ -471,15 +471,27 @@ public final class TerminalEmulator {
                else
                    mSession.onBell();
                break;
-		case 8: // BS
-			setCursorCol(Math.max(mLeftMargin, mCursorCol - 1));
-			break;
-		case 9: // Horizontal tab - move to next tab stop, but not past edge of screen
-			int nextTabStop = nextTabStop(1);
-			while (mCursorCol < nextTabStop) {
-				// Emit newlines to get background color right.
-				processCodePoint(' ');
+            case 8: // Backspace (BS, ^H).
+                if (mLeftMargin == mCursorCol) {
+                    // Jump to previous line if it was auto-wrapped.
+                    int previousRow = mCursorRow - 1;
+                    if (previousRow >= 0 && mScreen.getLineWrap(previousRow)) {
+                        mScreen.clearLineWrap(previousRow);
+                        setCursorRowCol(previousRow, mRightMargin - 1);
                    }
+                } else {
+                    setCursorCol(mCursorCol - 1);
+                }
+                break;
+            case 9: // Horizontal tab (HT, \t) - move to next tab stop, but not past edge of screen
+                // XXX: Should perhaps use color if writing to new cells. Try with
+                //       printf "\033[41m\tXX\033[0m\n"
+                // The OSX Terminal.app colors the spaces from the tab red, but xterm does not.
+                // Note that Terminal.app only colors on new cells, in e.g.
+                //       printf "\033[41m\t\r\033[42m\tXX\033[0m\n"
+                // the first cells are created with a red background, but when tabbing over
+                // them again with a green background they are not overwritten.
+                mCursorCol = nextTabStop(1);
                break;
            case 10: // Line feed (LF, \n).
            case 11: // Vertical tab (VT, \v).
@@ -882,7 +894,8 @@ public final class TerminalEmulator {
                        }
                    }
                } else {
-				if (LOG_ESCAPE_SEQUENCES) Log.e(EmulatorDebug.LOG_TAG, "Unrecognized device control string: " + dcs);
+                    if (LOG_ESCAPE_SEQUENCES)
+                        Log.e(EmulatorDebug.LOG_TAG, "Unrecognized device control string: " + dcs);
                }
                finishSequence();
            }
@@ -908,8 +921,9 @@ public final class TerminalEmulator {
    /** Process byte while in the {@link #ESC_CSI_QUESTIONMARK} escape state. */
    private void doCsiQuestionMark(int b) {
        switch (b) {
-		case 'J': // Selective erase in display (DECSED - http://www.vt100.net/docs/vt510-rm/DECSED).
-		case 'K': // Selective erase in line (DECSEL - http://vt100.net/docs/vt510-rm/DECSEL).
+            case 'J': // Selective erase in display (DECSED) - http://www.vt100.net/docs/vt510-rm/DECSED.
+            case 'K': // Selective erase in line (DECSEL) - http://vt100.net/docs/vt510-rm/DECSEL.
+                mAboutToAutoWrap = false;
                int fillChar = ' ';
                int startCol = -1;
                int startRow = -1;
@@ -1070,7 +1084,8 @@ public final class TerminalEmulator {
                    // Check if buffer size needs to be updated:
                    if (resized) resizeScreen();
                    // Clear new screen if alt buffer:
-				if (newScreen == mAltBuffer) newScreen.blockSet(0, 0, mColumns, mRows, ' ', getStyle());
+                    if (newScreen == mAltBuffer)
+                        newScreen.blockSet(0, 0, mColumns, mRows, ' ', getStyle());
                }
                break;
            }
@@ -1230,6 +1245,11 @@ public final class TerminalEmulator {
                    mScreen.blockSet(mRightMargin - 1, mTopMargin, 1, rows, ' ', TextStyle.encode(mForeColor, mBackColor, 0));
                }
                break;
+            case 'c': // RIS - Reset to Initial State (http://vt100.net/docs/vt510-rm/RIS).
+                reset();
+                blockClear(0, 0, mColumns, mRows);
+                setCursorPosition(0, 0);
+                break;
            case 'D': // INDEX
                doLinefeed();
                break;
@@ -1322,9 +1342,8 @@ public final class TerminalEmulator {
                continueSequence(ESC_CSI_ARGS_ASTERIX);
                break;
            case '@': {
-			// ESC [ Pn @ - ICH Insert Characters.
-			// "This control function inserts one or more space (SP) characters starting at the cursor position."
-			// http://www.vt100.net/docs/vt510-rm/ICH
+                // "CSI{n}@" - Insert ${n} space characters (ICH) - http://www.vt100.net/docs/vt510-rm/ICH.
+                mAboutToAutoWrap = false;
                int columnsAfterCursor = mColumns - mCursorCol;
                int spacesToInsert = Math.min(getArg0(1), columnsAfterCursor);
                int charsToMove = columnsAfterCursor - spacesToInsert;
@@ -1361,7 +1380,7 @@ public final class TerminalEmulator {
            case 'I': // Cursor Horizontal Forward Tabulation (CHT). Move the active position n tabs forward.
                setCursorCol(nextTabStop(getArg0(1)));
                break;
-		case 'J': // ESC [ Pn J - ED - Erase in Display
+            case 'J': // "${CSI}${0,1,2}J" - Erase in Display (ED)
                // ED ignores the scrolling margins.
                switch (getArg0(0)) {
                    case 0: // Erase from the active position to the end of the screen, inclusive (default).
@@ -1378,8 +1397,9 @@ public final class TerminalEmulator {
                        break;
                    default:
                        unknownSequence(b);
-				break;
+                        return;
                }
+                mAboutToAutoWrap = false;
                break;
            case 'K': // "CSI{n}K" - Erase in line (EL).
                switch (getArg0(0)) {
@@ -1394,8 +1414,9 @@ public final class TerminalEmulator {
                        break;
                    default:
                        unknownSequence(b);
-				break;
+                        return;
                }
+                mAboutToAutoWrap = false;
                break;
            case 'L': // "${CSI}{N}L" - insert ${N} lines (IL).
            {
@@ -1408,6 +1429,7 @@ public final class TerminalEmulator {
            break;
            case 'M': // "${CSI}${N}M" - delete N lines (DL).
            {
+                mAboutToAutoWrap = false;
                int linesAfterCursor = mBottomMargin - mCursorRow;
                int linesToDelete = Math.min(getArg0(1), linesAfterCursor);
                int linesToMove = linesAfterCursor - linesToDelete;
@@ -1422,6 +1444,7 @@ public final class TerminalEmulator {
                // As characters are deleted, the remaining characters between the cursor and right margin move to the left.
                // Character attributes move with the characters. The terminal adds blank spaces with no visual character
                // attributes at the right margin. DCH has no effect outside the scrolling margins."
+                mAboutToAutoWrap = false;
                int cellsAfterCursor = mColumns - mCursorCol;
                int cellsToDelete = Math.min(getArg0(1), cellsAfterCursor);
                int cellsToMove = cellsAfterCursor - cellsToDelete;
@@ -1444,7 +1467,7 @@ public final class TerminalEmulator {
                    final int linesToScrollArg = getArg0(1);
                    final int linesBetweenTopAndBottomMargins = mBottomMargin - mTopMargin;
                    final int linesToScroll = Math.min(linesBetweenTopAndBottomMargins, linesToScrollArg);
-				mScreen.blockCopy(0, mTopMargin, mColumns, linesBetweenTopAndBottomMargins - linesToScroll, 0, linesToScroll);
+                    mScreen.blockCopy(0, mTopMargin, mColumns, linesBetweenTopAndBottomMargins - linesToScroll, 0, mTopMargin + linesToScroll);
                    blockClear(0, mTopMargin, mColumns, linesToScroll);
                } else {
                    // "${CSI}${func};${startx};${starty};${firstrow};${lastrow}T" - initiate highlight mouse tracking.
@@ -1452,6 +1475,7 @@ public final class TerminalEmulator {
                }
                break;
            case 'X': // "${CSI}${N}X" - Erase ${N:=1} character(s) (ECH). FIXME: Clears character attributes?
+                mAboutToAutoWrap = false;
                mScreen.blockSet(mCursorCol, mCursorRow, Math.min(getArg0(1), mColumns - mCursorCol), 1, ' ', getStyle());
                break;
            case 'Z': // Cursor Backward Tabulation (CBT). Move the active position n tabs backward.
@@ -1696,7 +1720,8 @@ public final class TerminalEmulator {
                                mBackColor = color;
                            }
                        } else {
-							if (LOG_ESCAPE_SEQUENCES) Log.w(EmulatorDebug.LOG_TAG, "Invalid color index: " + color);
+                            if (LOG_ESCAPE_SEQUENCES)
+                                Log.w(EmulatorDebug.LOG_TAG, "Invalid color index: " + color);
                        }
                    }
                }
@@ -1711,7 +1736,8 @@ public final class TerminalEmulator {
            } else if (code >= 100 && code <= 107) { // Bright background color (aixterm codes).
                mBackColor = code - 100 + 8;
            } else {
-				if (LOG_ESCAPE_SEQUENCES) Log.w(EmulatorDebug.LOG_TAG, String.format("SGR unknown code %d", code));
+                if (LOG_ESCAPE_SEQUENCES)
+                    Log.w(EmulatorDebug.LOG_TAG, String.format("SGR unknown code %d", code));
            }
        }
    }
@@ -1791,6 +1817,7 @@ public final class TerminalEmulator {
                                return;
                            } else {
                                mColors.tryParseColor(colorIndex, textParameter.substring(parsingPairStart, i));
+                                mSession.onColorsChanged();
                                colorIndex = -1;
                                parsingPairStart = -1;
                            }
@@ -1826,9 +1853,11 @@ public final class TerminalEmulator {
                                    + String.format(Locale.US, "%04x", b) + bellOrStringTerminator);
                            } else {
                                mColors.tryParseColor(specialIndex, colorSpec);
+                                mSession.onColorsChanged();
                            }
                            specialIndex++;
-						if (endOfInput || (specialIndex > TextStyle.COLOR_INDEX_CURSOR) || ++charIndex >= textParameter.length()) break;
+                            if (endOfInput || (specialIndex > TextStyle.COLOR_INDEX_CURSOR) || ++charIndex >= textParameter.length())
+                                break;
                            lastSemiIndex = charIndex;
                        } catch (NumberFormatException e) {
                            // Ignore.
@@ -1852,6 +1881,7 @@ public final class TerminalEmulator {
                // parameters are given, the entire table will be reset.
                if (textParameter.isEmpty()) {
                    mColors.reset();
+                    mSession.onColorsChanged();
                } else {
                    int lastIndex = 0;
                    for (int charIndex = 0; ; charIndex++) {
@@ -1860,6 +1890,7 @@ public final class TerminalEmulator {
                            try {
                                int colorToReset = Integer.parseInt(textParameter.substring(lastIndex, charIndex));
                                mColors.reset(colorToReset);
+                                mSession.onColorsChanged();
                                if (endOfInput) break;
                                charIndex++;
                                lastIndex = charIndex;
@@ -1874,6 +1905,7 @@ public final class TerminalEmulator {
            case 111: // Reset background color.
            case 112: // Reset cursor color.
                mColors.reset(TextStyle.COLOR_INDEX_FOREGROUND + (value - 110));
+                mSession.onColorsChanged();
                break;
            case 119: // Reset highlight color.
                break;
@@ -2045,8 +2077,7 @@ public final class TerminalEmulator {
    /**
     * Send a Unicode code point to the screen.
     *
-	 * @param codePoint
-	 *            The code point of the character to display
+     * @param codePoint The code point of the character to display
     */
    private void emitCodePoint(int codePoint) {
        if (mUseLineDrawingUsesG0 ? mUseLineDrawingG0 : mUseLineDrawingG1) {
@@ -2156,8 +2187,10 @@ public final class TerminalEmulator {

        final boolean autoWrap = isDecsetInternalBitSet(DECSET_BIT_AUTOWRAP);
        final int displayWidth = WcWidth.width(codePoint);
+        final boolean cursorInLastColumn = mCursorCol == mRightMargin - 1;

-		if (autoWrap && (mCursorCol == mRightMargin - 1 && ((mAboutToAutoWrap && displayWidth == 1) || displayWidth == 2))) {
+        if (autoWrap) {
+            if (cursorInLastColumn && ((mAboutToAutoWrap && displayWidth == 1) || displayWidth == 2)) {
                mScreen.setLineWrap(mCursorRow);
                mCursorCol = mLeftMargin;
                if (mCursorRow + 1 < mBottomMargin) {
@@ -2166,17 +2199,24 @@ public final class TerminalEmulator {
                    scrollDownOneLine();
                }
            }
+        } else if (cursorInLastColumn && displayWidth == 2) {
+            // The behaviour when a wide character is output with cursor in the last column when
+            // autowrap is disabled is not obvious - it's ignored here.
+            return;
+        }

        if (mInsertMode && displayWidth > 0) {
            // Move character to right one space.
            int destCol = mCursorCol + displayWidth;
-			if (destCol < mRightMargin) mScreen.blockCopy(mCursorCol, mCursorRow, mRightMargin - destCol, 1, destCol, mCursorRow);
+            if (destCol < mRightMargin)
+                mScreen.blockCopy(mCursorCol, mCursorRow, mRightMargin - destCol, 1, destCol, mCursorRow);
        }

        int offsetDueToCombiningChar = ((displayWidth <= 0 && mCursorCol > 0 && !mAboutToAutoWrap) ? 1 : 0);
        mScreen.setChar(mCursorCol - offsetDueToCombiningChar, mCursorRow, codePoint, getStyle());

-		if (autoWrap && displayWidth > 0) mAboutToAutoWrap = (mCursorCol == mRightMargin - displayWidth);
+        if (autoWrap && displayWidth > 0)
+            mAboutToAutoWrap = (mCursorCol == mRightMargin - displayWidth);

        mCursorCol = Math.min(mCursorCol + displayWidth, mRightMargin - 1);
    }
@@ -2241,6 +2281,7 @@ public final class TerminalEmulator {
        mUtf8Index = mUtf8ToFollow = 0;

        mColors.reset();
+        mSession.onColorsChanged();
    }

    public String getSelectedText(int x1, int y1, int x2, int y2) {
--- a/app/src/main/java/com/termux/terminal/TerminalOutput.java
+++ b/app/src/main/java/com/termux/terminal/TerminalOutput.java
@@ -23,4 +23,6 @@ public abstract class TerminalOutput {
    /** Notify the terminal client that a bell character (ASCII 7, bell, BEL, \a, ^G)) has been received. */
    public abstract void onBell();

+    public abstract void onColorsChanged();
+
 }
--- a/app/src/main/java/com/termux/terminal/TerminalRow.java
+++ b/app/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/>
 * The text in the row is stored in a char[] array, {@link #mText}, for quick access during rendering.
 */
 public final class TerminalRow {
@@ -184,6 +184,7 @@ public final class TerminalRow {
        mSpaceUsed += javaCharDifference;

        // Store char. A combining character is stored at the end of the existing contents so that it modifies them:
+        //noinspection ResultOfMethodCallIgnored - since we already now how many java chars is used.
        Character.toChars(codePoint, text, oldStartOfColumnIndex + (newIsCombining ? oldCharactersUsedForColumn : 0));

        if (oldCodePointDisplayWidth == 2 && newCodePointDisplayWidth == 1) {
--- a/app/src/main/java/com/termux/terminal/TerminalSession.java
+++ b/app/src/main/java/com/termux/terminal/TerminalSession.java
@@ -1,5 +1,13 @@
 package com.termux.terminal;

+import android.annotation.SuppressLint;
+import android.os.Handler;
+import android.os.Message;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+import android.util.Log;
+
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -9,20 +17,15 @@ import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;

-import android.annotation.SuppressLint;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
 /**
 * 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/>
 * NOTE: The terminal session may outlive the EmulatorView, so be careful with callbacks!
 */
 public final class TerminalSession extends TerminalOutput {
@@ -38,6 +41,9 @@ public final class TerminalSession extends TerminalOutput {
        void onClipboardText(TerminalSession session, String text);

        void onBell(TerminalSession session);
+
+        void onColorsChanged(TerminalSession session);
+
    }

    private static FileDescriptor wrapFileDescriptor(int fileDescriptor) {
@@ -82,14 +88,17 @@ public final class TerminalSession extends TerminalOutput {
    /** Callback which gets notified when a session finishes or changes title. */
    final SessionChangedCallback mChangeCallback;

-	/** The pid of the shell process or -1 if not running. */
+    /** The pid of the shell process. 0 if not started and -1 if finished running. */
    int mShellPid;
-	int mShellExitStatus = -1;
+
+    /** The exit status of the shell process. Only valid if ${@link #mShellPid} is -1. */
+    int mShellExitStatus;
+
    /**
     * The file descriptor referencing the master half of a pseudo-terminal pair, resulting from calling
-	 * {@link JNI#createSubprocess(String, String, String[], String[], int[])}.
+     * {@link JNI#createSubprocess(String, String, String[], String[], int[], int, int)}.
     */
-	final int mTerminalFileDescriptor;
+    private int mTerminalFileDescriptor;

    /** Set by the application for user identification of session, not by terminal. */
    public String mSessionName;
@@ -119,7 +128,7 @@ public final class TerminalSession extends TerminalOutput {
                    // Negated signal.
                    exitDescription += " with signal " + (-exitCode);
                }
-				exitDescription += "]";
+                exitDescription += " - press Enter to close]";

                byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
                mEmulator.append(bytesToWrite, bytesToWrite.length);
@@ -128,20 +137,26 @@ public final class TerminalSession extends TerminalOutput {
        }
    };

+    private final String mShellPath;
+    private final String mCwd;
+    private final String[] mArgs;
+    private final String[] mEnv;
+
    public TerminalSession(String shellPath, String cwd, String[] args, String[] env, SessionChangedCallback changeCallback) {
        mChangeCallback = changeCallback;

-		int[] processId = new int[1];
-		mTerminalFileDescriptor = JNI.createSubprocess(shellPath, cwd, args, env, processId);
-		mShellPid = processId[0];
+        this.mShellPath = shellPath;
+        this.mCwd = cwd;
+        this.mArgs = args;
+        this.mEnv = env;
    }

    /** Inform the attached pty of the new size and reflow or initialize the emulator. */
    public void updateSize(int columns, int rows) {
-		JNI.setPtyWindowSize(mTerminalFileDescriptor, rows, columns);
        if (mEmulator == null) {
            initializeEmulator(columns, rows);
        } else {
+            JNI.setPtyWindowSize(mTerminalFileDescriptor, rows, columns);
            mEmulator.resize(columns, rows);
        }
    }
@@ -154,13 +169,16 @@ public final class TerminalSession extends TerminalOutput {
    /**
     * Set the terminal emulator's window size and start terminal emulation.
     *
-	 * @param columns
-	 *            The number of columns in the terminal window.
-	 * @param rows
-	 *            The number of rows in the terminal window.
+     * @param columns The number of columns in the terminal window.
+     * @param rows    The number of rows in the terminal window.
     */
    public void initializeEmulator(int columns, int rows) {
        mEmulator = new TerminalEmulator(this, columns, rows, /* transcript= */5000);
+
+        int[] processId = new int[1];
+        mTerminalFileDescriptor = JNI.createSubprocess(mShellPath, mCwd, mArgs, mEnv, processId, rows, columns);
+        mShellPid = processId[0];
+
        final FileDescriptor terminalFileDescriptorWrapped = wrapFileDescriptor(mTerminalFileDescriptor);

        new Thread("TermSessionInputReader[pid=" + mShellPid + "]") {
@@ -176,10 +194,6 @@ public final class TerminalSession extends TerminalOutput {
                    }
                } catch (Exception e) {
                    // Ignore, just shutting down.
-				} finally {
-					// Now wait for process exit:
-					int processExitCode = JNI.waitFor(mShellPid);
-					mMainThreadHandler.sendMessage(mMainThreadHandler.obtainMessage(MSG_PROCESS_EXITED, processExitCode));
                }
            }
        }.start();
@@ -199,12 +213,21 @@ public final class TerminalSession extends TerminalOutput {
                }
            }
        }.start();
+
+        new Thread("TermSessionWaiter[pid=" + mShellPid + "]") {
+            @Override
+            public void run() {
+                int processExitCode = JNI.waitFor(mShellPid);
+                mMainThreadHandler.sendMessage(mMainThreadHandler.obtainMessage(MSG_PROCESS_EXITED, processExitCode));
+            }
+        }.start();
+
    }

    /** Write data to the shell process. */
    @Override
    public void write(byte[] data, int offset, int count) {
-		mTerminalToProcessIOQueue.write(data, offset, count);
+        if (mShellPid > 0) mTerminalToProcessIOQueue.write(data, offset, count);
    }

    /** Write the Unicode code point to the terminal encoded in UTF-8. */
@@ -259,18 +282,14 @@ public final class TerminalSession extends TerminalOutput {
        notifyScreenUpdate();
    }

-	/**
-	 * Finish this terminal session. Frees resources used by the terminal emulator and closes the attached
-	 * <code>InputStream</code> and <code>OutputStream</code>.
-	 */
+    /** Finish this terminal session by sending SIGKILL to the shell. */
    public void finishIfRunning() {
        if (isRunning()) {
-			JNI.hangupProcessGroup(mShellPid);
-			// Stop the reader and writer threads, and close the I/O streams. Note that
-			// cleanupResources() will be run later.
-			mTerminalToProcessIOQueue.close();
-			mProcessToTerminalIOQueue.close();
-			JNI.close(mTerminalFileDescriptor);
+            try {
+                Os.kill(mShellPid, OsConstants.SIGKILL);
+            } catch (ErrnoException e) {
+                Log.w("termux", "Failed sending SIGKILL: " + e.getMessage());
+            }
        }
    }

@@ -311,4 +330,13 @@ public final class TerminalSession extends TerminalOutput {
        mChangeCallback.onBell(this);
    }

+    @Override
+    public void onColorsChanged() {
+        mChangeCallback.onColorsChanged(this);
+    }
+
+    public int getPid() {
+        return mShellPid;
+    }
+
 }
--- a/app/src/main/java/com/termux/terminal/TextStyle.java
+++ b/app/src/main/java/com/termux/terminal/TextStyle.java
@@ -3,7 +3,7 @@ package com.termux.terminal;
 /**
 * Encodes effects, foreground and background colors into a 32 bit integer, which are stored for each cell in a terminal
 * row in {@link TerminalRow#mStyle}.
- * 
+ * <p/>
 * The foreground and background colors take 9 bits each, leaving (32-9-9)=14 bits for effect flags. Using 9 for now
 * (the different CHARACTER_ATTRIBUTE_* bits).
 */
@@ -18,7 +18,7 @@ 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/>
     * 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.
     */
--- a/app/src/main/java/com/termux/terminal/WcWidth.java
+++ b/app/src/main/java/com/termux/terminal/WcWidth.java
@@ -2,7 +2,7 @@ package com.termux.terminal;

 /**
 * wcwidth() implementation from http://git.musl-libc.org/cgit/musl/tree/src/ctype
- * 
+ * <p/>
 * Modified to return 0 instead of -1.
 */
 public final class WcWidth {
--- a/app/src/main/java/com/termux/view/GestureAndScaleRecognizer.java
+++ b/app/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 class GestureAndScaleRecognizer {
+public final class GestureAndScaleRecognizer {

    public interface Listener {
        boolean onSingleTapUp(MotionEvent e);
@@ -29,6 +29,7 @@ public class GestureAndScaleRecognizer {
    private final GestureDetector mGestureDetector;
    private final ScaleGestureDetector mScaleDetector;
    final Listener mListener;
+    boolean isAfterLongPress;

    public GestureAndScaleRecognizer(Context context, Listener listener) {
        mListener = listener;
@@ -52,6 +53,7 @@ public class GestureAndScaleRecognizer {
            @Override
            public void onLongPress(MotionEvent e) {
                mListener.onLongPress(e);
+                isAfterLongPress = true;
            }
        }, null, true /* ignoreMultitouch */);

@@ -88,9 +90,18 @@ public class GestureAndScaleRecognizer {
    public void onTouchEvent(MotionEvent event) {
        mGestureDetector.onTouchEvent(event);
        mScaleDetector.onTouchEvent(event);
-		if (event.getAction() == MotionEvent.ACTION_UP) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                isAfterLongPress = false;
+                break;
+            case MotionEvent.ACTION_UP:
+                if (!isAfterLongPress) {
+                    // This behaviour is desired when in e.g. vim with mouse events, where we do not
+                    // want to move the cursor when lifting finger after a long press.
                    mListener.onUp(event);
                }
+                break;
+        }
    }

    public boolean isInProgress() {
--- a/app/src/main/java/com/termux/view/TerminalKeyListener.java
+++ b/app/src/main/java/com/termux/view/TerminalKeyListener.java
@@ -1,20 +1,37 @@
 package com.termux.view;

+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;

+import com.termux.terminal.TerminalSession;
+
 /**
 * Input and scale listener which may be set on a {@link TerminalView} through
 * {@link TerminalView#setOnKeyListener(TerminalKeyListener)}.
+ * <p/>
+ * TODO: Rename to TerminalViewClient.
 */
 public interface TerminalKeyListener {

    /** Callback function on scale events according to {@link ScaleGestureDetector#getScaleFactor()}. */
    float onScale(float scale);

-	void onLongPress(MotionEvent e);
-
    /** On a single tap on the terminal if terminal mouse reporting not enabled. */
    void onSingleTapUp(MotionEvent e);

+    boolean shouldBackButtonBeMappedToEscape();
+
+    void copyModeChanged(boolean copyMode);
+
+    boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session);
+
+    boolean onKeyUp(int keyCode, KeyEvent e);
+
+    boolean readControlKey();
+
+    boolean readAltKey();
+
+    boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session);
+
 }
--- a/app/src/main/java/com/termux/view/TerminalRenderer.java
+++ b/app/src/main/java/com/termux/view/TerminalRenderer.java
@@ -13,7 +13,7 @@ import com.termux.terminal.WcWidth;

 /**
 * Renderer of a {@link TerminalEmulator} into a {@link Canvas}.
- * 
+ * <p/>
 * Saves font metrics, so needs to be recreated each time the typeface or font size changes.
 */
 final class TerminalRenderer {
@@ -64,8 +64,8 @@ final class TerminalRenderer {
        final TerminalBuffer screen = mEmulator.getScreen();
        final int[] palette = mEmulator.mColors.mCurrentColors;

-		int fillColor = palette[reverseVideo ? TextStyle.COLOR_INDEX_FOREGROUND : TextStyle.COLOR_INDEX_BACKGROUND];
-		canvas.drawColor(fillColor, PorterDuff.Mode.SRC);
+        if (reverseVideo)
+            canvas.drawColor(palette[TextStyle.COLOR_INDEX_FOREGROUND], PorterDuff.Mode.SRC);

        float heightOffset = mFontLineSpacingAndAscent;
        for (int row = topRow; row < endRow; row++) {
@@ -141,28 +141,17 @@ final class TerminalRenderer {
    }

    /**
-	 * @param canvas
-	 *            the canvas to render on
-	 * @param palette
-	 *            the color palette to look up colors from textStyle
-	 * @param y
-	 *            height offset into the canvas where to render the line: line * {@link #mFontLineSpacing}
-	 * @param startColumn
-	 *            the run offset in columns
-	 * @param runWidthColumns
-	 *            the run width in columns - this is computed from wcwidth() and may not be what the font measures to
-	 * @param text
-	 *            the java char array to render text from
-	 * @param startCharIndex
-	 *            index into the text array where to start
-	 * @param runWidthChars
-	 *            number of java characters from the text array to render
-	 * @param cursor
-	 *            true if rendering a cursor or selection
-	 * @param textStyle
-	 *            the background, foreground and effect encoded using {@link TextStyle}
-	 * @param reverseVideo
-	 *            if the screen is rendered with the global reverse video flag set
+     * @param canvas          the canvas to render on
+     * @param palette         the color palette to look up colors from textStyle
+     * @param y               height offset into the canvas where to render the line: line * {@link #mFontLineSpacing}
+     * @param startColumn     the run offset in columns
+     * @param runWidthColumns the run width in columns - this is computed from wcwidth() and may not be what the font measures to
+     * @param text            the java char array to render text from
+     * @param startCharIndex  index into the text array where to start
+     * @param runWidthChars   number of java characters from the text array to render
+     * @param cursor          true if rendering a cursor or selection
+     * @param textStyle       the background, foreground and effect encoded using {@link TextStyle}
+     * @param reverseVideo    if the screen is rendered with the global reverse video flag set
     */
    private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int startColumn, int runWidthColumns, int startCharIndex, int runWidthChars,
                             float mes, boolean cursor, int textStyle, boolean reverseVideo) {
@@ -205,7 +194,10 @@ final class TerminalRenderer {
            final boolean strikeThrough = (effect & TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH) != 0;
            final boolean dim = (effect & TextStyle.CHARACTER_ATTRIBUTE_DIM) != 0;

-			int foreColorARGB = palette[foreColor];
+            // Let bold have bright colors if applicable (one of the first 8):
+            final int actualForeColor = foreColor + (bold && foreColor < 8 ? 8 : 0);
+
+            int foreColorARGB = palette[actualForeColor];
            if (dim) {
                int red = (0xFF & (foreColorARGB >> 16));
                int green = (0xFF & (foreColorARGB >> 8));
--- a/app/src/main/java/com/termux/view/TerminalView.java
+++ b/app/src/main/java/com/termux/view/TerminalView.java
@@ -1,29 +1,26 @@
 package com.termux.view;

-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Properties;
-
-import com.termux.terminal.EmulatorDebug;
-import com.termux.terminal.KeyHandler;
-import com.termux.terminal.TerminalColors;
-import com.termux.terminal.TerminalEmulator;
-import com.termux.terminal.TerminalSession;
-
 import android.annotation.SuppressLint;
-import android.app.Activity;
+import android.annotation.TargetApi;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Rect;
 import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.ActionMode;
 import android.view.HapticFeedbackConstants;
 import android.view.InputDevice;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.BaseInputConnection;
@@ -31,6 +28,13 @@ 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;
+import com.termux.terminal.TerminalEmulator;
+import com.termux.terminal.TerminalSession;
+
 /** View displaying and interacting with a {@link TerminalSession}. */
 public final class TerminalView extends View {

@@ -49,12 +53,11 @@ public final class TerminalView extends View {
    /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
    int mTopRow;

-	/** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
-	boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
-
-	boolean mIsSelectingText = false;
-	int mSelXAnchor = -1, mSelYAnchor = -1;
+    boolean mIsSelectingText = false, mIsDraggingLeftSelection, mInitialTextSelection;
    int mSelX1 = -1, mSelX2 = -1, mSelY1 = -1, mSelY2 = -1;
+    float mSelectionDownX, mSelectionDownY;
+    private ActionMode mActionMode;
+    private BitmapDrawable mLeftSelectionHandle, mRightSelectionHandle;

    float mScaleFactor = 1.f;
    final GestureAndScaleRecognizer mGestureRecognizer;
@@ -76,22 +79,29 @@ public final class TerminalView extends View {
        super(context, attributes);
        mGestureRecognizer = new GestureAndScaleRecognizer(context, new GestureAndScaleRecognizer.Listener() {

+            boolean scrolledWithFinger;
+
            @Override
            public boolean onUp(MotionEvent e) {
                mScrollRemainder = 0.0f;
-				if (mEmulator != null && mEmulator.isMouseTrackingActive()) {
+                if (mEmulator != null && mEmulator.isMouseTrackingActive() && !mIsSelectingText && !scrolledWithFinger) {
                    // Quick event processing when mouse tracking is active - do not wait for check of double tapping
                    // for zooming.
                    sendMouseEventCode(e, TerminalEmulator.MOUSE_LEFT_BUTTON, true);
                    sendMouseEventCode(e, TerminalEmulator.MOUSE_LEFT_BUTTON, false);
                    return true;
                }
+                scrolledWithFinger = false;
                return false;
            }

            @Override
            public boolean onSingleTapUp(MotionEvent e) {
                if (mEmulator == null) return true;
+                if (mIsSelectingText) {
+                    toggleSelectingText(null);
+                    return true;
+                }
                requestFocus();
                if (!mEmulator.isMouseTrackingActive()) {
                    if (!e.isFromSource(InputDevice.SOURCE_MOUSE)) {
@@ -103,25 +113,27 @@ public final class TerminalView extends View {
            }

            @Override
-			public boolean onScroll(MotionEvent e2, float distanceX, float distanceY) {
-				if (mEmulator == null) return true;
-				if (mEmulator.isMouseTrackingActive() && e2.isFromSource(InputDevice.SOURCE_MOUSE)) {
+            public boolean onScroll(MotionEvent e, float distanceX, float distanceY) {
+                if (mEmulator == null || mIsSelectingText) return true;
+                if (mEmulator.isMouseTrackingActive() && e.isFromSource(InputDevice.SOURCE_MOUSE)) {
                    // If moving with mouse pointer while pressing button, report that instead of scroll.
                    // This means that we never report moving with button press-events for touch input,
                    // since we cannot just start sending these events without a starting press event,
                    // which we do not do for touch input, only mouse in onTouchEvent().
-					sendMouseEventCode(e2, TerminalEmulator.MOUSE_LEFT_BUTTON_MOVED, true);
+                    sendMouseEventCode(e, TerminalEmulator.MOUSE_LEFT_BUTTON_MOVED, true);
                } else {
+                    scrolledWithFinger = true;
                    distanceY += mScrollRemainder;
                    int deltaRows = (int) (distanceY / mRenderer.mFontLineSpacing);
                    mScrollRemainder = distanceY - deltaRows * mRenderer.mFontLineSpacing;
-					doScroll(e2, deltaRows);
+                    doScroll(e, deltaRows);
                }
                return true;
            }

            @Override
            public boolean onScale(float focusX, float focusY, float scale) {
+                if (mEmulator == null || mIsSelectingText) return true;
                mScaleFactor *= scale;
                mScaleFactor = mOnKeyListener.onScale(mScaleFactor);
                return true;
@@ -129,7 +141,7 @@ public final class TerminalView extends View {

            @Override
            public boolean onFling(final MotionEvent e2, float velocityX, float velocityY) {
-				if (mEmulator == null) return true;
+                if (mEmulator == null || mIsSelectingText) return true;
                // Do not start scrolling until last fling has been taken care of:
                if (!mScroller.isFinished()) return true;

@@ -176,9 +188,9 @@ public final class TerminalView extends View {

            @Override
            public void onLongPress(MotionEvent e) {
-				if (mEmulator != null && !mGestureRecognizer.isInProgress()) {
+                if (!mGestureRecognizer.isInProgress() && !mIsSelectingText) {
                    performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-					mOnKeyListener.onLongPress(e);
+                    toggleSelectingText(e);
                }
            }
        });
@@ -186,8 +198,7 @@ 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
+     * @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) {
@@ -197,8 +208,7 @@ public final class TerminalView extends View {
    /**
     * Attach a {@link TerminalSession} to this view.
     *
-	 * @param session
-	 *            The {@link TerminalSession} this view will be displaying.
+     * @param session The {@link TerminalSession} this view will be displaying.
     */
    public boolean attachSession(TerminalSession session) {
        if (session == mTermSession) return false;
@@ -218,71 +228,39 @@ public final class TerminalView extends View {

    @Override
    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-		// Make the IME run in a limited "generate key events" mode.
+        // Using InputType.TYPE_TEXT_VARIATION_URI avoids having an extra row of numbers on the
+        // Google keyboard. https://github.com/termux/termux-app/issues/87.
+        // It also makes the '/' keyboard more accessible, and makes some sense.
        //
        // If using just "TYPE_NULL", there is a problem with the "Google Pinyin Input" being in
        // word mode when used with the "En" tab available when the "Show English keyboard" option
        // is enabled - see https://github.com/termux/termux-packages/issues/25.
-		//
-		// Adding TYPE_TEXT_FLAG_NO_SUGGESTIONS fixes Pinyin Input, put causes Swype to be put in
-		// word mode... Using TYPE_TEXT_VARIATION_VISIBLE_PASSWORD fixes that.
-		//
-		// So a bit messy. If this gets too messy it's perhaps best resolved by reverting back to just
-		// "TYPE_NULL" and let the Pinyin Input english keyboard be in word mode.
-		outAttrs.inputType = InputType.TYPE_NULL | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+        // Adding TYPE_TEXT_FLAG_NO_SUGGESTIONS fixes Pinyin Input and removes the row of numbers
+        // on the Google keyboard. . It also causes Swype to be put in
+        // word mode, but using TYPE_TEXT_VARIATION_VISIBLE_PASSWORD would fix that. But for now
+        // use InputType.TYPE_TEXT_VARIATION_URI as it makes more sense.
+        outAttrs.inputType = InputType.TYPE_TEXT_VARIATION_URI;

        // Let part of the application show behind when in landscape:
        outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_FULLSCREEN;

        return new BaseInputConnection(this, true) {

-			@Override
-			public boolean beginBatchEdit() {
-				if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: beginBatchEdit()");
-				return true;
-			}
-
-			@Override
-			public boolean clearMetaKeyStates(int states) {
-				if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: clearMetaKeyStates(" + states + ")");
-				return true;
-			}
-
-			@Override
-			public boolean endBatchEdit() {
-				if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: endBatchEdit()");
-				return false;
-			}
-
            @Override
            public boolean finishComposingText() {
                if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: finishComposingText()");
+                commitText(getEditable(), 0);
+
+                // Clear the editable.
+                getEditable().clear();
+
                return true;
            }

-			@Override
-			public int getCursorCapsMode(int reqModes) {
-				if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: getCursorCapsMode(" + reqModes + ")");
-				int mode = 0;
-				if ((reqModes & TextUtils.CAP_MODE_CHARACTERS) != 0) {
-					mode |= TextUtils.CAP_MODE_CHARACTERS;
-				}
-				return mode;
-			}
-
-			@Override
-			public CharSequence getTextAfterCursor(int n, int flags) {
-				return "";
-			}
-
-			@Override
-			public CharSequence getTextBeforeCursor(int n, int flags) {
-				return "";
-			}
-
            @Override
            public boolean commitText(CharSequence text, int newCursorPosition) {
-				if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: commitText(\"" + text + "\", " + newCursorPosition + ")");
+                if (LOG_KEY_EVENTS)
+                    Log.i(EmulatorDebug.LOG_TAG, "IME: commitText(\"" + text + "\", " + newCursorPosition + ")");
                if (mEmulator == null) return true;
                final int textLengthInChars = text.length();
                for (int i = 0; i < textLengthInChars; i++) {
@@ -298,14 +276,40 @@ public final class TerminalView extends View {
                    } else {
                        codePoint = firstChar;
                    }
-					inputCodePoint(codePoint, false, false);
+
+                    boolean ctrlHeld = false;
+                    if (codePoint <= 31 && codePoint != 27) {
+                        // E.g. penti keyboard for ctrl input.
+                        ctrlHeld = true;
+                        switch (codePoint) {
+                            case 31:
+                                codePoint = '_';
+                                break;
+                            case 30:
+                                codePoint = '^';
+                                break;
+                            case 29:
+                                codePoint = ']';
+                                break;
+                            case 28:
+                                codePoint = '\\';
+                                break;
+                            default:
+                                codePoint += 96;
+                                break;
                        }
+                    }
+
+                    inputCodePoint(codePoint, ctrlHeld, false);
+                }
+
                return true;
            }

            @Override
            public boolean deleteSurroundingText(int leftLength, int rightLength) {
-				if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: deleteSurroundingText(" + leftLength + ", " + rightLength + ")");
+                if (LOG_KEY_EVENTS)
+                    Log.i(EmulatorDebug.LOG_TAG, "IME: deleteSurroundingText(" + leftLength + ", " + rightLength + ")");

                // Swype keyboard sometimes(?) sends this on backspace:
                if (leftLength == 0 && rightLength == 0) leftLength = 1;
@@ -315,6 +319,17 @@ public final class TerminalView extends View {
                return true;
            }

+            @Override
+            public boolean setComposingText(CharSequence text, int newCursorPosition) {
+                if (text.length() == 0) {
+                    // Avoid log spam "SpannableStringBuilder: SPAN_EXCLUSIVE_EXCLUSIVE spans cannot
+                    // have a zero length" when backspacing with the Google keyboard.
+                    getEditable().clear();
+                } else {
+                    super.setComposingText(text, newCursorPosition);
+                }
+                return true;
+            }
        };
    }

@@ -336,19 +351,35 @@ public final class TerminalView extends View {
    public void onScreenUpdated() {
        if (mEmulator == null) return;

+        boolean skipScrolling = false;
        if (mIsSelectingText) {
+            // Do not scroll when selecting text.
+            int rowsInHistory = mEmulator.getScreen().getActiveTranscriptRows();
            int rowShift = mEmulator.getScrollCounter();
+            if (-mTopRow + rowShift > rowsInHistory) {
+                // .. unless we're hitting the end of history transcript, in which
+                // case we abort text selection and scroll to end.
+                toggleSelectingText(null);
+            } else {
+                skipScrolling = true;
+                mTopRow -= rowShift;
                mSelY1 -= rowShift;
                mSelY2 -= rowShift;
-			mSelYAnchor -= rowShift;
            }
-		mEmulator.clearScrollCounter();
+        }

-		if (mTopRow != 0) {
+        if (!skipScrolling && mTopRow != 0) {
            // Scroll down if not already there.
-			mTopRow = 0;
-			scrollTo(0, 0);
+            if (mTopRow < -3) {
+                // Awaken scroll bars only if scrolling a noticeable amount
+                // - we do not want visible scroll bars during normal typing
+                // of one row at a time.
+                awakenScrollBars();
            }
+            mTopRow = 0;
+        }
+
+        mEmulator.clearScrollCounter();

        invalidate();
    }
@@ -356,14 +387,19 @@ public final class TerminalView extends View {
    /**
     * Sets the text size, which in turn sets the number of rows and columns.
     *
-	 * @param textSize
-	 *            the new font size, in density-independent pixels.
+     * @param textSize the new font size, in density-independent pixels.
     */
    public void setTextSize(int textSize) {
        mRenderer = new TerminalRenderer(textSize, mRenderer == null ? Typeface.MONOSPACE : mRenderer.mTypeface);
        updateSize();
    }

+    public void setTypeface(Typeface newTypeface) {
+        mRenderer = new TerminalRenderer(mRenderer.mTextSize, newTypeface);
+        updateSize();
+        invalidate();
+    }
+
    @Override
    public boolean onCheckIsTextEditor() {
        return true;
@@ -423,78 +459,103 @@ public final class TerminalView extends View {

    @SuppressLint("ClickableViewAccessibility")
    @Override
+    @TargetApi(23)
    public boolean onTouchEvent(MotionEvent ev) {
        if (mEmulator == null) return true;
-		final boolean eventFromMouse = ev.isFromSource(InputDevice.SOURCE_MOUSE);
        final int action = ev.getAction();

-		if (eventFromMouse) {
-			if ((ev.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
+        if (mIsSelectingText) {
+            int cy = (int) (ev.getY() / mRenderer.mFontLineSpacing) + mTopRow;
+            int cx = (int) (ev.getX() / mRenderer.mFontWidth);
+
+            switch (action) {
+                case MotionEvent.ACTION_UP:
+                    mInitialTextSelection = false;
+                    break;
+                case MotionEvent.ACTION_DOWN:
+                    int distanceFromSel1 = Math.abs(cx - mSelX1) + Math.abs(cy - mSelY1);
+                    int distanceFromSel2 = Math.abs(cx - mSelX2) + Math.abs(cy - mSelY2);
+                    mIsDraggingLeftSelection = distanceFromSel1 <= distanceFromSel2;
+                    mSelectionDownX = ev.getX();
+                    mSelectionDownY = ev.getY();
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    if (mInitialTextSelection) break;
+                    float deltaX = ev.getX() - mSelectionDownX;
+                    float deltaY = ev.getY() - mSelectionDownY;
+                    int deltaCols = (int) Math.ceil(deltaX / mRenderer.mFontWidth);
+                    int deltaRows = (int) Math.ceil(deltaY / mRenderer.mFontLineSpacing);
+                    mSelectionDownX += deltaCols * mRenderer.mFontWidth;
+                    mSelectionDownY += deltaRows * mRenderer.mFontLineSpacing;
+                    if (mIsDraggingLeftSelection) {
+                        mSelX1 += deltaCols;
+                        mSelY1 += deltaRows;
+                    } else {
+                        mSelX2 += deltaCols;
+                        mSelY2 += deltaRows;
+                    }
+
+                    mSelX1 = Math.min(mEmulator.mColumns, Math.max(0, mSelX1));
+                    mSelX2 = Math.min(mEmulator.mColumns, Math.max(0, mSelX2));
+
+                    if (mSelY1 == mSelY2 && mSelX1 > mSelX2 || mSelY1 > mSelY2) {
+                        // Switch handles.
+                        mIsDraggingLeftSelection = !mIsDraggingLeftSelection;
+                        int tmpX1 = mSelX1, tmpY1 = mSelY1;
+                        mSelX1 = mSelX2;
+                        mSelY1 = mSelY2;
+                        mSelX2 = tmpX1;
+                        mSelY2 = tmpY1;
+                    }
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+                        mActionMode.invalidateContentRect();
+                    invalidate();
+                    break;
+                default:
+                    break;
+            }
+            mGestureRecognizer.onTouchEvent(ev);
+            return true;
+        } else if (ev.isFromSource(InputDevice.SOURCE_MOUSE)) {
+            if (ev.isButtonPressed(MotionEvent.BUTTON_SECONDARY)) {
                if (action == MotionEvent.ACTION_DOWN) showContextMenu();
                return true;
-			} else if (mEmulator.isMouseTrackingActive() && (ev.getAction() == MotionEvent.ACTION_DOWN || ev.getAction() == MotionEvent.ACTION_UP)) {
-				sendMouseEventCode(ev, TerminalEmulator.MOUSE_LEFT_BUTTON, ev.getAction() == MotionEvent.ACTION_DOWN);
-				return true;
-			} else if (!mEmulator.isMouseTrackingActive() && action == MotionEvent.ACTION_DOWN) {
-				// Start text selection with mouse. Note that the check against MotionEvent.ACTION_DOWN is
-				// important, since we otherwise would pick up secondary mouse button up actions.
-				mIsSelectingText = true;
+            } else if (ev.isButtonPressed(MotionEvent.BUTTON_TERTIARY)) {
+                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                ClipData clipData = clipboard.getPrimaryClip();
+                if (clipData != null) {
+                    CharSequence paste = clipData.getItemAt(0).coerceToText(getContext());
+                    if (!TextUtils.isEmpty(paste)) mEmulator.paste(paste.toString());
                }
-		} else if (!mIsSelectingText) {
+            } else if (mEmulator.isMouseTrackingActive()) { // BUTTON_PRIMARY.
+                switch (ev.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                    case MotionEvent.ACTION_UP:
+                        sendMouseEventCode(ev, TerminalEmulator.MOUSE_LEFT_BUTTON, ev.getAction() == MotionEvent.ACTION_DOWN);
+                        break;
+                    case MotionEvent.ACTION_MOVE:
+                        sendMouseEventCode(ev, TerminalEmulator.MOUSE_LEFT_BUTTON_MOVED, true);
+                        break;
+                }
+                return true;
+            }
+        }
+
        mGestureRecognizer.onTouchEvent(ev);
        return true;
    }

-		if (mIsSelectingText) {
-			int cx = (int) (ev.getX() / mRenderer.mFontWidth);
-			// Offset for finger:
-			final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
-			int cy = (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y) / mRenderer.mFontLineSpacing) + mTopRow;
-			switch (action) {
-			case MotionEvent.ACTION_DOWN:
-				mSelXAnchor = cx;
-				mSelYAnchor = cy;
-				mSelX1 = cx;
-				mSelY1 = cy;
-				mSelX2 = mSelX1;
-				mSelY2 = mSelY1;
-				invalidate();
-				break;
-			case MotionEvent.ACTION_MOVE:
-			case MotionEvent.ACTION_UP:
-				boolean touchBeforeAnchor = (cy < mSelYAnchor || (cy == mSelYAnchor && cx < mSelXAnchor));
-				int minx = touchBeforeAnchor ? cx : mSelXAnchor;
-				int maxx = !touchBeforeAnchor ? cx : mSelXAnchor;
-				int miny = touchBeforeAnchor ? cy : mSelYAnchor;
-				int maxy = !touchBeforeAnchor ? cy : mSelYAnchor;
-				mSelX1 = minx;
-				mSelY1 = miny;
-				mSelX2 = maxx;
-				mSelY2 = maxy;
-				if (action == MotionEvent.ACTION_UP) {
-					String selectedText = mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2).trim();
-					mTermSession.clipboardText(selectedText);
-					toggleSelectingText();
-				}
-				invalidate();
-				break;
-			default:
-				toggleSelectingText();
-				invalidate();
-				break;
-			}
-			return true;
-		}
-
-		return false;
-	}
-
    @Override
    public boolean onKeyPreIme(int keyCode, KeyEvent event) {
-		if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
-		if (keyCode == KeyEvent.KEYCODE_ESCAPE || keyCode == KeyEvent.KEYCODE_BACK) {
-			// Handle the escape key ourselves to avoid the system from treating it as back key
-			// and e.g. close keyboard.
+        if (LOG_KEY_EVENTS)
+            Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (mIsSelectingText) {
+                toggleSelectingText(null);
+                return true;
+            } else if (mOnKeyListener.shouldBackButtonBeMappedToEscape()) {
+                // Intercept back button to treat it as escape:
                switch (event.getAction()) {
                    case KeyEvent.ACTION_DOWN:
                        return onKeyDown(keyCode, event);
@@ -502,26 +563,31 @@ public final class TerminalView extends View {
                        return onKeyUp(keyCode, event);
                }
            }
+        }
        return super.onKeyPreIme(keyCode, event);
    }

    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
+        if (LOG_KEY_EVENTS)
+            Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
        if (mEmulator == null) return true;

-		int metaState = event.getMetaState();
-		boolean controlDownFromEvent = event.isCtrlPressed();
-		boolean leftAltDownFromEvent = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0;
-		boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;
-
-		if (handleVirtualKeys(keyCode, event, true)) {
+        if (mOnKeyListener.onKeyDown(keyCode, event, mTermSession)) {
            invalidate();
            return true;
-		} else if (event.isSystem() && keyCode != KeyEvent.KEYCODE_BACK) {
+        } else if (event.isSystem() && (!mOnKeyListener.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());
+            return true;
        }

+        final int metaState = event.getMetaState();
+        final boolean controlDownFromEvent = event.isCtrlPressed();
+        final boolean leftAltDownFromEvent = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0;
+        final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;
+
        int keyMod = 0;
        if (controlDownFromEvent) keyMod |= KeyHandler.KEYMOD_CTRL;
        if (event.isAltPressed()) keyMod |= KeyHandler.KEYMOD_ALT;
@@ -542,7 +608,8 @@ public final class TerminalView extends View {
        int effectiveMetaState = event.getMetaState() & ~bitsToClear;

        int result = event.getUnicodeChar(effectiveMetaState);
-		if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "KeyEvent#getUnicodeChar(" + effectiveMetaState + ") returned: " + result);
+        if (LOG_KEY_EVENTS)
+            Log.i(EmulatorDebug.LOG_TAG, "KeyEvent#getUnicodeChar(" + effectiveMetaState + ") returned: " + result);
        if (result == 0) {
            return true;
        }
@@ -550,7 +617,8 @@ public final class TerminalView extends View {
        int oldCombiningAccent = mCombiningAccent;
        if ((result & KeyCharacterMap.COMBINING_ACCENT) != 0) {
            // If entered combining accent previously, write it out:
-			if (mCombiningAccent != 0) inputCodePoint(mCombiningAccent, controlDownFromEvent, leftAltDownFromEvent);
+            if (mCombiningAccent != 0)
+                inputCodePoint(mCombiningAccent, controlDownFromEvent, leftAltDownFromEvent);
            mCombiningAccent = result & KeyCharacterMap.COMBINING_ACCENT_MASK;
        } else {
            if (mCombiningAccent != 0) {
@@ -572,8 +640,12 @@ public final class TerminalView extends View {
                + leftAltDownFromEvent + ")");
        }

-		int resultingKeyCode = -1; // Set if virtual key causes this to be translated to key event.
-		if (controlDownFromEvent || mVirtualControlKeyDown) {
+        final boolean controlDown = controlDownFromEvent || mOnKeyListener.readControlKey();
+        final boolean altDown = leftAltDownFromEvent || mOnKeyListener.readAltKey();
+
+        if (mOnKeyListener.onCodePoint(codePoint, controlDown, mTermSession)) return;
+
+        if (controlDown) {
            if (codePoint >= 'a' && codePoint <= 'z') {
                codePoint = codePoint - 'a' + 1;
            } else if (codePoint >= 'A' && codePoint <= 'Z') {
@@ -588,75 +660,33 @@ public final class TerminalView extends View {
                codePoint = 29;
            } else if (codePoint == '^' || codePoint == '6') {
                codePoint = 30; // control-^
-			} else if (codePoint == '_' || codePoint == '7') {
+            } else if (codePoint == '_' || codePoint == '7' || codePoint == '/') {
+                // "Ctrl-/ sends 0x1f which is equivalent of Ctrl-_ since the days of VT102"
+                // - http://apple.stackexchange.com/questions/24261/how-do-i-send-c-that-is-control-slash-to-the-terminal
                codePoint = 31;
            } else if (codePoint == '8') {
                codePoint = 127; // DEL
-			} else if (codePoint == '9') {
-				resultingKeyCode = KeyEvent.KEYCODE_F11;
-			} else if (codePoint == '0') {
-				resultingKeyCode = KeyEvent.KEYCODE_F12;
-			}
-		} else if (mVirtualFnKeyDown) {
-			if (codePoint == 'w' || codePoint == 'W') {
-				resultingKeyCode = KeyEvent.KEYCODE_DPAD_UP;
-			} else if (codePoint == 'a' || codePoint == 'A') {
-				resultingKeyCode = KeyEvent.KEYCODE_DPAD_LEFT;
-			} else if (codePoint == 's' || codePoint == 'S') {
-				resultingKeyCode = KeyEvent.KEYCODE_DPAD_DOWN;
-			} else if (codePoint == 'd' || codePoint == 'D') {
-				resultingKeyCode = KeyEvent.KEYCODE_DPAD_RIGHT;
-			} else if (codePoint == 'p' || codePoint == 'P') {
-				resultingKeyCode = KeyEvent.KEYCODE_PAGE_UP;
-			} else if (codePoint == 'n' || codePoint == 'N') {
-				resultingKeyCode = KeyEvent.KEYCODE_PAGE_DOWN;
-			} else if (codePoint == 't' || codePoint == 'T') {
-				resultingKeyCode = KeyEvent.KEYCODE_TAB;
-			} else if (codePoint == 'l' || codePoint == 'L') {
-				codePoint = '|';
-			} else if (codePoint == 'u' || codePoint == 'U') {
-				codePoint = '_';
-			} else if (codePoint == 'e' || codePoint == 'E') {
-				codePoint = 27; // ^[ (Esc)
-			} else if (codePoint == '.') {
-				codePoint = 28; // ^\
-			} else if (codePoint > '0' && codePoint <= '9') {
-				// F1-F9
-				resultingKeyCode = (codePoint - '1') + KeyEvent.KEYCODE_F1;
-			} else if (codePoint == '0') {
-				resultingKeyCode = KeyEvent.KEYCODE_F10;
-			} else if (codePoint == 'i' || codePoint == 'I') {
-				resultingKeyCode = KeyEvent.KEYCODE_INSERT;
-			} else if (codePoint == 'x' || codePoint == 'X') {
-				resultingKeyCode = KeyEvent.KEYCODE_FORWARD_DEL;
-			} else if (codePoint == 'h' || codePoint == 'H') {
-				resultingKeyCode = KeyEvent.KEYCODE_MOVE_HOME;
-			} else if (codePoint == 'f' || codePoint == 'F') {
-				// As left alt+f, jumping forward in readline:
-				codePoint = 'f';
-				leftAltDownFromEvent = true;
-			} else if (codePoint == 'b' || codePoint == 'B') {
-				// As left alt+b, jumping forward in readline:
-				codePoint = 'b';
-				leftAltDownFromEvent = true;
            }
        }

        if (codePoint > -1) {
-			if (resultingKeyCode > -1) {
-				handleKeyCode(resultingKeyCode, 0);
-			} else {
-				// The below two workarounds are needed on at least Logitech Keyboard k810 on Samsung Galaxy Tab Pro
-				// (Android 4.4) with the stock Samsung Keyboard. They should be harmless when not used since the need
-				// to input the original characters instead of the new ones using the keyboard should be low.
-				// Rewrite U+02DC 'SMALL TILDE' to U+007E 'TILDE' for ~ to work in shells:
-				if (codePoint == 0x02DC) codePoint = 0x07E;
-				// Rewrite U+02CB 'MODIFIER LETTER GRAVE ACCENT' to U+0060 'GRAVE ACCENT' for ` (backticks) to work:
-				if (codePoint == 0x02CB) codePoint = 0x60;
+            // Work around bluetooth keyboards sending funny unicode characters instead
+            // of the more normal ones from ASCII that terminal programs expect - the
+            // desire to input the original characters should be low.
+            switch (codePoint) {
+                case 0x02DC: // SMALL TILDE.
+                    codePoint = 0x007E; // TILDE (~).
+                    break;
+                case 0x02CB: // MODIFIER LETTER GRAVE ACCENT.
+                    codePoint = 0x0060; // GRAVE ACCENT (`).
+                    break;
+                case 0x02C6: // MODIFIER LETTER CIRCUMFLEX ACCENT.
+                    codePoint = 0x005E; // CIRCUMFLEX ACCENT (^).
+                    break;
+            }

            // If left alt, send escape before the code point to make e.g. Alt+B and Alt+F work in readline:
-				mTermSession.writeCodePoint(leftAltDownFromEvent, codePoint);
-			}
+            mTermSession.writeCodePoint(altDown, codePoint);
        }
    }

@@ -672,18 +702,17 @@ public final class TerminalView extends View {
    /**
     * Called when a key is released in the view.
     *
-	 * @param keyCode
-	 *            The keycode of the key which was released.
-	 * @param event
-	 *            A {@link KeyEvent} describing the event.
+     * @param keyCode The keycode of the key which was released.
+     * @param event   A {@link KeyEvent} describing the event.
     * @return Whether the event was handled.
     */
    @Override
    public boolean onKeyUp(int keyCode, KeyEvent event) {
-		if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
+        if (LOG_KEY_EVENTS)
+            Log.i(EmulatorDebug.LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
        if (mEmulator == null) return true;

-		if (handleVirtualKeys(keyCode, event, false)) {
+        if (mOnKeyListener.onKeyUp(keyCode, event)) {
            invalidate();
            return true;
        } else if (event.isSystem()) {
@@ -694,87 +723,6 @@ public final class TerminalView extends View {
        return true;
    }

-	/** Handle dedicated volume buttons as virtual keys if applicable. */
-	private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
-		InputDevice inputDevice = event.getDevice();
-		if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
-			// Do not steal dedicated buttons from a full external keyboard.
-			return false;
-		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-			if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "handleVirtualKeys(down=" + down + ") taking ctrl event");
-			mVirtualControlKeyDown = down;
-			return true;
-		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-			if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "handleVirtualKeys(down=" + down + ") taking Fn event");
-			mVirtualFnKeyDown = down;
-			return true;
-		}
-		return false;
-	}
-
-	public void checkForTypeface() {
-		new Thread() {
-			@Override
-			public void run() {
-				try {
-					File fontFile = new File(getContext().getFilesDir().getPath() + "/home/.termux/font.ttf");
-					final Typeface newTypeface = fontFile.exists() ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
-					if (newTypeface != mRenderer.mTypeface) {
-						((Activity) getContext()).runOnUiThread(new Runnable() {
-							@Override
-							public void run() {
-								try {
-									mRenderer = new TerminalRenderer(mRenderer.mTextSize, newTypeface);
-									updateSize();
-									invalidate();
-								} catch (Exception e) {
-									Log.e(EmulatorDebug.LOG_TAG, "Error loading font", e);
-								}
-							}
-						});
-					}
-				} catch (Exception e) {
-					Log.e(EmulatorDebug.LOG_TAG, "Error loading font", e);
-				}
-			}
-		}.start();
-	}
-
-	public void checkForColors() {
-		new Thread() {
-			@Override
-			public void run() {
-				try {
-					File colorsFile = new File(getContext().getFilesDir().getPath() + "/home/.termux/colors.properties");
-					final Properties props = colorsFile.isFile() ? new Properties() : null;
-					if (props != null) {
-						try (InputStream in = new FileInputStream(colorsFile)) {
-							props.load(in);
-						}
-					}
-					((Activity) getContext()).runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							try {
-								if (props == null) {
-									TerminalColors.COLOR_SCHEME.reset();
-								} else {
-									TerminalColors.COLOR_SCHEME.updateWith(props);
-								}
-								if (mEmulator != null) mEmulator.mColors.reset();
-								invalidate();
-							} catch (Exception e) {
-								Log.e(EmulatorDebug.LOG_TAG, "Setting colors failed: " + e.getMessage());
-							}
-						}
-					});
-				} catch (Exception e) {
-					Log.e(EmulatorDebug.LOG_TAG, "Failed colors handling", e);
-				}
-			}
-		}.start();
-	}
-
    /**
     * This is called during layout when the size of this view has changed. If you were just added to the view
     * hierarchy, you're called with the old values of 0.
@@ -791,8 +739,8 @@ public final class TerminalView extends View {
        if (viewWidth == 0 || viewHeight == 0 || mTermSession == null) return;

        // Set to 80 and 24 if you want to enable vttest.
-		int newColumns = Math.max(8, (int) (viewWidth / mRenderer.mFontWidth));
-		int newRows = Math.max(8, (viewHeight - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing);
+        int newColumns = Math.max(4, (int) (viewWidth / mRenderer.mFontWidth));
+        int newRows = Math.max(4, (viewHeight - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing);

        if (mEmulator == null || (newColumns != mEmulator.mColumns || newRows != mEmulator.mRows)) {
            mTermSession.updateSize(newColumns, newRows);
@@ -810,13 +758,149 @@ public final class TerminalView extends View {
            canvas.drawColor(0XFF000000);
        } else {
            mRenderer.render(mEmulator, canvas, mTopRow, mSelY1, mSelY2, mSelX1, mSelX2);
+
+            if (mIsSelectingText) {
+                final int gripHandleWidth = mLeftSelectionHandle.getIntrinsicWidth();
+                final int gripHandleMargin = gripHandleWidth / 4; // See the png.
+
+                int right = Math.round((mSelX1) * mRenderer.mFontWidth) + gripHandleMargin;
+                int top = (mSelY1 + 1 - mTopRow) * mRenderer.mFontLineSpacing + mRenderer.mFontLineSpacingAndAscent;
+                mLeftSelectionHandle.setBounds(right - gripHandleWidth, top, right, top + mLeftSelectionHandle.getIntrinsicHeight());
+                mLeftSelectionHandle.draw(canvas);
+
+                int left = Math.round((mSelX2 + 1) * mRenderer.mFontWidth) - gripHandleMargin;
+                top = (mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing + mRenderer.mFontLineSpacingAndAscent;
+                mRightSelectionHandle.setBounds(left, top, left + gripHandleWidth, top + mRightSelectionHandle.getIntrinsicHeight());
+                mRightSelectionHandle.draw(canvas);
+            }
        }
    }

    /** Toggle text selection mode in the view. */
-	public void toggleSelectingText() {
+    @TargetApi(23)
+    public void toggleSelectingText(MotionEvent ev) {
        mIsSelectingText = !mIsSelectingText;
-		if (!mIsSelectingText) mSelX1 = mSelY1 = mSelX2 = mSelY2 = -1;
+        mOnKeyListener.copyModeChanged(mIsSelectingText);
+
+        if (mIsSelectingText) {
+            if (mLeftSelectionHandle == null) {
+                mLeftSelectionHandle = (BitmapDrawable) getContext().getDrawable(R.drawable.text_select_handle_left_material);
+                mRightSelectionHandle = (BitmapDrawable) getContext().getDrawable(R.drawable.text_select_handle_right_material);
+            }
+
+            int cx = (int) (ev.getX() / mRenderer.mFontWidth);
+            final boolean eventFromMouse = ev.isFromSource(InputDevice.SOURCE_MOUSE);
+            // Offset for finger:
+            final int SELECT_TEXT_OFFSET_Y = eventFromMouse ? 0 : -40;
+            int cy = (int) ((ev.getY() + SELECT_TEXT_OFFSET_Y) / mRenderer.mFontLineSpacing) + mTopRow;
+
+            mSelX1 = mSelX2 = cx;
+            mSelY1 = mSelY2 = cy;
+
+            TerminalBuffer screen = mEmulator.getScreen();
+            if (!" ".equals(screen.getSelectedText(mSelX1, mSelY1, mSelX1, mSelY1))) {
+                // Selecting something other than whitespace. Expand to word.
+                while (mSelX1 > 0 && !"".equals(screen.getSelectedText(mSelX1 - 1, mSelY1, mSelX1 - 1, mSelY1))) {
+                    mSelX1--;
+                }
+                while (mSelX2 < mEmulator.mColumns - 1 && !"".equals(screen.getSelectedText(mSelX2 + 1, mSelY1, mSelX2 + 1, mSelY1))) {
+                    mSelX2++;
+                }
+            }
+
+            mInitialTextSelection = true;
+            mIsDraggingLeftSelection = true;
+            mSelectionDownX = ev.getX();
+            mSelectionDownY = ev.getY();
+
+            final ActionMode.Callback callback = new ActionMode.Callback() {
+                @Override
+                public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                    int show = MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+
+                    ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                    menu.add(Menu.NONE, 1, Menu.NONE, R.string.copy_text).setShowAsAction(show);
+                    menu.add(Menu.NONE, 2, Menu.NONE, R.string.paste_text).setEnabled(clipboard.hasPrimaryClip()).setShowAsAction(show);
+                    menu.add(Menu.NONE, 3, Menu.NONE, R.string.text_selection_more);
+                    return true;
+                }
+
+                @Override
+                public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                    return false;
+                }
+
+                @Override
+                public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                    switch (item.getItemId()) {
+                        case 1:
+                            String selectedText = mEmulator.getSelectedText(mSelX1, mSelY1, mSelX2, mSelY2).trim();
+                            mTermSession.clipboardText(selectedText);
+                            break;
+                        case 2:
+                            ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                            ClipData clipData = clipboard.getPrimaryClip();
+                            if (clipData != null) {
+                                CharSequence paste = clipData.getItemAt(0).coerceToText(getContext());
+                                if (!TextUtils.isEmpty(paste)) mEmulator.paste(paste.toString());
+                            }
+                            break;
+                        case 3:
+                            showContextMenu();
+                            break;
+                    }
+                    toggleSelectingText(null);
+                    return true;
+                }
+
+                @Override
+                public void onDestroyActionMode(ActionMode mode) {
+                }
+
+            };
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                mActionMode = startActionMode(new ActionMode.Callback2() {
+                    @Override
+                    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                        return callback.onCreateActionMode(mode, menu);
+                    }
+
+                    @Override
+                    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                        return callback.onActionItemClicked(mode, item);
+                    }
+
+                    @Override
+                    public void onDestroyActionMode(ActionMode mode) {
+                        // Ignore.
+                    }
+
+                    @Override
+                    public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+                        int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
+                        int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
+                        int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
+                        int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);
+                        outRect.set(Math.min(x1, x2), y1, Math.max(x1, x2), y2);
+                    }
+                }, ActionMode.TYPE_FLOATING);
+            } else {
+                mActionMode = startActionMode(callback);
+            }
+
+
+            invalidate();
+        } else {
+            mActionMode.finish();
+            mSelX1 = mSelY1 = mSelX2 = mSelY2 = -1;
+            invalidate();
+        }
    }

    public TerminalSession getCurrentSession() {
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1,5 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libtermux
-LOCAL_SRC_FILES:= termux.c
-include $(BUILD_SHARED_LIBRARY)
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -1,5 +0,0 @@
-APP_ABI := armeabi-v7a x86
-APP_PLATFORM := android-21
-NDK_TOOLCHAIN_VERSION := 4.9
-APP_CFLAGS := -std=c11 -Wall -Wextra -Os -fno-stack-protector
-APP_LDFLAGS = -nostdlib -Wl,--gc-sections
--- a/app/src/main/jni/termux.c
+++ b/app/src/main/jni/termux.c
@@ -22,7 +22,14 @@ static int throw_runtime_exception(JNIEnv* env, char const* message)
    return -1;
 }

-static int create_subprocess(JNIEnv* env, char const* cmd, char const* cwd, char* const argv[], char** envp, int* pProcessId)
+static int create_subprocess(JNIEnv* env,
+        char const* cmd,
+        char const* cwd,
+        char* const argv[],
+        char** envp,
+        int* pProcessId,
+        jint rows,
+        jint columns)
 {
    int ptm = open("/dev/ptmx", O_RDWR | O_CLOEXEC);
    if (ptm < 0) return throw_runtime_exception(env, "Cannot open /dev/ptmx");
@@ -49,8 +56,8 @@ static int create_subprocess(JNIEnv* env, char const* cmd, char const* cwd, char
    tios.c_iflag &= ~(IXON | IXOFF);
    tcsetattr(ptm, TCSANOW, &tios);

-		/** Set initial winsize (better too small than too large). */
-        struct winsize sz = { .ws_row = 20, .ws_col = 20 };
+    /** Set initial winsize. */
+    struct winsize sz = { .ws_row = rows, .ws_col = columns };
    ioctl(ptm, TIOCSWINSZ, &sz);

    pid_t pid = fork();
@@ -105,7 +112,16 @@ static int create_subprocess(JNIEnv* env, char const* cmd, char const* cwd, char
    }
 }

-JNIEXPORT jint JNICALL Java_com_termux_terminal_JNI_createSubprocess(JNIEnv* env, jclass TERMUX_UNUSED(clazz), jstring cmd, jstring cwd, jobjectArray args, jobjectArray envVars, jintArray processIdArray)
+JNIEXPORT jint JNICALL Java_com_termux_terminal_JNI_createSubprocess(
+        JNIEnv* env,
+        jclass TERMUX_UNUSED(clazz),
+        jstring cmd,
+        jstring cwd,
+        jobjectArray args,
+        jobjectArray envVars,
+        jintArray processIdArray,
+        jint rows,
+        jint columns)
 {
    jsize size = args ? (*env)->GetArrayLength(env, args) : 0;
    char** argv = NULL;
@@ -140,7 +156,7 @@ JNIEXPORT jint JNICALL Java_com_termux_terminal_JNI_createSubprocess(JNIEnv* env
    int procId = 0;
    char const* cmd_cwd = (*env)->GetStringUTFChars(env, cwd, NULL);
    char const* cmd_utf8 = (*env)->GetStringUTFChars(env, cmd, NULL);
-        int ptm = create_subprocess(env, cmd_utf8, cmd_cwd, argv, envp, &procId);
+    int ptm = create_subprocess(env, cmd_utf8, cmd_cwd, argv, envp, &procId, rows, columns);
    (*env)->ReleaseStringUTFChars(env, cmd, cmd_utf8);
    (*env)->ReleaseStringUTFChars(env, cmd, cmd_cwd);

@@ -192,11 +208,6 @@ JNIEXPORT int JNICALL Java_com_termux_terminal_JNI_waitFor(JNIEnv* TERMUX_UNUSED
    }
 }

-JNIEXPORT void JNICALL Java_com_termux_terminal_JNI_hangupProcessGroup(JNIEnv* TERMUX_UNUSED(env), jclass TERMUX_UNUSED(clazz), jint procId)
-{
-	killpg(procId, SIGHUP);
-}
-
 JNIEXPORT void JNICALL Java_com_termux_terminal_JNI_close(JNIEnv* TERMUX_UNUSED(env), jclass TERMUX_UNUSED(clazz), jint fileDescriptor)
 {
    close(fileDescriptor);
--- a/app/src/main/jniLibs/armeabi-v7a/libtermux.so
+++ b/app/src/main/jniLibs/armeabi-v7a/libtermux.so
--- a/app/src/main/jniLibs/x86/libtermux.so
+++ b/app/src/main/jniLibs/x86/libtermux.so
--- a/app/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
+++ b/app/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
--- a/app/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png
+++ b/app/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png
--- a/app/src/main/res/drawable/text_select_handle_left_material.xml
+++ b/app/src/main/res/drawable/text_select_handle_left_material.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/text_select_handle_left_mtrl_alpha"
+        android:tint="#2196F3" />
--- a/app/src/main/res/drawable/text_select_handle_right_material.xml
+++ b/app/src/main/res/drawable/text_select_handle_right_material.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/text_select_handle_right_mtrl_alpha"
+        android:tint="#2196F3" />
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -1,6 +1,13 @@
-<com.termux.drawer.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v4.widget.DrawerLayout
        android:id="@+id/drawer_layout"
        android:layout_width="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_above="@+id/viewpager"
        android:layout_height="match_parent">

        <com.termux.view.TerminalView
@@ -20,6 +27,7 @@
            android:choiceMode="singleChoice"
            android:divider="@android:color/transparent"
            android:dividerHeight="0dp"
+            android:descendantFocusability="blocksDescendants"
            android:orientation="vertical">

            <ListView
@@ -55,4 +63,13 @@
            </LinearLayout>
        </LinearLayout>

-</com.termux.drawer.DrawerLayout>
+    </android.support.v4.widget.DrawerLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="@android:drawable/screen_background_dark_transparent"
+        android:layout_alignParentBottom="true" />
+</RelativeLayout>
--- a/app/src/main/res/layout/extra_keys_main.xml
+++ b/app/src/main/res/layout/extra_keys_main.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.termux.app.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/extra_keys"
+    style="?android:attr/buttonBarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_alignParentBottom="true"
+    android:orientation="horizontal" />
--- a/app/src/main/res/layout/extra_keys_right.xml
+++ b/app/src/main/res/layout/extra_keys_right.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<EditText xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/text_input"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:imeOptions="actionSend|flagNoFullscreen"
+    android:maxLines="1"
+    android:inputType="text"
+    android:singleLine="true"
+    android:textColor="@android:color/white"
+    android:paddingTop="0dp"
+    android:textCursorDrawable="@null"
+    android:paddingBottom="0dp"
+    tools:ignore="LabelFor" />
--- a/app/src/main/res/layout/file_picker.xml
+++ b/app/src/main/res/layout/file_picker.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp">
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:drawSelectorOnTop="false"/>
-
-    <TextView android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="$HOME is empty!"/>
-</LinearLayout>
--- a/app/src/main/res/raw/bell.ogg
+++ b/app/src/main/res/raw/bell.ogg
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="application_name">Termux</string>
-   <string name="application_help">Termux help</string>
   <string name="shared_user_label">Termux user</string>
   <string name="new_session">New session</string>
-   <string name="new_session_normal_unnamed">Normal - unnamed</string>
-   <string name="new_session_normal_named">Normal - named</string>
   <string name="new_session_failsafe">Failsafe</string>
   <string name="toggle_soft_keyboard">Keyboard</string>
   <string name="reset_terminal">Reset</string>
@@ -15,7 +12,7 @@
   <string name="help">Help</string>

   <string name="welcome_dialog_title">Welcome to Termux</string>
-   <string name="welcome_dialog_body">Long press anywhere on the terminal for a context menu where Help is available.\n\nExecute \'apt update\' to update the packages list before installing packages.</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>
@@ -30,19 +27,19 @@

   <string name="reset_toast_notification">Terminal reset.</string>

-  <string name="select">Select…</string>
-  <string name="select_text">Select text</string>
  <string name="select_url">Select URL</string>
  <string name="select_url_dialog_title">Click URL to copy or long press to open</string>
-  <string name="select_all_and_share">Select all text and share</string>
+  <string name="select_all_and_share">Share transcript</string>
  <string name="select_url_no_found">No URL found in the terminal.</string>
  <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="kill_process">Hangup</string>
+  <string name="copy_text">Copy</string>
+  <string name="text_selection_more">More…</string>

-  <string name="confirm_kill_process">Close this process?</string>
+  <string name="kill_process">Kill process (%d)</string>
+  <string name="confirm_kill_process">Really kill this session?</string>

  <string name="session_rename_title">Set session name</string>
  <string name="session_rename_positive_button">Set</string>
@@ -56,4 +53,8 @@
  <string name="notification_action_wakelock">Wake</string>
  <string name="notification_action_wifilock">Wifi</string>

+  <string name="file_received_title">Save file in ~/downloads/</string>
+  <string name="file_received_edit_button">Edit</string>
+  <string name="file_received_open_folder_button">Open folder</string>
+
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,6 +10,9 @@
        <!-- Seen in buttons on left drawer: -->
        <item name="android:colorAccent">#212121</item>
        <item name="android:alertDialogTheme">@style/TermuxAlertDialogStyle</item>
+        <!-- Avoid action mode toolbar pushing down terminal content when
+             selecting text on pre-6.0 (non-floating toolbar). -->
+        <item name="android:windowActionModeOverlay">true</item>
    </style>

 	<style name="TermuxAlertDialogStyle" parent="@android:style/Theme.Material.Light.Dialog.Alert">
--- a/app/src/main/res/xml/backupscheme.xml
+++ b/app/src/main/res/xml/backupscheme.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- See https://developer.android.com/training/backup/autosyncapi.html -->
+    <include domain="file" path="home/backup" />
+</full-backup-content>
--- a/app/src/test/java/com/termux/app/TermuxActivityTest.java
+++ b/app/src/test/java/com/termux/app/TermuxActivityTest.java
@@ -0,0 +1,25 @@
+package com.termux.app;
+
+import junit.framework.TestCase;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+
+public class TermuxActivityTest extends TestCase {
+
+	private void assertUrlsAre(String text, String... urls) {
+		LinkedHashSet<String> expected = new LinkedHashSet<>();
+		Collections.addAll(expected, urls);
+		assertEquals(expected, TermuxActivity.extractUrls(text));
+	}
+
+	public void testExtractUrls() {
+		assertUrlsAre("hello http://example.com world", "http://example.com");
+
+		assertUrlsAre("http://example.com\nhttp://another.com", "http://example.com", "http://another.com");
+
+		assertUrlsAre("hello http://example.com world and http://more.example.com with secure https://more.example.com",
+				"http://example.com", "http://more.example.com", "https://more.example.com");
+	}
+
+}
--- a/app/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
+++ b/app/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
@@ -20,4 +20,13 @@ public class ControlSequenceIntroducerTest extends TerminalTestCase {
 		withTerminalSized(3, 4).enterString("1\r\n2\r\n3\r\nhi\033[Sy").assertLinesAre("2  ", "3  ", "hi ", "  y");
 	}

+	/** CSI Ps X  Erase Ps Character(s) (default = 1) (ECH). */
+	public void testCsiX() {
+		// See https://code.google.com/p/chromium/issues/detail?id=212712 where test was extraced from.
+		withTerminalSized(13, 2).enterString("abcdefghijkl\b\b\b\b\b\033[X").assertLinesAre("abcdefg ijkl ", "             ");
+		withTerminalSized(13, 2).enterString("abcdefghijkl\b\b\b\b\b\033[1X").assertLinesAre("abcdefg ijkl ", "             ");
+		withTerminalSized(13, 2).enterString("abcdefghijkl\b\b\b\b\b\033[2X").assertLinesAre("abcdefg  jkl ", "             ");
+		withTerminalSized(13, 2).enterString("abcdefghijkl\b\b\b\b\b\033[20X").assertLinesAre("abcdefg      ", "             ");
+	}
+
 }
--- a/app/src/test/java/com/termux/terminal/CursorAndScreenTest.java
+++ b/app/src/test/java/com/termux/terminal/CursorAndScreenTest.java
@@ -163,7 +163,12 @@ public class CursorAndScreenTest extends TerminalTestCase {
 		}
 	}

-	public void testHorizontalTabColorsBackground() {
+    /**
+     * See comments on horizontal tab handling in TerminalEmulator.java.
+     *
+     * We do not want to color already written cells when tabbing over them.
+     */
+	public void DISABLED_testHorizontalTabColorsBackground() {
 		withTerminalSized(10, 3).enterString("\033[48;5;15m").enterString("\t");
 		assertCursorAt(0, 8);
 		for (int i = 0; i < 10; i++) {
@@ -172,4 +177,54 @@ public class CursorAndScreenTest extends TerminalTestCase {
 		}
 	}

+	/**
+	 * Test interactions between the cursor overflow bit and various escape sequences.
+	 * <p/>
+	 * Adapted from hterm:
+	 * https://chromium.googlesource.com/chromiumos/platform/assets/+/2337afa5c063127d5ce40ec7fec9b602d096df86%5E%21/#F2
+	 */
+	public void testClearingOfAutowrap() {
+		// Fill a row with the last hyphen wrong, then run a command that
+		// modifies the screen, then add a hyphen. The wrap bit should be
+		// cleared, so the extra hyphen can fix the row.
+		withTerminalSized(15, 6);
+
+		enterString("-----  1  ----X");
+		enterString("\033[K-");  // EL
+
+		enterString("-----  2  ----X");
+		enterString("\033[J-");  // ED
+
+		enterString("-----  3  ----X");
+		enterString("\033[@-");  // ICH
+
+		enterString("-----  4  ----X");
+		enterString("\033[P-");  // DCH
+
+		enterString("-----  5  ----X");
+		enterString("\033[X-");  // ECH
+
+		// DL will delete the entire line but clear the wrap bit, so we
+		// expect a hyphen at the end and nothing else.
+		enterString("XXXXXXXXXXXXXXX");
+		enterString("\033[M-");  // DL
+
+		assertLinesAre(
+				"-----  1  -----",
+				"-----  2  -----",
+				"-----  3  -----",
+				"-----  4  -----",
+				"-----  5  -----",
+				"              -");
+	}
+
+    public void testBackspaceAcrossWrappedLines() {
+        // Backspace should not go to previous line if not auto-wrapped:
+        withTerminalSized(3, 3).enterString("hi\r\n\b\byou").assertLinesAre("hi ", "you", "   ");
+        // Backspace should go to previous line if auto-wrapped:
+        withTerminalSized(3, 3).enterString("hi y").assertLinesAre("hi ", "y  ", "   ").enterString("\b\b#").assertLinesAre("hi#", "y  ", "   ");
+        // Initial backspace should do nothing:
+        withTerminalSized(3, 3).enterString("\b\b\b\bhi").assertLinesAre("hi ", "   ", "   ");
+    }
+
 }
--- a/app/src/test/java/com/termux/terminal/DecSetTest.java
+++ b/app/src/test/java/com/termux/terminal/DecSetTest.java
@@ -4,13 +4,13 @@ package com.termux.terminal;
 * <pre>
 * "CSI ? Pm h", DEC Private Mode Set (DECSET)
 * </pre>
- * 
+ * <p/>
 * and
- * 
+ * <p/>
 * <pre>
 * "CSI ? Pm l", DEC Private Mode Reset (DECRST)
 * </pre>
- * 
+ * <p/>
 * controls various aspects of the terminal
 */
 public class DecSetTest extends TerminalTestCase {
@@ -28,6 +28,11 @@ public class DecSetTest extends TerminalTestCase {
 		assertFalse(mTerminal.isShowingCursor());
 		mTerminal.reset();
 		assertTrue("Resetting the terminal should show the cursor", mTerminal.isShowingCursor());
+
+		enterString("\033[?25l");
+		assertFalse(mTerminal.isShowingCursor());
+		enterString("\033c"); // RIS resetting should reveal cursor.
+		assertTrue(mTerminal.isShowingCursor());
 	}

 	/** DECSET 2004, controls bracketed paste mode. */
@@ -59,4 +64,15 @@ public class DecSetTest extends TerminalTestCase {
 		assertEquals("Terminal reset() should disable bracketed paste mode", "a", mOutput.getOutputAndClear());
 	}

+	/** DECSET 7, DECAWM, controls wraparound mode. */
+	public void testWrapAroundMode() {
+		// Default with wraparound:
+		withTerminalSized(3, 3).enterString("abcd").assertLinesAre("abc", "d  ", "   ");
+		// With wraparound disabled:
+		withTerminalSized(3, 3).enterString("\033[?7labcd").assertLinesAre("abd", "   ", "   ");
+		enterString("efg").assertLinesAre("abg", "   ", "   ");
+		// Re-enabling wraparound:
+		enterString("\033[?7hhij").assertLinesAre("abh", "ij ", "   ");
+	}
+
 }
--- a/app/src/test/java/com/termux/terminal/KeyHandlerTest.java
+++ b/app/src/test/java/com/termux/terminal/KeyHandlerTest.java
@@ -1,6 +1,7 @@
 package com.termux.terminal;

 import android.view.KeyEvent;
+
 import junit.framework.TestCase;

 public class KeyHandlerTest extends TestCase {
@@ -110,6 +111,10 @@ public class KeyHandlerTest extends TestCase {
 		// Backspace.
 		assertKeysEquals("\u007f", KeyHandler.getCode(KeyEvent.KEYCODE_DEL, 0, false, false));

+		// Space.
+		assertNull(KeyHandler.getCode(KeyEvent.KEYCODE_SPACE, 0, false, false));
+		assertKeysEquals("\u0000", KeyHandler.getCode(KeyEvent.KEYCODE_SPACE, KeyHandler.KEYMOD_CTRL, false, false));
+
 		// Back tab.
 		assertKeysEquals("\033[Z", KeyHandler.getCode(KeyEvent.KEYCODE_TAB, KeyHandler.KEYMOD_SHIFT, false, false));

--- a/app/src/test/java/com/termux/terminal/OperatingSystemControlTest.java
+++ b/app/src/test/java/com/termux/terminal/OperatingSystemControlTest.java
@@ -1,11 +1,11 @@
 package com.termux.terminal;

+import android.util.Base64;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;

-import android.util.Base64;
-
 /** "ESC ]" is the Operating System Command. */
 public class OperatingSystemControlTest extends TerminalTestCase {

@@ -15,7 +15,7 @@ public class OperatingSystemControlTest extends TerminalTestCase {
 		withTerminalSized(10, 10);
 		enterString("\033]0;Hello, world\007");
 		assertEquals("Hello, world", mTerminal.getTitle());
-		expectedTitleChanges.add(new ChangedTitle((String) null, "Hello, world"));
+		expectedTitleChanges.add(new ChangedTitle(null, "Hello, world"));
 		assertEquals(expectedTitleChanges, mOutput.titleChanges);

 		enterString("\033]0;Goodbye, world\007");
--- a/app/src/test/java/com/termux/terminal/ScrollRegionTest.java
+++ b/app/src/test/java/com/termux/terminal/ScrollRegionTest.java
@@ -2,7 +2,7 @@ package com.termux.terminal;

 /**
 * ${CSI}${top};${bottom}r" - set Scrolling Region [top;bottom] (default = full size of window) (DECSTBM).
- * 
+ * <p/>
 * "DECSTBM moves the cursor to column 1, line 1 of the page" (http://www.vt100.net/docs/vt510-rm/DECSTBM).
 */
 public class ScrollRegionTest extends TerminalTestCase {
@@ -94,4 +94,8 @@ public class ScrollRegionTest extends TerminalTestCase {
 		withTerminalSized(3, 3).enterString("\033[?69h\033[0;2sABCD\0339").assertLinesAre("B  ", "D  ", "   ");
 	}

+	public void testScrollDownWithScrollRegion() {
+		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 ");
+	}
 }
--- a/app/src/test/java/com/termux/terminal/TerminalRowTest.java
+++ b/app/src/test/java/com/termux/terminal/TerminalRowTest.java
@@ -1,10 +1,10 @@
 package com.termux.terminal;

+import junit.framework.TestCase;
+
 import java.util.Arrays;
 import java.util.Random;

-import junit.framework.TestCase;
-
 public class TerminalRowTest extends TestCase {

 	/** The properties of these code points are validated in {@link #testStaticConstants()}. */
@@ -377,9 +377,9 @@ public class TerminalRowTest extends TestCase {
 		// int[] expected = new int[] { TerminalEmulator.UNICODE_REPLACEMENT_CHAR, 'a', '8', 0x73EE, 0x009F, 0x881F, 0x8324, 0xD4C9, 0xFFFD,
 		// 'B', 0x009B, 0x61C9, 'Z' };
 		int currentColumn = 0;
-		for (int i = 0; i < points.length; i++) {
-			row.setChar(currentColumn, points[i], 0);
-			currentColumn += WcWidth.width(points[i]);
+		for (int point : points) {
+			row.setChar(currentColumn, point, 0);
+			currentColumn += WcWidth.width(point);
 		}
 		// assertLineStartsWith(points);
 		// assertEquals(Character.highSurrogate(0xC2541), line.mText[0]);
--- a/app/src/test/java/com/termux/terminal/TerminalTest.java
+++ b/app/src/test/java/com/termux/terminal/TerminalTest.java
@@ -92,6 +92,7 @@ public class TerminalTest extends TerminalTestCase {
 		assertEnteringStringGivesResponse("\033[6n", "\033[2;1R");
 	}

+	/** Test the cursor shape changes using DECSCUSR. */
 	public void testSetCursorStyle() throws Exception {
 		withTerminalSized(5, 5);
 		assertEquals(TerminalEmulator.CURSOR_STYLE_BLOCK, mTerminal.getCursorStyle());
@@ -257,4 +258,9 @@ public class TerminalTest extends TerminalTestCase {
 		withTerminalSized(3, 3).enterString("abc\r ").assertLinesAre(" bc", "   ", "   ").assertCursorAt(0, 1);
 	}

+    public void testTab() {
+        withTerminalSized(11, 2).enterString("01234567890\r\tXX").assertLinesAre("01234567XX0", "           ");
+        withTerminalSized(11, 2).enterString("01234567890\033[44m\r\tXX").assertLinesAre("01234567XX0", "           ");
+    }
+
 }
--- a/app/src/test/java/com/termux/terminal/TerminalTestCase.java
+++ b/app/src/test/java/com/termux/terminal/TerminalTestCase.java
@@ -1,5 +1,8 @@
 package com.termux.terminal;

+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
@@ -9,19 +12,14 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;

-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import com.termux.terminal.TerminalEmulator;
-import com.termux.terminal.TerminalOutput;
-
 public abstract class TerminalTestCase extends TestCase {

 	public static class MockTerminalOutput extends TerminalOutput {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		public final List<ChangedTitle> titleChanges = new ArrayList<>();
 		public final List<String> clipboardPuts = new ArrayList<>();
 		public int bellsRung = 0;
+        public int colorsChanged = 0;

 		@Override
 		public void write(byte[] data, int offset, int count) {
@@ -52,12 +50,17 @@ public abstract class TerminalTestCase extends TestCase {
 		public void onBell() {
 			bellsRung++;
 		}
+
+        @Override
+        public void onColorsChanged() {
+            colorsChanged++;
+        }
    }

 	public TerminalEmulator mTerminal;
 	public MockTerminalOutput mOutput;

-	public static class ChangedTitle {
+	public static final class ChangedTitle {
 		final String oldTitle;
 		final String newTitle;

@@ -68,6 +71,7 @@ public abstract class TerminalTestCase extends TestCase {

 		@Override
 		public boolean equals(Object o) {
+			if (!(o instanceof ChangedTitle)) return false;
 			ChangedTitle other = (ChangedTitle) o;
 			return Objects.equals(oldTitle, other.oldTitle) && Objects.equals(newTitle, other.newTitle);
 		}
@@ -115,8 +119,8 @@ public abstract class TerminalTestCase extends TestCase {
 		}
 	}

-	private static class LineWrapper {
-		TerminalRow mLine;
+	private static final class LineWrapper {
+		final TerminalRow mLine;

 		public LineWrapper(TerminalRow line) {
 			mLine = line;
@@ -129,7 +133,7 @@ public abstract class TerminalTestCase extends TestCase {

 		@Override
 		public boolean equals(Object o) {
-			return ((LineWrapper) o).mLine == mLine;
+			return o instanceof LineWrapper && ((LineWrapper) o).mLine == mLine;
 		}
 	}

--- a/app/src/test/java/com/termux/terminal/TextStyleTest.java
+++ b/app/src/test/java/com/termux/terminal/TextStyleTest.java
@@ -34,7 +34,7 @@ public class TextStyleTest extends TestCase {
 	public void testEncodingStrikeThrough() {
 		int encoded = TextStyle.encode(TextStyle.COLOR_INDEX_FOREGROUND, TextStyle.COLOR_INDEX_BACKGROUND,
 				TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH);
-		assertTrue((TextStyle.decodeEffect(encoded) | TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH) != 0);
+		assertTrue((TextStyle.decodeEffect(encoded) & TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH) != 0);
 	}

 	public void testEncodingProtected() {
--- a/app/src/test/java/com/termux/terminal/UnicodeInputTest.java
+++ b/app/src/test/java/com/termux/terminal/UnicodeInputTest.java
@@ -12,6 +12,47 @@ public class UnicodeInputTest extends TerminalTestCase {
 		withTerminalSized(5, 5);
 		mTerminal.append(new byte[]{(byte) 0b11101111, (byte) 'a'}, 2);
 		assertLineIs(0, ((char) TerminalEmulator.UNICODE_REPLACEMENT_CHAR) + "a   ");
+
+		// https://code.google.com/p/chromium/issues/detail?id=212704
+		byte[] input = new byte[]{
+				(byte) 0x61, (byte) 0xF1,
+				(byte) 0x80, (byte) 0x80,
+				(byte) 0xe1, (byte) 0x80,
+				(byte) 0xc2, (byte) 0x62,
+				(byte) 0x80, (byte) 0x63,
+				(byte) 0x80, (byte) 0xbf,
+				(byte) 0x64
+		};
+		withTerminalSized(10, 2);
+		mTerminal.append(input, input.length);
+		assertLinesAre("a\uFFFD\uFFFD\uFFFDb\uFFFDc\uFFFD\uFFFDd", "          ");
+
+		// Surrogate pairs.
+		withTerminalSized(5, 2);
+		input = new byte[]{
+				(byte) 0xed, (byte) 0xa0,
+				(byte) 0x80, (byte) 0xed,
+				(byte) 0xad, (byte) 0xbf,
+				(byte) 0xed, (byte) 0xae,
+				(byte) 0x80, (byte) 0xed,
+				(byte) 0xbf, (byte) 0xbf
+		};
+		mTerminal.append(input, input.length);
+		assertLinesAre("\uFFFD\uFFFD\uFFFD\uFFFD ", "     ");
+
+		// https://bugzilla.mozilla.org/show_bug.cgi?id=746900: "with this patch 0xe0 0x80 is decoded as two U+FFFDs,
+		// but 0xe0 0xa0 is decoded as a single U+FFFD, and this is correct according to the "Best Practices", but IE
+		// and Chrome (Version 22.0.1229.94) decode both of them as two U+FFFDs. Opera 12.11 decodes both of them as
+		// one U+FFFD".
+		withTerminalSized(5, 2);
+		input = new byte[]{(byte) 0xe0, (byte) 0xa0, ' '};
+		mTerminal.append(input, input.length);
+		assertLinesAre("\uFFFD    ", "     ");
+
+		// withTerminalSized(5, 2);
+		// input = new byte[]{(byte) 0xe0, (byte) 0x80, 'a'};
+		// mTerminal.append(input, input.length);
+		// assertLinesAre("\uFFFD\uFFFDa  ", "     ");
 	}

 	public void testUnassignedCodePoint() throws UnsupportedEncodingException {
@@ -84,4 +125,12 @@ public class UnicodeInputTest extends TerminalTestCase {
 		assertLineIs(0, "\uFFFDY   ");
 	}

+	public void testWideCharacterWithoutWrapping() throws Exception {
+		// With wraparound disabled. The behaviour when a wide character is output with cursor in
+		// the last column when autowrap is disabled is not obvious, but we expect the wide
+		// character to be ignored here.
+		withTerminalSized(3, 3).enterString("\033[?7l").enterString("枝枝枝").assertLinesAre("枝 ", "   ", "   ");
+		enterString("a枝").assertLinesAre("枝a", "   ", "   ");
+	}
+
 }
--- a/app/src/test/java/com/termux/terminal/WcWidthTest.java
+++ b/app/src/test/java/com/termux/terminal/WcWidthTest.java
@@ -39,6 +39,7 @@ public class WcWidthTest extends TestCase {
 	public void testCombining() {
 		assertWidthIs(0, 0x0302);
 		assertWidthIs(0, 0x0308);
+		assertWidthIs(0, 0x2060);
 	}

 	public void testWatch() {
@@ -59,4 +60,8 @@ public class WcWidthTest extends TestCase {
 		assertWidthIs(2, 0x11A3);
 	}

+    public void testKoala() {
+        assertWidthIs(1, 0x1F428);
+    }
+
 }
--- a/build-jnilibs.sh
+++ b/build-jnilibs.sh
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Script to build jni libraries while waiting for the new gradle build system:
-# http://tools.android.com/tech-docs/new-build-system/gradle-experimental#TOC-Ndk-Integration
-
-set -e -u
-
-SRC_JNILIBS=app/src/main/jniLibs/
-rm -Rf $SRC_JNILIBS
-mkdir -p $SRC_JNILIBS
-
-PROJECTDIR=`mktemp -d`
-JNIDIR=$PROJECTDIR/jni
-LIBSDIR=$PROJECTDIR/libs
-
-mkdir $JNIDIR
-cp app/src/main/jni/* $JNIDIR/
-
-ndk-build NDK_PROJECT_PATH=$PROJECTDIR
-cp -Rf $LIBSDIR/* $SRC_JNILIBS
-
-rm -Rf $PROJECTDIR
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,17 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+#Fri May 13 01:11:09 CEST 2016
+org.gradle.jvmargs=-Xmx2048M
+android.useDeprecatedNdk=true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 06 00:04:44 CET 2015
+#Sat Jul 23 17:08:29 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
--- a/46
+++ b/46
@@ -6,12 +6,30 @@
 ##
 ##############################################################################

-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
  CYGWIN* )
    cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
  MINGW* )
    msys=true
    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
--- a/travis.keystore
+++ b/travis.keystore