update bootstrap archives

Fixes faulty dpkg https://github.com/termux/termux-packages/issues/5858.

.editorconfig

@@ -14,3 +14,7 @@ insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 4
+
+[*.y{a,}ml]
+indent_size = 2
+indent_style = space

.gitattributes

@@ -0,0 +1,5 @@
+*           text=auto
+*.bat       eol=crlf
+*.gradle    eol=lf
+*.mk        eol=lf
+*.sh        eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve Termux application
+
+---
+
+<!--
+IMPORTANT:
+
+1. Support of Android 5.x - 6.x is finished.
+2. Fill the template AFTER comments.
+-->
+
+**Problem description**
+<!--
+A clear and concise description of what the problem is.
+You may post screenshots in addition to description.
+-->
+
+**Steps to reproduce**
+<!--
+Steps to reproduce the behavior. Please post all necessary
+commands that are needed to reproduce the issue.
+-->
+
+**Expected behavior**
+<!--
+A clear and concise description of what you expected to happen.
+-->
+
+**Additional information**
+
+* Termux application version:
+* Android OS version:
+* Device model:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest a new feature for Termux application
+
+---
+
+<!--
+IMPORTANT:
+
+1. Support of Android 5.x - 6.x is finished.
+2. Fill the template AFTER comments.
+-->
+
+**Feature description**
+<!--
+Describe the feature and why you want it.
+-->
+
+**Reference implementation**
+
+Does another app/terminal emulator have this feature?
+Provide links to more background information.

.github/workflows/debug_build.yml

@@ -0,0 +1,26 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+      - android-10
+  pull_request:
+    branches:
+      - master
+      - android-10
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+    - name: Build
+      run: |
+        ./gradlew assembleDebug
+    - name: Store generated APK file
+      uses: actions/upload-artifact@v1
+      with:
+        name: termux-app
+        path: ./app/build/outputs/apk/debug/app-debug.apk

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,19 @@
+name: "Validate Gradle Wrapper"
+
+on:
+  push:
+    branches:
+      - master
+      - android-10
+  pull_request:
+    branches:
+      - master
+      - android-10
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

.github/workflows/run_tests.yml

@@ -0,0 +1,21 @@
+name: Unit tests
+
+on:
+  push:
+    branches:
+      - master
+      - android-10
+  pull_request:
+    branches:
+      - master
+      - android-10
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v2
+    - name: Execute tests
+      run: |
+        ./gradlew test

.gitignore

@@ -6,6 +6,9 @@
 build/
 *.apk
 *.so
+.externalNativeBuild
+.cxx
+*.zip
 
 # Crashlytics configuations
 com_crashlytics_export_strings.xml
@@ -19,19 +22,8 @@ local.properties
 # Signing files
 .signing/
 
-# User-specific configurations
-.idea/libraries/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/vcs.xml
-.idea/dictionaries/
+# Intellij
+.idea/
 *.iml
 
 # OS-specific files
@@ -40,5 +32,6 @@ local.properties
 ._*
 .Spotlight-V100
 .Trashes
+.swp
 ehthumbs.db
 Thumbs.db

.idea/codeStyleSettings.xml

@@ -1,229 +0,0 @@
-<?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>

.idea/gradle.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <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="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>
-</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,71 +0,0 @@
-<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>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.travis.yml

@@ -1,30 +0,0 @@
-sudo: false
-language: android
-jdk: oraclejdk8
-
-env:
-  global:
-    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-    # via the "travis encrypt" command using the project repo's public key
-    - secure: "ACnFJxw0VusS2lnGXL+epP/CNJmftWS39YcPdgN2EurWw5ZfXSo7vi+zpMB+11IBS3LQyLFFUambi2N9L4lbReZkHVkoVcZFGZlwbXNTAeqT8CABPTcuOyEOZU4bJwqeYU87ztYipENMLNECaZrgWx5odbWLKnSJQw7Zkb4ArCstfXfYk9u8q49ThRxQyGwHW2xKp1an5aa+3Y6IY+ywsSHw6AvXbyFH078Kolxy86caagczcfmKcMi15QYzwAvFggUphvsO3M5PHJMQXuaNlQxDcQRGUEXsK8aZE0dPH5PB97SFjDALZqI7NEpjZAk5htWjX48ssW064LDbjcBg/ZLgDd8R8uhA159NVZgvcnP2czCn6pmggx1sW5MBmcj7i+bJS2ejaMO+KoovWlVvsch742H5QR6rQaNkjDZRsGVLYvJaR1gBLs898UoT1hcHWoqLVR22r2VFo7OWWCRfNRvZuZDR2HIrYRdFvn8P3nWVMkvXwgsOlxWG5sN+yQqW+6lZS7hivsFhtYs4CkRdoZIan3Qvi/CkY8Lg+ESkZ3IJ0NnId8qOWH+8Xl1sqZ7xlsWTd1sYYHlpvkdvqw1HNLP22EpwwKW5Kb5zBEd/qs3o1OO0Tqa0MR6JpgGdHHRk1iZ25+qTfRVP06vO2RXsgAx4SZfO7DyB0QZn8tGNMMI="
-
-android:
-  components:
-    - platform-tools
-    - tools
-    - build-tools-24.0.1
-    - android-24
-    - extra-android-m2repository
-
-script:
-  - ./gradlew testDebugUnitTest
-
-addons:
-  coverity_scan:
-    project:
-      name: "termux/termux-app"
-      description: "Terminal emulator and Linux environment for Android"
-    notification_email: fredrik@fornwall.net
-    build_command_prepend: "./gradlew clean"
-    build_command: "./gradlew assemble"
-    branch_pattern: coverity_scan

LICENSE.md

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

README.md

@@ -1,39 +1,65 @@
-Termux app
-==========
-[![Travis build status](https://travis-ci.org/termux/termux-app.svg?branch=master)](https://travis-ci.org/termux/termux-app)
+# Termux application
+
+[![Build status](https://github.com/termux/termux-app/workflows/Build/badge.svg)](https://github.com/termux/termux-app/actions)
+[![Testing status](https://github.com/termux/termux-app/workflows/Unit%20tests/badge.svg)](https://github.com/termux/termux-app/actions)
 [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)
 
+[Termux](https://termux.com) is an Android terminal application and Linux environment.
 
-Termux is an Android terminal app and Linux environment.
+- [Termux Reddit community](https://reddit.com/r/termux)
+- [Termux Wiki](https://wiki.termux.com/wiki/)
+- [Termux Twitter](http://twitter.com/termux/)
 
-* [Termux on Google Play Store](https://play.google.com/store/apps/details?id=com.termux)
-* [Termux on F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux)
-* [termux.com](http://termux.com)
-* [Termux Help](http://termux.com/help/)
-* [Termux app on GitHub](https://github.com/termux/termux-app)
-* [Termux packages on GitHub](https://github.com/termux/termux-packages)
-* [Termux Google+ community](http://termux.com/community/)
+Note that this repository is for the app itself (the user interface and the
+terminal emulation). For the packages installable inside the app, see
+[termux/termux-packages](https://github.com/termux/termux-packages)
 
-License
-=======
-Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html). Contains code from `Terminal Emulator for Android` which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
+## Installation
 
-Building JNI libraries
-======================
-Execute the `build-jnilibs.sh` script to build the required JNI libraries.
+Termux application can be obtained from:
 
-Terminal resources
-==================
-* [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)
-* [vt100.net](http://vt100.net/)
-* [Terminal codes (ANSI and terminfo equivalents)](http://wiki.bash-hackers.org/scripting/terminalcodes)
+- [Google Play](https://play.google.com/store/apps/details?id=com.termux)
+- [F-Droid](https://f-droid.org/en/packages/com.termux/)
+- [Kali Nethunter Store](https://store.nethunter.com/en/packages/com.termux/)
 
-Terminal emulators
-==================
-* VTE (libvte): Terminal emulator widget for GTK+, mainly used in gnome-terminal. [Source](https://github.com/GNOME/vte), [Open Issues](https://bugzilla.gnome.org/buglist.cgi?quicksearch=product%3A%22vte%22+), and [All (including closed) issues](https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&chfield=resolution&chfieldfrom=-2000d&chfieldvalue=FIXED&product=vte&resolution=FIXED).
-* iTerm 2: OS X terminal application. [Source](https://github.com/gnachman/iTerm2), [Issues](https://gitlab.com/gnachman/iterm2/issues) and [Documentation](http://www.iterm2.com/documentation.html) (which includes [iTerm2 proprietary escape codes](http://www.iterm2.com/documentation-escape-codes.html)).
-* Konsole: KDE terminal application. [Source](https://projects.kde.org/projects/kde/applications/konsole/repository), in particular [tests](https://projects.kde.org/projects/kde/applications/konsole/repository/revisions/master/show/tests), [Bugs](https://bugs.kde.org/buglist.cgi?bug_severity=critical&bug_severity=grave&bug_severity=major&bug_severity=crash&bug_severity=normal&bug_severity=minor&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=konsole) and [Wishes](https://bugs.kde.org/buglist.cgi?bug_severity=wishlist&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=konsole).
-* hterm: JavaScript terminal implementation from Chromium. [Source](https://github.com/chromium/hterm), including [tests](https://github.com/chromium/hterm/blob/master/js/hterm_vt_tests.js), and [Google group](https://groups.google.com/a/chromium.org/forum/#!forum/chromium-hterm).
-* xterm: The grandfather of terminal emulators. [Source](http://invisible-island.net/datafiles/release/xterm.tar.gz).
-* Connectbot: Android SSH client. [Source](https://github.com/connectbot/connectbot)
-* Android Terminal Emulator: Android terminal app which Termux terminal handling is based on. Inactive. [Source](https://github.com/jackpal/Android-Terminal-Emulator).
+Additionally we provide per-commit debug builds for those who want to try
+out the latest features or test their pull request. This build can be obtained
+from one of the workflow runs listed on [Github Actions](https://github.com/termux/termux-app/actions)
+page.
+
+Signature keys of all offered builds are different. Before you switch the
+installation source, you will have to uninstall the Termux application and
+all currently installed plugins.
+
+## Terminal resources
+
+- [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)
+- [vt100.net](http://vt100.net/)
+- [Terminal codes (ANSI and terminfo equivalents)](http://wiki.bash-hackers.org/scripting/terminalcodes)
+
+## Terminal emulators
+
+- VTE (libvte): Terminal emulator widget for GTK+, mainly used in gnome-terminal.
+  [Source](https://github.com/GNOME/vte), [Open Issues](https://bugzilla.gnome.org/buglist.cgi?quicksearch=product%3A%22vte%22+),
+  and [All (including closed) issues](https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&chfield=resolution&chfieldfrom=-2000d&chfieldvalue=FIXED&product=vte&resolution=FIXED).
+
+- iTerm 2: OS X terminal application. [Source](https://github.com/gnachman/iTerm2),
+  [Issues](https://gitlab.com/gnachman/iterm2/issues) and [Documentation](http://www.iterm2.com/documentation.html)
+  (which includes [iTerm2 proprietary escape codes](http://www.iterm2.com/documentation-escape-codes.html)).
+
+- Konsole: KDE terminal application. [Source](https://projects.kde.org/projects/kde/applications/konsole/repository),
+  in particular [tests](https://projects.kde.org/projects/kde/applications/konsole/repository/revisions/master/show/tests),
+  [Bugs](https://bugs.kde.org/buglist.cgi?bug_severity=critical&bug_severity=grave&bug_severity=major&bug_severity=crash&bug_severity=normal&bug_severity=minor&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=konsole)
+  and [Wishes](https://bugs.kde.org/buglist.cgi?bug_severity=wishlist&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=konsole).
+
+- hterm: JavaScript terminal implementation from Chromium. [Source](https://github.com/chromium/hterm),
+  including [tests](https://github.com/chromium/hterm/blob/master/js/hterm_vt_tests.js),
+  and [Google group](https://groups.google.com/a/chromium.org/forum/#!forum/chromium-hterm).
+
+- xterm: The grandfather of terminal emulators.
+  [Source](http://invisible-island.net/datafiles/release/xterm.tar.gz).
+
+- Connectbot: Android SSH client. [Source](https://github.com/connectbot/connectbot)
+
+- Android Terminal Emulator: Android terminal app which Termux terminal handling
+  is based on. Inactive. [Source](https://github.com/jackpal/Android-Terminal-Emulator).

app/build.gradle

@@ -1,25 +1,43 @@
-apply plugin: 'com.android.application'
+plugins {
+  id "com.android.application"
+}
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion project.properties.compileSdkVersion.toInteger()
+    ndkVersion project.properties.ndkVersion
 
     dependencies {
-        compile 'com.android.support:support-annotations:24.1.1'
-        compile "com.android.support:support-v4:24.1.1"
+        implementation "androidx.annotation:annotation:1.1.0"
+        implementation "androidx.viewpager:viewpager:1.0.0"
+        implementation "androidx.drawerlayout:drawerlayout:1.1.0"
+        implementation project(":terminal-view")
     }
 
     defaultConfig {
         applicationId "com.termux"
-        minSdkVersion 21
-        targetSdkVersion 24
-        versionCode 38
-        versionName "0.38"
+        minSdkVersion project.properties.minSdkVersion.toInteger()
+        targetSdkVersion project.properties.targetSdkVersion.toInteger()
+        versionCode 102
+        versionName "0.102"
+
+        externalNativeBuild {
+            ndkBuild {
+                cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
+            }
+        }
 
         ndk {
-            moduleName "libtermux"
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-            cFlags "-std=c11 -Wall -Wextra -Os -fno-stack-protector -nostdlib -Wl,--gc-sections"
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        }
+
+    }
+
+    signingConfigs {
+        debug {
+            storeFile file('dev_keystore.jks')
+            keyAlias 'alias'
+            storePassword 'xrj45yWGLbsO7W0v'
+            keyPassword 'xrj45yWGLbsO7W0v'
         }
     }
 
@@ -29,9 +47,102 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            signingConfig signingConfigs.debug
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path "src/main/cpp/Android.mk"
+        }
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
     }
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
+}
+
+task versionName {
+  doLast {
+    print android.defaultConfig.versionName
+  }
+}
+
+def downloadBootstrap(String arch, String expectedChecksum, int version) {
+    def digest = java.security.MessageDigest.getInstance("SHA-256")
+
+    def localUrl = "src/main/cpp/bootstrap-" + arch + ".zip"
+    def file = new File(projectDir, localUrl)
+    if (file.exists()) {
+        def buffer = new byte[8192]
+        def input = new FileInputStream(file)
+        while (true) {
+            def readBytes = input.read(buffer)
+            if (readBytes < 0) break
+            digest.update(buffer, 0, readBytes)
+        }
+        def checksum = new BigInteger(1, digest.digest()).toString(16)
+        if (checksum == expectedChecksum) {
+            return
+        } else {
+            logger.quiet("Deleting old local file with wrong hash: " + localUrl)
+            file.delete()
+        }
+    }
+
+    def remoteUrl = "https://bintray.com/termux/bootstrap/download_file?file_path=bootstrap-" + arch + "-v" + version + ".zip"
+    logger.quiet("Downloading " + remoteUrl + " ...")
+
+    file.parentFile.mkdirs()
+    def out = new BufferedOutputStream(new FileOutputStream(file))
+
+    def connection = new URL(remoteUrl).openConnection()
+    connection.setInstanceFollowRedirects(true)
+    def digestStream = new java.security.DigestInputStream(connection.inputStream, digest)
+    out << digestStream
+    out.close()
+
+    def checksum = new BigInteger(1, digest.digest()).toString(16)
+    if (checksum != expectedChecksum) {
+        file.delete()
+        throw new GradleException("Wrong checksum for " + remoteUrl + ": expected: " + expectedChecksum + ", actual: " + checksum)
+    }
+}
+
+clean {
+    doLast {
+        def tree = fileTree(new File(projectDir, 'src/main/cpp'))
+        tree.include 'bootstrap-*.zip'
+        tree.each { it.delete() }
+    }
+}
+
+task downloadBootstraps(){
+    doLast {
+        def version = 31
+        downloadBootstrap("aarch64", "e9149cb01735f04b180434093dfb8e703015f8a66044acaead7cbff1e536a990", version)
+        downloadBootstrap("arm",     "8e5776074c58b3e94b1336f2ec0e840057fce9c089faee6683ae5c136441da7b", version)
+        downloadBootstrap("i686",    "f89be9d0197fb9c6b498922ff0f95562fd17b63c934617858f959b8e452ade27", version)
+        downloadBootstrap("x86_64",  "9aa97647afc085fae4e8485458a7d15f23db6e1e3601727f014af8b8eb4519a9", version)
+    }
+}
+
+afterEvaluate {
+  android.applicationVariants.all { variant ->
+    variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
+  }
 }

app/proguard-rules.pro

@@ -7,11 +7,5 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-renamesourcefileattribute SourceFile
+-keepattributes SourceFile,LineNumberTable

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

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

app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.termux"
     android:installLocation="internalOnly"
     android:sharedUserId="com.termux"
@@ -7,25 +8,41 @@
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.software.leanback" android:required="false" />
 
+    <permission android:name="com.termux.permission.RUN_COMMAND"
+        android:label="@string/run_command_permission_label"
+        android:description="@string/run_command_permission_description"
+        android:icon="@drawable/ic_launcher"
+        android:protectionLevel="dangerous" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
-        android:allowBackup="true"
-        android:fullBackupContent="@xml/backupscheme"
+        android:extractNativeLibs="true"
+        android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:banner="@drawable/banner"
         android:label="@string/application_name"
         android:theme="@style/Theme.Termux"
         android:supportsRtl="false" >
 
+        <!-- This (or rather, value 2.1 or higher) is needed to make the Samsung Galaxy S8
+             mark the app with "This app is optimized to run in full screen." -->
+        <meta-data android:name="android.max_aspect" android:value="10.0" />
+
         <activity
             android:name="com.termux.app.TermuxActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+	    android:label="@string/application_name"
+	    android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize|stateAlwaysVisible" >
+            android:resizeableActivity="true"
+	    android:windowSoftInputMode="adjustResize|stateAlwaysVisible" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -34,6 +51,7 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
         </activity>
 
         <activity
@@ -41,6 +59,7 @@
             android:exported="false"
             android:theme="@android:style/Theme.Material.Light.DarkActionBar"
             android:parentActivityName=".app.TermuxActivity"
+            android:resizeableActivity="true"
             android:label="@string/application_name" />
 
         <activity
@@ -48,6 +67,7 @@
             android:label="@string/application_name"
             android:taskAffinity="com.termux.filereceiver"
             android:excludeFromRecents="true"
+            android:resizeableActivity="true"
             android:noHistory="true">
             <!-- Accept multiple file types when sending. -->
             <intent-filter>
@@ -62,10 +82,11 @@
                 <data android:mimeType="video/*" />
             </intent-filter>
             <!-- Be more restrictive for viewing files, restricting ourselves to text files. -->
-            <intent-filter>
+            <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/*" />
+                <data android:mimeType="application/*log*" />
                 <data android:mimeType="application/json" />
                 <data android:mimeType="application/*xml*" />
                 <data android:mimeType="application/*latex*" />
@@ -73,6 +94,18 @@
             </intent-filter>
         </activity>
 
+        <activity-alias
+            android:name=".HomeActivity"
+            android:targetActivity="com.termux.app.TermuxActivity">
+
+            <!-- Launch activity automatically on boot on Android Things devices -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.IOT_LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity-alias>
+
         <provider
             android:name=".filepicker.TermuxDocumentsProvider"
             android:authorities="com.termux.documents"
@@ -88,6 +121,24 @@
             android:name="com.termux.app.TermuxService"
             android:exported="false" />
 
+        <service
+            android:name=".app.RunCommandService"
+            android:exported="true"
+            android:permission="com.termux.permission.RUN_COMMAND" >
+            <intent-filter>
+                <action android:name="com.termux.RUN_COMMAND" />
+            </intent-filter>
+        </service>
+
+        <receiver android:name=".app.TermuxOpenReceiver" />
+
+        <provider android:authorities="com.termux.files"
+                  android:readPermission="android.permission.permRead"
+                  android:exported="true"
+                  android:grantUriPermissions="true"
+                  android:name="com.termux.app.TermuxOpenReceiver$ContentProvider" />
+	<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
+	<meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="true"/>
     </application>
 
 </manifest>

app/src/main/cpp/Android.mk

@@ -0,0 +1,5 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libtermux-bootstrap
+LOCAL_SRC_FILES := termux-bootstrap-zip.S termux-bootstrap.c
+include $(BUILD_SHARED_LIBRARY)

app/src/main/cpp/termux-bootstrap-zip.S

@@ -0,0 +1,18 @@
+     .global blob
+     .global blob_size
+     .section .rodata
+ blob:
+ #if defined __i686__
+     .incbin "bootstrap-i686.zip"
+ #elif defined __x86_64__
+     .incbin "bootstrap-x86_64.zip"
+ #elif defined __aarch64__
+     .incbin "bootstrap-aarch64.zip"
+ #elif defined __arm__
+     .incbin "bootstrap-arm.zip"
+ #else
+ # error Unsupported arch
+ #endif
+ 1:
+ blob_size:
+     .int 1b - blob

app/src/main/cpp/termux-bootstrap.c

@@ -0,0 +1,11 @@
+#include <jni.h>
+
+extern jbyte blob[];
+extern int blob_size;
+
+JNIEXPORT jbyteArray JNICALL Java_com_termux_app_TermuxInstaller_getZip(JNIEnv *env, __attribute__((__unused__)) jobject This)
+{
+    jbyteArray ret = (*env)->NewByteArray(env, blob_size);
+    (*env)->SetByteArrayRegion(env, ret, 0, blob_size, blob);
+    return ret;
+}

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

@@ -1,68 +1,61 @@
 package com.termux.app;
 
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Bundle;
 import android.util.Log;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A background job launched by Termux.
  */
 public final class BackgroundJob {
 
-    private static final String LOG_TAG = "termux-background";
+    private static final String LOG_TAG = "termux-task";
 
     final Process mProcess;
 
-    public BackgroundJob(File cwd, File fileToExecute, String[] args) throws IOException {
-        String[] env = buildEnvironment(false, cwd.getAbsolutePath());
+    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service){
+        this(cwd, fileToExecute, args, service, null);
+    }
 
-        String[] progArray = new String[args.length + 1];
+    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service, PendingIntent pendingIntent) {
+        String[] env = buildEnvironment(false, cwd);
+        if (cwd == null) cwd = TermuxService.HOME_PATH;
 
-        mProcess = Runtime.getRuntime().exec(progArray, env, cwd);
+        final String[] progArray = setupProcessArgs(fileToExecute, args);
+        final String processDescription = Arrays.toString(progArray);
 
-        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();
+        Process process;
+        try {
+            process = Runtime.getRuntime().exec(progArray, env, new File(cwd));
+        } catch (IOException e) {
+            mProcess = null;
+            // TODO: Visible error message?
+            Log.e(LOG_TAG, "Failed running background job: " + processDescription, e);
+            return;
+        }
 
-        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();
+        mProcess = process;
+        final int pid = getPid(mProcess);
+        final Bundle result = new Bundle();
+        final StringBuilder outResult = new StringBuilder();
+        final StringBuilder errResult = new StringBuilder();
 
-
-        new Thread() {
+        Thread errThread = new Thread() {
             @Override
             public void run() {
                 InputStream stderr = mProcess.getErrorStream();
@@ -71,42 +64,177 @@ public final class BackgroundJob {
                 try {
                     // FIXME: Long lines.
                     while ((line = reader.readLine()) != null) {
-                        Log.e(LOG_TAG, line);
+                        errResult.append(line).append('\n');
+                        Log.i(LOG_TAG, "[" + pid + "] stderr: " + line);
                     }
                 } catch (IOException e) {
                     // Ignore.
                 }
             }
         };
+        errThread.start();
+
+        new Thread() {
+            @Override
+            public void run() {
+                Log.i(LOG_TAG, "[" + pid + "] starting: " + processDescription);
+                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, "[" + pid + "] stdout: " + line);
+                        outResult.append(line).append('\n');
+                    }
+                } catch (IOException e) {
+                    Log.e(LOG_TAG, "Error reading output", e);
+                }
+
+                try {
+                    int exitCode = mProcess.waitFor();
+                    service.onBackgroundJobExited(BackgroundJob.this);
+                    if (exitCode == 0) {
+                        Log.i(LOG_TAG, "[" + pid + "] exited normally");
+                    } else {
+                        Log.w(LOG_TAG, "[" + pid + "] exited with code: " + exitCode);
+                    }
+
+                    result.putString("stdout", outResult.toString());
+                    result.putInt("exitCode", exitCode);
+
+                    errThread.join();
+                    result.putString("stderr", errResult.toString());
+
+                    Intent data = new Intent();
+                    data.putExtra("result", result);
+
+                    if(pendingIntent != null) {
+                        try {
+                            pendingIntent.send(service.getApplicationContext(), Activity.RESULT_OK, data);
+                        } catch (PendingIntent.CanceledException e) {
+                            // The caller doesn't want the result? That's fine, just ignore
+                        }
+                    }
+                } catch (InterruptedException e) {
+                    // Ignore
+                }
+            }
+        }.start();
     }
 
-    public String[] buildEnvironment(boolean failSafe, String cwd) {
+    private static void addToEnvIfPresent(List<String> environment, String name) {
+        String value = System.getenv(name);
+        if (value != null) {
+            environment.add(name + "=" + value);
+        }
+    }
+
+    static 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");
+        List<String> environment = new ArrayList<>();
+
+        environment.add("TERM=xterm-256color");
+        environment.add("COLORTERM=truecolor");
+        environment.add("HOME=" + TermuxService.HOME_PATH);
+        environment.add("PREFIX=" + TermuxService.PREFIX_PATH);
+        environment.add("BOOTCLASSPATH=" + System.getenv("BOOTCLASSPATH"));
+        environment.add("ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"));
+        environment.add("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;
+        environment.add("EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"));
+
+        // These variables are needed if running on Android 10 and higher.
+        addToEnvIfPresent(environment, "ANDROID_ART_ROOT");
+        addToEnvIfPresent(environment, "DEX2OATBOOTCLASSPATH");
+        addToEnvIfPresent(environment, "ANDROID_I18N_ROOT");
+        addToEnvIfPresent(environment, "ANDROID_RUNTIME_ROOT");
+        addToEnvIfPresent(environment, "ANDROID_TZDATA_ROOT");
+
         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};
+            environment.add("PATH= " + System.getenv("PATH"));
         } 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;
+            environment.add("LANG=en_US.UTF-8");
+            environment.add("PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets");
+            environment.add("PWD=" + cwd);
+            environment.add("TMPDIR=" + TermuxService.PREFIX_PATH + "/tmp");
+        }
 
-            return new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv};
+        return environment.toArray(new String[0]);
+    }
+
+    public static int getPid(Process p) {
+        try {
+            Field f = p.getClass().getDeclaredField("pid");
+            f.setAccessible(true);
+            try {
+                return f.getInt(p);
+            } finally {
+                f.setAccessible(false);
+            }
+        } catch (Throwable e) {
+            return -1;
         }
     }
 
+    static String[] setupProcessArgs(String fileToExecute, String[] args) {
+        // The file to execute may either be:
+        // - An elf file, in which we execute it directly.
+        // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
+        //   system /system/bin/sh. The system shell may vary and may not work at all due to LD_LIBRARY_PATH.
+        // - A file with shebang, which we try to handle with e.g. /bin/foo -> $PREFIX/bin/foo.
+        String interpreter = null;
+        try {
+            File file = new File(fileToExecute);
+            try (FileInputStream in = new FileInputStream(file)) {
+                byte[] buffer = new byte[256];
+                int bytesRead = in.read(buffer);
+                if (bytesRead > 4) {
+                    if (buffer[0] == 0x7F && buffer[1] == 'E' && buffer[2] == 'L' && buffer[3] == 'F') {
+                        // Elf file, do nothing.
+                    } else if (buffer[0] == '#' && buffer[1] == '!') {
+                        // Try to parse shebang.
+                        StringBuilder builder = new StringBuilder();
+                        for (int i = 2; i < bytesRead; i++) {
+                            char c = (char) buffer[i];
+                            if (c == ' ' || c == '\n') {
+                                if (builder.length() == 0) {
+                                    // Skip whitespace after shebang.
+                                } else {
+                                    // End of shebang.
+                                    String executable = builder.toString();
+                                    if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
+                                        String[] parts = executable.split("/");
+                                        String binary = parts[parts.length - 1];
+                                        interpreter = TermuxService.PREFIX_PATH + "/bin/" + binary;
+                                    }
+                                    break;
+                                }
+                            } else {
+                                builder.append(c);
+                            }
+                        }
+                    } else {
+                        // No shebang and no ELF, use standard shell.
+                        interpreter = TermuxService.PREFIX_PATH + "/bin/sh";
+                    }
+                }
+            }
+        } catch (IOException e) {
+            // Ignore.
+        }
+
+        List<String> result = new ArrayList<>();
+        if (interpreter != null) result.add(interpreter);
+        result.add(fileToExecute);
+        if (args != null) Collections.addAll(result, args);
+        return result.toArray(new String[0]);
+    }
+
 }

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

@@ -0,0 +1,63 @@
+package com.termux.app;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.os.Vibrator;
+
+public class BellUtil {
+    private static BellUtil instance = null;
+    private static final Object lock = new Object();
+
+    public static BellUtil getInstance(Context context) {
+        if (instance == null) {
+            synchronized (lock) {
+                if (instance == null) {
+                    instance = new BellUtil((Vibrator) context.getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE));
+                }
+            }
+        }
+
+        return instance;
+    }
+
+    private static final long DURATION = 50;
+    private static final long MIN_PAUSE = 3 * DURATION;
+
+    private final Handler handler = new Handler(Looper.getMainLooper());
+    private long lastBell = 0;
+    private final Runnable bellRunnable;
+
+    private BellUtil(final Vibrator vibrator) {
+        bellRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (vibrator != null) {
+                    vibrator.vibrate(DURATION);
+                }
+            }
+        };
+    }
+
+    public synchronized void doBell() {
+        long now = now();
+        long timeSinceLastBell = now - lastBell;
+
+        if (timeSinceLastBell < 0) {
+            // there is a next bell pending; don't schedule another one
+        } else if (timeSinceLastBell < MIN_PAUSE) {
+            // there was a bell recently, scheudle the next one
+            handler.postDelayed(bellRunnable, MIN_PAUSE - timeSinceLastBell);
+            lastBell = lastBell + MIN_PAUSE;
+        } else {
+            // the last bell was long ago, do it now
+            bellRunnable.run();
+            lastBell = now;
+        }
+    }
+
+    private long now() {
+        return SystemClock.uptimeMillis();
+    }
+}

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

@@ -9,7 +9,6 @@ import android.view.KeyEvent;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 public final class DialogUtils {
 
@@ -31,13 +30,10 @@ public final class DialogUtils {
 
         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;
-            }
+        input.setOnEditorActionListener((v, actionId, event) -> {
+            onPositive.onTextSet(input.getText().toString());
+            dialogHolder[0].dismiss();
+            return true;
         });
 
         float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, activity.getResources().getDisplayMetrics());
@@ -53,31 +49,16 @@ public final class DialogUtils {
 
         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());
-                }
-            });
+            .setPositiveButton(positiveButtonText, (d, whichButton) -> onPositive.onTextSet(input.getText().toString()));
 
         if (onNeutral != null) {
-            builder.setNeutralButton(neutralButtonText, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    onNeutral.onTextSet(input.getText().toString());
-                }
-            });
+            builder.setNeutralButton(neutralButtonText, (dialog, which) -> onNeutral.onTextSet(input.getText().toString()));
         }
 
         if (onNegative == null) {
             builder.setNegativeButton(android.R.string.cancel, null);
         } else {
-            builder.setNegativeButton(negativeButtonText, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    onNegative.onTextSet(input.getText().toString());
-                }
-            });
+            builder.setNegativeButton(negativeButtonText, (dialog, which) -> onNegative.onTextSet(input.getText().toString()));
         }
 
         if (onDismiss != null) builder.setOnDismissListener(onDismiss);

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

@@ -0,0 +1,340 @@
+package com.termux.app;
+
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class ExtraKeysInfos {
+
+    /**
+     * Matrix of buttons displayed
+     */
+    private ExtraKeyButton[][] buttons;
+
+    /**
+     * This corresponds to one of the CharMapDisplay below
+     */
+    private String style = "default";
+
+    public ExtraKeysInfos(String propertiesInfo, String style) throws JSONException {
+        this.style = style;
+
+        // Convert String propertiesInfo to Array of Arrays
+        JSONArray arr = new JSONArray(propertiesInfo);
+        Object[][] matrix = new Object[arr.length()][];
+        for (int i = 0; i < arr.length(); i++) {
+            JSONArray line = arr.getJSONArray(i);
+            matrix[i] = new Object[line.length()];
+            for (int j = 0; j < line.length(); j++) {
+                matrix[i][j] = line.get(j);
+            }
+        }
+
+        // convert matrix to buttons
+        this.buttons = new ExtraKeyButton[matrix.length][];
+        for (int i = 0; i < matrix.length; i++) {
+            this.buttons[i] = new ExtraKeyButton[matrix[i].length];
+            for (int j = 0; j < matrix[i].length; j++) {
+                Object key = matrix[i][j];
+
+                JSONObject jobject = normalizeKeyConfig(key);
+
+                ExtraKeyButton button;
+
+                if(! jobject.has("popup")) {
+                    // no popup
+                    button = new ExtraKeyButton(getSelectedCharMap(), jobject);
+                } else {
+                    // a popup
+                    JSONObject popupJobject = normalizeKeyConfig(jobject.get("popup"));
+                    ExtraKeyButton popup = new ExtraKeyButton(getSelectedCharMap(), popupJobject);
+                    button = new ExtraKeyButton(getSelectedCharMap(), jobject, popup);
+                }
+
+                this.buttons[i][j] = button;
+            }
+        }
+    }
+
+    /**
+     * "hello" -> {"key": "hello"}
+     */
+    private static JSONObject normalizeKeyConfig(Object key) throws JSONException {
+        JSONObject jobject;
+        if(key instanceof String) {
+            jobject = new JSONObject();
+            jobject.put("key", key);
+        } else if(key instanceof JSONObject) {
+            jobject = (JSONObject) key;
+        } else {
+            throw new JSONException("An key in the extra-key matrix must be a string or an object");
+        }
+        return jobject;
+    }
+
+    public ExtraKeyButton[][] getMatrix() {
+        return buttons;
+    }
+
+    /**
+     * HashMap that implements Python dict.get(key, default) function.
+     * Default java.util .get(key) is then the same as .get(key, null);
+     */
+    static class CleverMap<K,V> extends HashMap<K,V> {
+        V get(K key, V defaultValue) {
+            if(containsKey(key))
+                return get(key);
+            else
+                return defaultValue;
+        }
+    }
+
+    static class CharDisplayMap extends CleverMap<String, String> {}
+
+    /**
+     * Keys are displayed in a natural looking way, like "→" for "RIGHT"
+     */
+    static final CharDisplayMap classicArrowsDisplay = new CharDisplayMap() {{
+        // classic arrow keys (for ◀ ▶ ▲ ▼ @see arrowVariationDisplay)
+        put("LEFT", "←"); // U+2190 ← LEFTWARDS ARROW
+        put("RIGHT", "→"); // U+2192 → RIGHTWARDS ARROW
+        put("UP", "↑"); // U+2191 ↑ UPWARDS ARROW
+        put("DOWN", "↓"); // U+2193 ↓ DOWNWARDS ARROW
+    }};
+
+    static final CharDisplayMap wellKnownCharactersDisplay = new CharDisplayMap() {{
+        // well known characters // https://en.wikipedia.org/wiki/{Enter_key, Tab_key, Delete_key}
+        put("ENTER", "↲"); // U+21B2 ↲ DOWNWARDS ARROW WITH TIP LEFTWARDS
+        put("TAB", "↹"); // U+21B9 ↹ LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
+        put("BKSP", "⌫"); // U+232B ⌫ ERASE TO THE LEFT sometimes seen and easy to understand
+        put("DEL", "⌦"); // U+2326 ⌦ ERASE TO THE RIGHT not well known but easy to understand
+        put("DRAWER", "☰"); // U+2630 ☰ TRIGRAM FOR HEAVEN not well known but easy to understand
+        put("KEYBOARD", "⌨"); // U+2328 ⌨ KEYBOARD not well known but easy to understand
+    }};
+
+    static final CharDisplayMap lessKnownCharactersDisplay = new CharDisplayMap() {{
+        // https://en.wikipedia.org/wiki/{Home_key, End_key, Page_Up_and_Page_Down_keys}
+        // home key can mean "goto the beginning of line" or "goto first page" depending on context, hence the diagonal
+        put("HOME", "⇱"); // from IEC 9995 // U+21F1 ⇱ NORTH WEST ARROW TO CORNER
+        put("END", "⇲"); // from IEC 9995 // ⇲ // U+21F2 ⇲ SOUTH EAST ARROW TO CORNER
+        put("PGUP", "⇑"); // no ISO character exists, U+21D1 ⇑ UPWARDS DOUBLE ARROW will do the trick
+        put("PGDN", "⇓"); // no ISO character exists, U+21D3 ⇓ DOWNWARDS DOUBLE ARROW will do the trick
+    }};
+
+    static final CharDisplayMap arrowTriangleVariationDisplay = new CharDisplayMap() {{
+        // alternative to classic arrow keys
+        put("LEFT", "◀"); // U+25C0 ◀ BLACK LEFT-POINTING TRIANGLE
+        put("RIGHT", "▶"); // U+25B6 ▶ BLACK RIGHT-POINTING TRIANGLE
+        put("UP", "▲"); // U+25B2 ▲ BLACK UP-POINTING TRIANGLE
+        put("DOWN", "▼"); // U+25BC ▼ BLACK DOWN-POINTING TRIANGLE
+    }};
+
+    static final CharDisplayMap notKnownIsoCharacters = new CharDisplayMap() {{
+        // Control chars that are more clear as text // https://en.wikipedia.org/wiki/{Function_key, Alt_key, Control_key, Esc_key}
+        // put("FN", "FN"); // no ISO character exists
+        put("CTRL", "⎈"); // ISO character "U+2388 ⎈ HELM SYMBOL" is unknown to people and never printed on computers, however "U+25C7 ◇ WHITE DIAMOND" is a nice presentation, and "^" for terminal app and mac is often used
+        put("ALT", "⎇"); // ISO character "U+2387 ⎇ ALTERNATIVE KEY SYMBOL'" is unknown to people and only printed as the Option key "⌥" on Mac computer
+        put("ESC", "⎋"); // ISO character "U+238B ⎋ BROKEN CIRCLE WITH NORTHWEST ARROW" is unknown to people and not often printed on computers
+    }};
+
+    static final CharDisplayMap nicerLookingDisplay = new CharDisplayMap() {{
+        // nicer looking for most cases
+        put("-", "―"); // U+2015 ― HORIZONTAL BAR
+    }};
+
+    /**
+     * Multiple maps are available to quickly change
+     * the style of the keys.
+     */
+
+    /**
+     * Some classic symbols everybody knows
+     */
+    private static final CharDisplayMap defaultCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(nicerLookingDisplay);
+        // all other characters are displayed as themselves
+    }};
+
+    /**
+     * Classic symbols and less known symbols
+     */
+    private static final CharDisplayMap lotsOfArrowsCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(lessKnownCharactersDisplay); // NEW
+        putAll(nicerLookingDisplay);
+    }};
+
+    /**
+     * Only arrows
+     */
+    private static final CharDisplayMap arrowsOnlyCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        // putAll(wellKnownCharactersDisplay); // REMOVED
+        // putAll(lessKnownCharactersDisplay); // REMOVED
+        putAll(nicerLookingDisplay);
+    }};
+
+    /**
+     * Full Iso
+     */
+    private static final CharDisplayMap fullIsoCharDisplay = new CharDisplayMap() {{
+        putAll(classicArrowsDisplay);
+        putAll(wellKnownCharactersDisplay);
+        putAll(lessKnownCharactersDisplay); // NEW
+        putAll(nicerLookingDisplay);
+        putAll(notKnownIsoCharacters); // NEW
+    }};
+
+    /**
+     * Some people might call our keys differently
+     */
+    static private final CharDisplayMap controlCharsAliases = new CharDisplayMap() {{
+        put("ESCAPE", "ESC");
+        put("CONTROL", "CTRL");
+        put("RETURN", "ENTER"); // Technically different keys, but most applications won't see the difference
+        put("FUNCTION", "FN");
+        // no alias for ALT
+
+        // Directions are sometimes written as first and last letter for brevety
+        put("LT", "LEFT");
+        put("RT", "RIGHT");
+        put("DN", "DOWN");
+        // put("UP", "UP"); well, "UP" is already two letters
+
+        put("PAGEUP", "PGUP");
+        put("PAGE_UP", "PGUP");
+        put("PAGE UP", "PGUP");
+        put("PAGE-UP", "PGUP");
+
+        // no alias for HOME
+        // no alias for END
+
+        put("PAGEDOWN", "PGDN");
+        put("PAGE_DOWN", "PGDN");
+        put("PAGE-DOWN", "PGDN");
+
+        put("DELETE", "DEL");
+        put("BACKSPACE", "BKSP");
+
+        // easier for writing in termux.properties
+        put("BACKSLASH", "\\");
+        put("QUOTE", "\"");
+        put("APOSTROPHE", "'");
+    }};
+
+    CharDisplayMap getSelectedCharMap() {
+        switch (style) {
+            case "arrows-only":
+                return arrowsOnlyCharDisplay;
+            case "arrows-all":
+                return lotsOfArrowsCharDisplay;
+            case "all":
+                return fullIsoCharDisplay;
+            case "none":
+                return new CharDisplayMap();
+            default:
+                return defaultCharDisplay;
+        }
+    }
+
+    /**
+     * Applies the 'controlCharsAliases' mapping to all the strings in *buttons*
+     * Modifies the array, doesn't return a new one.
+     */
+    public static String replaceAlias(String key) {
+        return controlCharsAliases.get(key, key);
+    }
+}
+
+class ExtraKeyButton {
+
+    /**
+     * The key that will be sent to the terminal, either a control character
+     * defined in ExtraKeysView.keyCodesForString (LEFT, RIGHT, PGUP...) or
+     * some text.
+     */
+    private String key;
+
+    /**
+     * If the key is a macro, i.e. a sequence of keys separated by space.
+     */
+    private boolean macro;
+
+    /**
+     * The text that will be shown on the button.
+     */
+    private String display;
+
+    /**
+     * The information of the popup (triggered by swipe up).
+     */
+    @Nullable
+    private ExtraKeyButton popup = null;
+
+    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config) throws JSONException {
+        this(charDisplayMap, config, null);
+    }
+
+    public ExtraKeyButton(ExtraKeysInfos.CharDisplayMap charDisplayMap, JSONObject config, ExtraKeyButton popup) throws JSONException {
+        String keyFromConfig = config.optString("key", null);
+        String macroFromConfig = config.optString("macro", null);
+        String[] keys;
+        if (keyFromConfig != null && macroFromConfig != null) {
+            throw new JSONException("Both key and macro can't be set for the same key");
+        } else if (keyFromConfig != null) {
+            keys = new String[]{keyFromConfig};
+            this.macro = false;
+        } else if (macroFromConfig != null) {
+            keys = macroFromConfig.split(" ");
+            this.macro = true;
+        } else {
+            throw new JSONException("All keys have to specify either key or macro");
+        }
+
+        for (int i = 0; i < keys.length; i++) {
+            keys[i] = ExtraKeysInfos.replaceAlias(keys[i]);
+        }
+
+        this.key = TextUtils.join(" ", keys);
+
+        String displayFromConfig = config.optString("display", null);
+        if (displayFromConfig != null) {
+            this.display = displayFromConfig;
+        } else {
+            this.display = Arrays.stream(keys)
+                .map(key -> charDisplayMap.get(key, key))
+                .collect(Collectors.joining(" "));
+        }
+
+        this.popup = popup;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public boolean isMacro() {
+        return macro;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    @Nullable
+    public ExtraKeyButton getPopup() {
+        return popup;
+    }
+}

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

@@ -1,18 +1,35 @@
 package com.termux.app;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
 import android.util.AttributeSet;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ScheduledExecutorService;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Arrays;
+
 import android.view.Gravity;
+import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.GridLayout;
+import android.widget.PopupWindow;
 import android.widget.ToggleButton;
 
 import com.termux.R;
-import com.termux.terminal.TerminalSession;
 import com.termux.view.TerminalView;
 
+import androidx.drawerlayout.widget.DrawerLayout;
+
 /**
  * A view showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
  * keyboard.
@@ -20,153 +37,313 @@ import com.termux.view.TerminalView;
 public final class ExtraKeysView extends GridLayout {
 
     private static final int TEXT_COLOR = 0xFFFFFFFF;
+    private static final int BUTTON_COLOR = 0x00000000;
+    private static final int INTERESTING_COLOR = 0xFF80DEEA;
+    private static final int BUTTON_PRESSED_COLOR = 0xFF7F7F7F;
 
     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;
-        }
+    static final Map<String, Integer> keyCodesForString = new HashMap<String, Integer>() {{
+        put("SPACE", KeyEvent.KEYCODE_SPACE);
+        put("ESC", KeyEvent.KEYCODE_ESCAPE);
+        put("TAB", KeyEvent.KEYCODE_TAB);
+        put("HOME", KeyEvent.KEYCODE_MOVE_HOME);
+        put("END", KeyEvent.KEYCODE_MOVE_END);
+        put("PGUP", KeyEvent.KEYCODE_PAGE_UP);
+        put("PGDN", KeyEvent.KEYCODE_PAGE_DOWN);
+        put("INS", KeyEvent.KEYCODE_INSERT);
+        put("DEL", KeyEvent.KEYCODE_FORWARD_DEL);
+        put("BKSP", KeyEvent.KEYCODE_DEL);
+        put("UP", KeyEvent.KEYCODE_DPAD_UP);
+        put("LEFT", KeyEvent.KEYCODE_DPAD_LEFT);
+        put("RIGHT", KeyEvent.KEYCODE_DPAD_RIGHT);
+        put("DOWN", KeyEvent.KEYCODE_DPAD_DOWN);
+        put("ENTER", KeyEvent.KEYCODE_ENTER);
+        put("F1", KeyEvent.KEYCODE_F1);
+        put("F2", KeyEvent.KEYCODE_F2);
+        put("F3", KeyEvent.KEYCODE_F3);
+        put("F4", KeyEvent.KEYCODE_F4);
+        put("F5", KeyEvent.KEYCODE_F5);
+        put("F6", KeyEvent.KEYCODE_F6);
+        put("F7", KeyEvent.KEYCODE_F7);
+        put("F8", KeyEvent.KEYCODE_F8);
+        put("F9", KeyEvent.KEYCODE_F9);
+        put("F10", KeyEvent.KEYCODE_F10);
+        put("F11", KeyEvent.KEYCODE_F11);
+        put("F12", KeyEvent.KEYCODE_F12);
+    }};
 
-        if (keyCode > 0) {
-            view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
-            view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyCode));
+    private void sendKey(View view, String keyName, boolean forceCtrlDown, boolean forceLeftAltDown) {
+        TerminalView terminalView = view.findViewById(R.id.terminal_view);
+        if ("KEYBOARD".equals(keyName)) {
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(0, 0);
+        } else if ("DRAWER".equals(keyName)) {
+            DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
+            drawer.openDrawer(Gravity.LEFT);
+        } else if (keyCodesForString.containsKey(keyName)) {
+            int keyCode = keyCodesForString.get(keyName);
+            int metaState = 0;
+            if (forceCtrlDown) {
+                metaState |= KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON;
+            }
+            if (forceLeftAltDown) {
+                metaState |= KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON;
+            }
+            KeyEvent keyEvent = new KeyEvent(0, 0, KeyEvent.ACTION_UP, keyCode, 0, metaState);
+            terminalView.onKeyDown(keyCode, keyEvent);
         } else {
-            TerminalView terminalView = (TerminalView) view.findViewById(R.id.terminal_view);
-            TerminalSession session = terminalView.getCurrentSession();
-            if (session != null) session.write(chars);
+            // not a control char
+            keyName.codePoints().forEach(codePoint -> {
+                terminalView.inputCodePoint(codePoint, forceCtrlDown, forceLeftAltDown);
+            });
         }
     }
 
-    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);
+    private void sendKey(View view, ExtraKeyButton buttonInfo) {
+        if (buttonInfo.isMacro()) {
+            String[] keys = buttonInfo.getKey().split(" ");
+            boolean ctrlDown = false;
+            boolean altDown = false;
+            for (String key : keys) {
+                if ("CTRL".equals(key)) {
+                    ctrlDown = true;
+                } else if ("ALT".equals(key)) {
+                    altDown = true;
+                } else {
+                    sendKey(view, key, ctrlDown, altDown);
+                    ctrlDown = false;
+                    altDown = false;
+                }
+            }
+        } else {
+            sendKey(view, buttonInfo.getKey(), false, false);
         }
-        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 enum SpecialButton {
+        CTRL, ALT, FN
     }
 
-    public boolean readFnButton() {
-        if (fnButton.isPressed()) return true;
-        boolean result = fnButton.isChecked();
-        if (result) {
-            fnButton.setChecked(false);
-            fnButton.setTextColor(TEXT_COLOR);
-        }
-        return result;
+    private static class SpecialButtonState {
+        boolean isOn = false;
+        ToggleButton button = null;
     }
 
-    void reload() {
-        altButton = controlButton = null;
+    private Map<SpecialButton, SpecialButtonState> specialButtons = new HashMap<SpecialButton, SpecialButtonState>() {{
+        put(SpecialButton.CTRL, new SpecialButtonState());
+        put(SpecialButton.ALT, new SpecialButtonState());
+        put(SpecialButton.FN, new SpecialButtonState());
+    }};
+
+    private ScheduledExecutorService scheduledExecutor;
+    private PopupWindow popupWindow;
+    private int longPressCount;
+
+    public boolean readSpecialButton(SpecialButton name) {
+        SpecialButtonState state = specialButtons.get(name);
+        if (state == null)
+            throw new RuntimeException("Must be a valid special button (see source)");
+
+        if (! state.isOn)
+            return false;
+
+        if (state.button == null) {
+            return false;
+        }
+
+        if (state.button.isPressed())
+            return true;
+
+        if (! state.button.isChecked())
+            return false;
+
+        state.button.setChecked(false);
+        state.button.setTextColor(TEXT_COLOR);
+        return true;
+    }
+
+    void popup(View view, String text) {
+        int width = view.getMeasuredWidth();
+        int height = view.getMeasuredHeight();
+        Button button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
+        button.setText(text);
+        button.setTextColor(TEXT_COLOR);
+        button.setPadding(0, 0, 0, 0);
+        button.setMinHeight(0);
+        button.setMinWidth(0);
+        button.setMinimumWidth(0);
+        button.setMinimumHeight(0);
+        button.setWidth(width);
+        button.setHeight(height);
+        button.setBackgroundColor(BUTTON_PRESSED_COLOR);
+        popupWindow = new PopupWindow(this);
+        popupWindow.setWidth(LayoutParams.WRAP_CONTENT);
+        popupWindow.setHeight(LayoutParams.WRAP_CONTENT);
+        popupWindow.setContentView(button);
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setFocusable(false);
+        popupWindow.showAsDropDown(view, 0, -2 * height);
+    }
+
+    /**
+     * General util function to compute the longest column length in a matrix.
+     */
+    static int maximumLength(Object[][] matrix) {
+        int m = 0;
+        for (Object[] row : matrix)
+            m = Math.max(m, row.length);
+        return m;
+    }
+
+    /**
+     * Reload the view given parameters in termux.properties
+     *
+     * @param infos matrix as defined in termux.properties extrakeys
+     * Can Contain The Strings CTRL ALT TAB FN ENTER LEFT RIGHT UP DOWN or normal strings
+     * Some aliases are possible like RETURN for ENTER, LT for LEFT and more (@see controlCharsAliases for the whole list).
+     * Any string of length > 1 in total Uppercase will print a warning
+     *
+     * Examples:
+     * "ENTER" will trigger the ENTER keycode
+     * "LEFT" will trigger the LEFT keycode and be displayed as "←"
+     * "→" will input a "→" character
+     * "−" will input a "−" character
+     * "-_-" will input the string "-_-"
+     */
+    @SuppressLint("ClickableViewAccessibility")
+    void reload(ExtraKeysInfos infos) {
+        if(infos == null)
+            return;
+
+        for(SpecialButtonState state : specialButtons.values())
+            state.button = null;
+
         removeAllViews();
 
-        String[][] buttons = {
-            {"ESC", "CTRL", "ALT", "TAB", "―", "/", "|"}
-        };
+        ExtraKeyButton[][] buttons = infos.getMatrix();
 
-        final int rows = buttons.length;
-        final int cols = buttons[0].length;
+        setRowCount(buttons.length);
+        setColumnCount(maximumLength(buttons));
 
-        setRowCount(rows);
-        setColumnCount(cols);
-
-        for (int row = 0; row < rows; row++) {
-            for (int col = 0; col < cols; col++) {
-                final String buttonText = buttons[row][col];
+        for (int row = 0; row < buttons.length; row++) {
+            for (int col = 0; col < buttons[row].length; col++) {
+                final ExtraKeyButton buttonInfo = 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;
+                if(Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
+                    SpecialButtonState state = specialButtons.get(SpecialButton.valueOf(buttonInfo.getKey())); // for valueOf: https://stackoverflow.com/a/604426/1980630
+                    state.isOn = true;
+                    button = state.button = new ToggleButton(getContext(), null, android.R.attr.buttonBarButtonStyle);
+                    button.setClickable(true);
+                } else {
+                    button = new Button(getContext(), null, android.R.attr.buttonBarButtonStyle);
                 }
 
-                button.setText(buttonText);
+                button.setText(buttonInfo.getDisplay());
                 button.setTextColor(TEXT_COLOR);
+                button.setPadding(0, 0, 0, 0);
 
                 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;
+                button.setOnClickListener(v -> {
+                    if (Settings.System.getInt(getContext().getContentResolver(),
+                        Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0) {
+
+                        if (Build.VERSION.SDK_INT >= 28) {
+                            finalButton.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+                        } else {
+                            // Perform haptic feedback only if no total silence mode enabled.
+                            if (Settings.Global.getInt(getContext().getContentResolver(), "zen_mode", 0) != 2) {
+                                finalButton.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+                            }
                         }
                     }
+
+                    View root = getRootView();
+                    if (Arrays.asList("CTRL", "ALT", "FN").contains(buttonInfo.getKey())) {
+                        ToggleButton self = (ToggleButton) finalButton;
+                        self.setChecked(self.isChecked());
+                        self.setTextColor(self.isChecked() ? INTERESTING_COLOR : TEXT_COLOR);
+                    } else {
+                        sendKey(root, buttonInfo);
+                    }
                 });
 
-                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.setOnTouchListener((v, event) -> {
+                    final View root = getRootView();
+                    switch (event.getAction()) {
+                        case MotionEvent.ACTION_DOWN:
+                            longPressCount = 0;
+                            v.setBackgroundColor(BUTTON_PRESSED_COLOR);
+                            if (Arrays.asList("UP", "DOWN", "LEFT", "RIGHT", "BKSP", "DEL").contains(buttonInfo.getKey())) {
+                                // autorepeat
+                                scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+                                scheduledExecutor.scheduleWithFixedDelay(() -> {
+                                    longPressCount++;
+                                    sendKey(root, buttonInfo);
+                                }, 400, 80, TimeUnit.MILLISECONDS);
+                            }
+                            return true;
+
+                        case MotionEvent.ACTION_MOVE:
+                            if (buttonInfo.getPopup() != null) {
+                                if (popupWindow == null && event.getY() < 0) {
+                                    if (scheduledExecutor != null) {
+                                        scheduledExecutor.shutdownNow();
+                                        scheduledExecutor = null;
+                                    }
+                                    v.setBackgroundColor(BUTTON_COLOR);
+                                    String extraButtonDisplayedText = buttonInfo.getPopup().getDisplay();
+                                    popup(v, extraButtonDisplayedText);
+                                }
+                                if (popupWindow != null && event.getY() > 0) {
+                                    v.setBackgroundColor(BUTTON_PRESSED_COLOR);
+                                    popupWindow.dismiss();
+                                    popupWindow = null;
+                                }
+                            }
+                            return true;
+
+                        case MotionEvent.ACTION_CANCEL:
+                            v.setBackgroundColor(BUTTON_COLOR);
+                            if (scheduledExecutor != null) {
+                                scheduledExecutor.shutdownNow();
+                                scheduledExecutor = null;
+                            }
+                            return true;
+                        case MotionEvent.ACTION_UP:
+                            v.setBackgroundColor(BUTTON_COLOR);
+                            if (scheduledExecutor != null) {
+                                scheduledExecutor.shutdownNow();
+                                scheduledExecutor = null;
+                            }
+                            if (longPressCount == 0 || popupWindow != null) {
+                                if (popupWindow != null) {
+                                    popupWindow.setContentView(null);
+                                    popupWindow.dismiss();
+                                    popupWindow = null;
+                                    if (buttonInfo.getPopup() != null) {
+                                        sendKey(root, buttonInfo.getPopup());
+                                    }
+                                } else {
+                                    v.performClick();
+                                }
+                            }
+                            return true;
+
+                        default:
+                            return true;
+                    }
+                });
+
+                LayoutParams param = new GridLayout.LayoutParams();
+                param.width = 0;
+                param.height = 0;
+                param.setMargins(0, 0, 0, 0);
+                param.columnSpec = GridLayout.spec(col, GridLayout.FILL, 1.f);
+                param.rowSpec = GridLayout.spec(row, GridLayout.FILL, 1.f);
                 button.setLayoutParams(param);
 
                 addView(button);

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

@@ -1,67 +0,0 @@
-package com.termux.app;
-
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Build;
-import android.view.View;
-
-import com.termux.R;
-
-/**
- * Utility to manage full screen immersive mode.
- * <p/>
- * See https://code.google.com/p/android/issues/detail?id=5497
- */
-final class FullScreenHelper {
-
-    private boolean mEnabled = false;
-    final TermuxActivity mActivity;
-
-    public FullScreenHelper(TermuxActivity activity) {
-        this.mActivity = activity;
-    }
-
-    public void setImmersive(boolean enabled) {
-        if (enabled == mEnabled) return;
-        mEnabled = enabled;
-
-        View decorView = mActivity.getWindow().getDecorView();
-
-        if (enabled) {
-            decorView.setOnSystemUiVisibilityChangeListener
-                (new View.OnSystemUiVisibilityChangeListener() {
-                    @Override
-                    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);
-    }
-
-}

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

@@ -0,0 +1,189 @@
+package com.termux.app;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Build;
+import android.os.IBinder;
+import android.util.Log;
+
+import com.termux.R;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
+/**
+ * When allow-external-apps property is set to "true" in ~/.termux/termux.properties, Termux 
+ * is able to process execute intents sent by third-party applications.
+ *
+ * Third-party program must declare com.termux.permission.RUN_COMMAND permission and it should be
+ * granted by user.
+ *
+ * Absolute path of command or script must be given in "RUN_COMMAND_PATH" extra.
+ * The "RUN_COMMAND_ARGUMENTS", "RUN_COMMAND_WORKDIR" and "RUN_COMMAND_BACKGROUND" extras are 
+ * optional. The workdir defaults to termux home. The background mode defaults to "false".
+ * The command path and workdir can optionally be prefixed with "$PREFIX/" or "~/" if an absolute
+ * path is not to be given.
+ *
+ * To automatically bring to foreground and start termux commands that were started with
+ * background mode "false" in android >= 10 without user having to click the notification manually,
+ * requires termux to be granted draw over apps permission due to new restrictions
+ * of starting activities from the background, this also applies to Termux:Tasker plugin.
+ *
+ * To reduce the chance of termux being killed by android even further due to violation of not
+ * being able to call startForeground() within ~5s of service start in android >= 8, the user
+ * may disable battery optimizations for termux.
+ *
+ * Sample code to run command "top" with java:
+ *   Intent intent = new Intent();
+ *   intent.setClassName("com.termux", "com.termux.app.RunCommandService");
+ *   intent.setAction("com.termux.RUN_COMMAND");
+ *   intent.putExtra("com.termux.RUN_COMMAND_PATH", "/data/data/com.termux/files/usr/bin/top");
+ *   intent.putExtra("com.termux.RUN_COMMAND_ARGUMENTS", new String[]{"-n", "5"});
+ *   intent.putExtra("com.termux.RUN_COMMAND_WORKDIR", "/data/data/com.termux/files/home");
+ *   intent.putExtra("com.termux.RUN_COMMAND_BACKGROUND", false);
+ *   startService(intent);
+ *
+ * Sample code to run command "top" with "am startservice" command:
+ * am startservice --user 0 -n com.termux/com.termux.app.RunCommandService 
+ * -a com.termux.RUN_COMMAND 
+ * --es com.termux.RUN_COMMAND_PATH '/data/data/com.termux/files/usr/bin/top' 
+ * --esa com.termux.RUN_COMMAND_ARGUMENTS '-n,5' 
+ * --es com.termux.RUN_COMMAND_WORKDIR '/data/data/com.termux/files/home'
+ * --ez com.termux.RUN_COMMAND_BACKGROUND 'false'
+ */
+public class RunCommandService extends Service {
+
+    public static final String RUN_COMMAND_ACTION = "com.termux.RUN_COMMAND";
+    public static final String RUN_COMMAND_PATH = "com.termux.RUN_COMMAND_PATH";
+    public static final String RUN_COMMAND_ARGUMENTS = "com.termux.RUN_COMMAND_ARGUMENTS";
+    public static final String RUN_COMMAND_WORKDIR = "com.termux.RUN_COMMAND_WORKDIR";
+    public static final String RUN_COMMAND_BACKGROUND = "com.termux.RUN_COMMAND_BACKGROUND";
+
+    private static final String NOTIFICATION_CHANNEL_ID = "termux_run_command_notification_channel";
+    private static final int NOTIFICATION_ID = 1338;
+
+    class LocalBinder extends Binder {
+        public final RunCommandService service = RunCommandService.this;
+    }
+
+    private final IBinder mBinder = new RunCommandService.LocalBinder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+    @Override
+    public void onCreate() {
+        runStartForeground();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        // Run again in case service is already started and onCreate() is not called
+        runStartForeground();
+
+        if (allowExternalApps() && RUN_COMMAND_ACTION.equals(intent.getAction())) {
+            Uri programUri = new Uri.Builder().scheme("com.termux.file").path(parsePath(intent.getStringExtra(RUN_COMMAND_PATH))).build();
+
+            Intent execIntent = new Intent(TermuxService.ACTION_EXECUTE, programUri);
+            execIntent.setClass(this, TermuxService.class);
+            execIntent.putExtra(TermuxService.EXTRA_ARGUMENTS, intent.getStringArrayExtra(RUN_COMMAND_ARGUMENTS));
+            execIntent.putExtra(TermuxService.EXTRA_CURRENT_WORKING_DIRECTORY, parsePath(intent.getStringExtra(RUN_COMMAND_WORKDIR)));
+            execIntent.putExtra(TermuxService.EXTRA_EXECUTE_IN_BACKGROUND, intent.getBooleanExtra(RUN_COMMAND_BACKGROUND, false));
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                this.startForegroundService(execIntent);
+            } else {
+                this.startService(execIntent);
+            }
+        }
+
+        runStopForeground();
+
+        return Service.START_NOT_STICKY;
+    }
+
+    private void runStartForeground() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            setupNotificationChannel();
+            startForeground(NOTIFICATION_ID, buildNotification());
+        }
+    }
+
+    private void runStopForeground() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            stopForeground(true);
+        }
+    }
+
+    private Notification buildNotification() {
+        Notification.Builder builder = new Notification.Builder(this);
+        builder.setContentTitle(getText(R.string.application_name) + " Run Command");
+        builder.setSmallIcon(R.drawable.ic_service_notification);
+
+        // Use a low priority:
+        builder.setPriority(Notification.PRIORITY_LOW);
+
+        // No need to show a timestamp:
+        builder.setShowWhen(false);
+
+        // Background color for small notification icon:
+        builder.setColor(0xFF607D8B);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
+        }
+
+        return builder.build();
+    }
+
+    private void setupNotificationChannel() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+
+        String channelName = "Termux Run Command";
+        int importance = NotificationManager.IMPORTANCE_LOW;
+
+        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, importance);
+        NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        manager.createNotificationChannel(channel);
+    }
+
+    private boolean allowExternalApps() {
+        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();
+        try {
+            if (propsFile.isFile() && propsFile.canRead()) {
+                try (FileInputStream in = new FileInputStream(propsFile)) {
+                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+                }
+            }
+        } catch (Exception e) {
+            Log.e("termux", "Error loading props", e);
+        }
+
+        return props.getProperty("allow-external-apps", "false").equals("true");
+    }
+
+    /** Replace "$PREFIX/" or "~/" prefix with termux absolute paths */
+    private String parsePath(String path) {
+        if(path != null && !path.isEmpty()) {
+            path = path.replaceAll("^\\$PREFIX\\/", TermuxService.PREFIX_PATH + "/");
+            path = path.replaceAll("^~\\/", TermuxService.HOME_PATH + "/");
+        }
+
+        return path;
+    }
+}

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

@@ -11,8 +11,6 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnShowListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
@@ -26,12 +24,6 @@ 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;
@@ -40,19 +32,14 @@ import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.autofill.AutofillManager;
 import android.view.inputmethod.InputMethodManager;
-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;
@@ -73,10 +60,17 @@ import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * A terminal emulator activity.
  * <p/>
@@ -89,14 +83,17 @@ import java.util.regex.Pattern;
  */
 public final class TermuxActivity extends Activity implements ServiceConnection {
 
+    public static final String TERMUX_FAILSAFE_SESSION_ACTION = "com.termux.app.failsafe_session";
+
     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;
     private static final int CONTEXTMENU_STYLING_ID = 6;
-    private static final int CONTEXTMENU_TOGGLE_FULLSCREEN_ID = 7;
     private static final int CONTEXTMENU_HELP_ID = 8;
+    private static final int CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON = 9;
+    private static final int CONTEXTMENU_AUTOFILL_ID = 10;
 
     private static final int MAX_SESSIONS = 8;
 
@@ -111,8 +108,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     ExtraKeysView mExtraKeysView;
 
-    final FullScreenHelper mFullScreenHelper = new FullScreenHelper(this);
-
     TermuxPreferences mSettings;
 
     /**
@@ -134,6 +129,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
      */
     boolean mIsVisible;
 
+    boolean mIsUsingBlackUI;
+
     final SoundPool mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
         new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
             .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
@@ -151,13 +148,16 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 }
                 checkForFontAndColors();
                 mSettings.reloadFromProperties(TermuxActivity.this);
+
+                if (mExtraKeysView != null) {
+                    mExtraKeysView.reload(mSettings.mExtraKeys);
+                }
             }
         }
     };
 
     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");
 
@@ -190,37 +190,49 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     }
 
     /** 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.
+        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;
         }
     }
 
     @Override
     public void onCreate(Bundle bundle) {
+        mSettings = new TermuxPreferences(this);
+        mIsUsingBlackUI = mSettings.isUsingBlackUI();
+        if (mIsUsingBlackUI) {
+            this.setTheme(R.style.Theme_Termux_Black);
+        } else {
+            this.setTheme(R.style.Theme_Termux);
+        }
+
         super.onCreate(bundle);
 
-        mSettings = new TermuxPreferences(this);
-
         setContentView(R.layout.drawer_layout);
-        mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
-        mTerminalView.setOnKeyListener(new TermuxKeyListener(this));
+
+        if (mIsUsingBlackUI) {
+            findViewById(R.id.left_drawer).setBackgroundColor(
+                getResources().getColor(android.R.color.background_dark)
+            );
+        }
+
+        mTerminalView = findViewById(R.id.terminal_view);
+        mTerminalView.setOnKeyListener(new TermuxViewClient(this));
 
         mTerminalView.setTextSize(mSettings.getFontSize());
-        mFullScreenHelper.setImmersive(mSettings.isFullScreen());
+        mTerminalView.setKeepScreenOn(mSettings.isScreenAlwaysOn());
         mTerminalView.requestFocus();
 
-        final ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
-        if (mSettings.isShowExtraKeys()) viewPager.setVisibility(View.VISIBLE);
+        final ViewPager viewPager = findViewById(R.id.viewpager);
+        if (mSettings.mShowExtraKeys) viewPager.setVisibility(View.VISIBLE);
+
+
+        ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
+        layoutParams.height = layoutParams.height * (mSettings.mExtraKeys == null ? 0 : mSettings.mExtraKeys.getMatrix().length);
+        viewPager.setLayoutParams(layoutParams);
 
         viewPager.setAdapter(new PagerAdapter() {
             @Override
@@ -229,33 +241,34 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             }
 
             @Override
-            public boolean isViewFromObject(View view, Object object) {
+            public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
                 return view == object;
             }
 
+            @NonNull
             @Override
-            public Object instantiateItem(ViewGroup collection, int position) {
+            public Object instantiateItem(@NonNull 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);
+                    mExtraKeysView.reload(mSettings.mExtraKeys);
                 } else {
                     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) {
-                            TerminalSession session = getCurrentTermSession();
-                            if (session != null) {
-                                if (session.isRunning()) {
-                                    session.write(editText.getText().toString() + "\n");
-                                } else {
-                                    removeFinishedSession(session);
-                                }
-                                editText.setText("");
+                    final EditText editText = layout.findViewById(R.id.text_input);
+                    editText.setOnEditorActionListener((v, actionId, event) -> {
+                        TerminalSession session = getCurrentTermSession();
+                        if (session != null) {
+                            if (session.isRunning()) {
+                                String textToSend = editText.getText().toString();
+                                if (textToSend.length() == 0) textToSend = "\r";
+                                session.write(textToSend);
+                            } else {
+                                removeFinishedSession(session);
                             }
-                            return true;
+                            editText.setText("");
                         }
+                        return true;
                     });
                 }
                 collection.addView(layout);
@@ -263,7 +276,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             }
 
             @Override
-            public void destroyItem(ViewGroup collection, int position, Object view) {
+            public void destroyItem(@NonNull ViewGroup collection, int position, @NonNull Object view) {
                 collection.removeView((View) view);
             }
         });
@@ -274,54 +287,30 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 if (position == 0) {
                     mTerminalView.requestFocus();
                 } else {
-                    final EditText editText = (EditText) viewPager.findViewById(R.id.text_input);
+                    final 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);
-            }
-        });
-        newSessionButton.setOnLongClickListener(new OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                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);
-                        }
-                    }, R.string.new_session_failsafe, new DialogUtils.TextSetListener() {
-                        @Override
-                        public void onTextSet(String text) {
-                            addNewSession(true, text);
-                        }
-                    }
-                    , -1, null, null);
-                return true;
-            }
+        newSessionButton.setOnClickListener(v -> addNewSession(false, null));
+        newSessionButton.setOnLongClickListener(v -> {
+            DialogUtils.textInput(TermuxActivity.this, R.string.session_new_named_title, null, R.string.session_new_named_positive_button,
+                text -> addNewSession(false, text), R.string.new_session_failsafe, text -> addNewSession(true, text)
+                , -1, null, null);
+            return true;
         });
 
-        findViewById(R.id.toggle_keyboard_button).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
-                getDrawer().closeDrawers();
-            }
+        findViewById(R.id.toggle_keyboard_button).setOnClickListener(v -> {
+            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
+            getDrawer().closeDrawers();
         });
 
-        findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(new OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                toggleShowExtraKeys();
-                return true;
-            }
+        findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(v -> {
+            toggleShowExtraKeys();
+            return true;
         });
 
         registerForContextMenu(mTerminalView);
@@ -338,7 +327,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     }
 
     void toggleShowExtraKeys() {
-        final ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
+        final 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) {
@@ -389,33 +378,47 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                     if (indexOfSession >= 0)
                         showToast(toToastTitle(finishedSession) + " - exited", true);
                 }
+
+                if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+                    // On Android TV devices we need to use older behaviour because we may
+                    // not be able to have multiple launcher icons.
+                    if (mTermService.getSessions().size() > 1) {
+                        removeFinishedSession(finishedSession);
+                    }
+                } else {
+                    // Once we have a separate launcher icon for the failsafe session, it
+                    // should be safe to auto-close session on exit code '0' or '130'.
+                    if (finishedSession.getExitStatus() == 0 || finishedSession.getExitStatus() == 130) {
+                        removeFinishedSession(finishedSession);
+                    }
+                }
+
                 mListViewAdapter.notifyDataSetChanged();
             }
 
             @Override
             public void onClipboardText(TerminalSession session, String text) {
                 if (!mIsVisible) return;
-                showToast("Clipboard:\n\"" + text + "\"", false);
                 ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
                 clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(text)));
             }
 
             @Override
             public void onBell(TerminalSession session) {
-                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;
-                    }
+                if (!mIsVisible) return;
 
+                switch (mSettings.mBellBehaviour) {
+                    case TermuxPreferences.BELL_BEEP:
+                        mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                        break;
+                    case TermuxPreferences.BELL_VIBRATE:
+                        BellUtil.getInstance(TermuxActivity.this).doBell();
+                        break;
+                    case TermuxPreferences.BELL_IGNORE:
+                        // Ignore the bell character.
+                        break;
                 }
+
             }
 
             @Override
@@ -424,13 +427,14 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             }
         };
 
-        ListView listView = (ListView) findViewById(R.id.left_drawer_list);
+        ListView listView = findViewById(R.id.left_drawer_list);
         mListViewAdapter = new ArrayAdapter<TerminalSession>(getApplicationContext(), R.layout.line_in_drawer, mTermService.getSessions()) {
             final StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
             final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
 
+            @NonNull
             @Override
-            public View getView(int position, View convertView, ViewGroup parent) {
+            public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 View row = convertView;
                 if (row == null) {
                     LayoutInflater inflater = getLayoutInflater();
@@ -440,8 +444,12 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 TerminalSession sessionAtRow = getItem(position);
                 boolean sessionRunning = sessionAtRow.isRunning();
 
-                TextView firstLineView = (TextView) row.findViewById(R.id.row_line);
-
+                TextView firstLineView = row.findViewById(R.id.row_line);
+                if (mIsUsingBlackUI) {
+                    firstLineView.setBackground(
+                        getResources().getDrawable(R.drawable.selected_session_background_black)
+                    );
+                }
                 String name = sessionAtRow.mSessionName;
                 String sessionTitle = sessionAtRow.getTitle();
 
@@ -461,51 +469,37 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 } else {
                     firstLineView.setPaintFlags(firstLineView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
                 }
-                int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? Color.BLACK : Color.RED;
+                int defaultColor = mIsUsingBlackUI ? Color.WHITE : Color.BLACK;
+                int color = sessionRunning || sessionAtRow.getExitStatus() == 0 ? defaultColor : Color.RED;
                 firstLineView.setTextColor(color);
                 return row;
             }
         };
         listView.setAdapter(mListViewAdapter);
-        listView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                TerminalSession clickedSession = mListViewAdapter.getItem(position);
-                switchToSession(clickedSession);
-                getDrawer().closeDrawers();
-            }
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            TerminalSession clickedSession = mListViewAdapter.getItem(position);
+            switchToSession(clickedSession);
+            getDrawer().closeDrawers();
         });
-        listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            @Override
-            public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
-                final TerminalSession selectedSession = mListViewAdapter.getItem(position);
-                renameSession(selectedSession);
-                return true;
-            }
+        listView.setOnItemLongClickListener((parent, view, position, id) -> {
+            final TerminalSession selectedSession = mListViewAdapter.getItem(position);
+            renameSession(selectedSession);
+            return true;
         });
 
         if (mTermService.getSessions().isEmpty()) {
             if (mIsVisible) {
-                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)
-                                    .setCancelable(false).setPositiveButton(android.R.string.ok, null)
-                                    .setNegativeButton(R.string.welcome_dialog_dont_show_again_button, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            TermuxPreferences.disableWelcomeDialog(TermuxActivity.this);
-                                            dialog.dismiss();
-                                        }
-                                    }).show();
-                            }
-                            addNewSession(false, null);
-                        } catch (WindowManager.BadTokenException e) {
-                            // Activity finished - ignore.
+                TermuxInstaller.setupIfNeeded(TermuxActivity.this, () -> {
+                    if (mTermService == null) return; // Activity might have been destroyed.
+                    try {
+                        Bundle bundle = getIntent().getExtras();
+                        boolean launchFailsafe = false;
+                        if (bundle != null) {
+                            launchFailsafe = bundle.getBoolean(TERMUX_FAILSAFE_SESSION_ACTION, false);
                         }
+                        addNewSession(launchFailsafe, null);
+                    } catch (WindowManager.BadTokenException e) {
+                        // Activity finished - ignore.
                     }
                 });
             } else {
@@ -513,7 +507,14 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 finish();
             }
         } else {
-            switchToSession(getStoredCurrentSessionOrLast());
+            Intent i = getIntent();
+            if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
+                // Android 7.1 app shortcut from res/xml/shortcuts.xml.
+                boolean failSafe = i.getBooleanExtra(TERMUX_FAILSAFE_SESSION_ACTION, false);
+                addNewSession(failSafe, null);
+            } else {
+                switchToSession(getStoredCurrentSessionOrLast());
+            }
         }
     }
 
@@ -530,20 +531,16 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
     @SuppressLint("InflateParams")
     void renameSession(final TerminalSession sessionToRename) {
-        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;
-            }
+        DialogUtils.textInput(this, R.string.session_rename_title, sessionToRename.mSessionName, R.string.session_rename_positive_button, text -> {
+            sessionToRename.mSessionName = text;
+            mListViewAdapter.notifyDataSetChanged();
         }, -1, null, -1, null, null);
     }
 
     @Override
     public void onServiceDisconnected(ComponentName name) {
-        if (mTermService != null) {
-            // Respect being stopped from the TermuxService notification action.
-            finish();
-        }
+        // Respect being stopped from the TermuxService notification action.
+        finish();
     }
 
     @Nullable
@@ -608,8 +605,9 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             new AlertDialog.Builder(this).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
                 .setPositiveButton(android.R.string.ok, null).show();
         } else {
-            String executablePath = (failSafe ? "/system/bin/sh" : null);
-            TerminalSession newSession = mTermService.createTermSession(executablePath, null, null, failSafe);
+            TerminalSession currentSession = getCurrentTermSession();
+            String workingDirectory = (currentSession == null) ? null : currentSession.getCwd();
+            TerminalSession newSession = mTermService.createTermSession(null, null, workingDirectory, failSafe);
             if (sessionName != null) {
                 newSession.mSessionName = sessionName;
             }
@@ -647,7 +645,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
         final int indexOfSession = mTermService.getSessions().indexOf(session);
         showToast(toToastTitle(session), false);
         mListViewAdapter.notifyDataSetChanged();
-        final ListView lv = ((ListView) findViewById(R.id.left_drawer_list));
+        final ListView lv = findViewById(R.id.left_drawer_list);
         lv.setItemChecked(indexOfSession, true);
         lv.smoothScrollToPosition(indexOfSession);
     }
@@ -659,10 +657,16 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
         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);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            AutofillManager autofillManager = getSystemService(AutofillManager.class);
+            if (autofillManager != null && autofillManager.isEnabled()) {
+                menu.add(Menu.NONE, CONTEXTMENU_AUTOFILL_ID, Menu.NONE, R.string.autofill_password);
+            }
+        }
         menu.add(Menu.NONE, CONTEXTMENU_RESET_TERMINAL_ID, Menu.NONE, R.string.reset_terminal);
         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_TOGGLE_KEEP_SCREEN_ON, Menu.NONE, R.string.toggle_keep_screen_on).setCheckable(true).setChecked(mSettings.isScreenAlwaysOn());
         menu.add(Menu.NONE, CONTEXTMENU_HELP_ID, Menu.NONE, R.string.help);
     }
 
@@ -674,65 +678,126 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     }
 
     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
+
+        StringBuilder regex_sb = new StringBuilder();
+
+        regex_sb.append("(");                       // Begin first matching group.
+        regex_sb.append("(?:");                     // Begin scheme group.
+        regex_sb.append("dav|");                    // The DAV proto.
+        regex_sb.append("dict|");                   // The DICT proto.
+        regex_sb.append("dns|");                    // The DNS proto.
+        regex_sb.append("file|");                   // File path.
+        regex_sb.append("finger|");                 // The Finger proto.
+        regex_sb.append("ftp(?:s?)|");              // The FTP proto.
+        regex_sb.append("git|");                    // The Git proto.
+        regex_sb.append("gopher|");                 // The Gopher proto.
+        regex_sb.append("http(?:s?)|");             // The HTTP proto.
+        regex_sb.append("imap(?:s?)|");             // The IMAP proto.
+        regex_sb.append("irc(?:[6s]?)|");           // The IRC proto.
+        regex_sb.append("ip[fn]s|");                // The IPFS proto.
+        regex_sb.append("ldap(?:s?)|");             // The LDAP proto.
+        regex_sb.append("pop3(?:s?)|");             // The POP3 proto.
+        regex_sb.append("redis(?:s?)|");            // The Redis proto.
+        regex_sb.append("rsync|");                  // The Rsync proto.
+        regex_sb.append("rtsp(?:[su]?)|");          // The RTSP proto.
+        regex_sb.append("sftp|");                   // The SFTP proto.
+        regex_sb.append("smb(?:s?)|");              // The SAMBA proto.
+        regex_sb.append("smtp(?:s?)|");             // The SMTP proto.
+        regex_sb.append("svn(?:(?:\\+ssh)?)|");     // The Subversion proto.
+        regex_sb.append("tcp|");                    // The TCP proto.
+        regex_sb.append("telnet|");                 // The Telnet proto.
+        regex_sb.append("tftp|");                   // The TFTP proto.
+        regex_sb.append("udp|");                    // The UDP proto.
+        regex_sb.append("vnc|");                    // The VNC proto.
+        regex_sb.append("ws(?:s?)");                // The Websocket proto.
+        regex_sb.append(")://");                    // End scheme group.
+        regex_sb.append(")");                       // End first matching group.
+
+
+        // Begin second matching group.
+        regex_sb.append("(");
+
+        // User name and/or password in format 'user:pass@'.
+        regex_sb.append("(?:\\S+(?::\\S*)?@)?");
+
+        // Begin host group.
+        regex_sb.append("(?:");
+
+        // IP address (from http://www.regular-expressions.info/examples.html).
+        regex_sb.append("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|");
+
+        // Host name or domain.
+        regex_sb.append("(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)(?:(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))?|");
+
+        // Just path. Used in case of 'file://' scheme.
+        regex_sb.append("/(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)");
+
+        // End host group.
+        regex_sb.append(")");
+
+        // Port number.
+        regex_sb.append("(?::\\d{1,5})?");
+
+        // Resource path with optional query string.
+        regex_sb.append("(?:/[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
+
+        // Fragment.
+        regex_sb.append("(?:#[a-zA-Z0-9:@%\\-._~!$&()*+,;=?/]*)?");
+
+        // End second matching group.
+        regex_sb.append(")");
+
         final Pattern urlPattern = Pattern.compile(
-            "(?:^|[\\W])((ht|f)tp(s?)://|www\\.)" + "(([\\w\\-]+\\.)+?([\\w\\-.~]+/?)*" + "[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
+            regex_sb.toString(),
             Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
         LinkedHashSet<CharSequence> urlSet = new LinkedHashSet<>();
         Matcher matcher = urlPattern.matcher(text);
+
         while (matcher.find()) {
             int matchStart = matcher.start(1);
             int matchEnd = matcher.end();
             String url = text.substring(matchStart, matchEnd);
             urlSet.add(url);
         }
+
         return urlSet;
     }
 
     void showUrlSelection() {
-        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptText();
+        String text = getCurrentTermSession().getEmulator().getScreen().getTranscriptTextWithFullLinesJoined();
         LinkedHashSet<CharSequence> urlSet = extractUrls(text);
         if (urlSet.isEmpty()) {
             new AlertDialog.Builder(this).setMessage(R.string.select_url_no_found).show();
             return;
         }
 
-        final CharSequence[] urls = urlSet.toArray(new CharSequence[urlSet.size()]);
+        final CharSequence[] urls = urlSet.toArray(new CharSequence[0]);
         Collections.reverse(Arrays.asList(urls)); // Latest first.
 
         // Click to copy url to clipboard:
-        final AlertDialog dialog = new AlertDialog.Builder(TermuxActivity.this).setItems(urls, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface di, int which) {
-                String url = (String) urls[which];
-                ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(url)));
-                Toast.makeText(TermuxActivity.this, R.string.select_url_copied_to_clipboard, Toast.LENGTH_LONG).show();
-            }
+        final AlertDialog dialog = new AlertDialog.Builder(TermuxActivity.this).setItems(urls, (di, which) -> {
+            String url = (String) urls[which];
+            ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+            clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(url)));
+            Toast.makeText(TermuxActivity.this, R.string.select_url_copied_to_clipboard, Toast.LENGTH_LONG).show();
         }).setTitle(R.string.select_url_dialog_title).create();
 
         // Long press to open URL:
-        dialog.setOnShowListener(new OnShowListener() {
-            @Override
-            public void onShow(DialogInterface di) {
-                ListView lv = dialog.getListView(); // this is a ListView with your "buds" in it
-                lv.setOnItemLongClickListener(new OnItemLongClickListener() {
-                    @Override
-                    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                        dialog.dismiss();
-                        String url = (String) urls[position];
-                        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;
-                    }
-                });
-            }
+        dialog.setOnShowListener(di -> {
+            ListView lv = dialog.getListView(); // this is a ListView with your "buds" in it
+            lv.setOnItemLongClickListener((parent, view, position, id) -> {
+                dialog.dismiss();
+                String url = (String) urls[position];
+                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;
+            });
         });
 
         dialog.show();
@@ -750,7 +815,18 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 if (session != null) {
                     Intent intent = new Intent(Intent.ACTION_SEND);
                     intent.setType("text/plain");
-                    intent.putExtra(Intent.EXTRA_TEXT, session.getEmulator().getScreen().getTranscriptText().trim());
+                    String transcriptText = session.getEmulator().getScreen().getTranscriptTextWithoutJoinedLines().trim();
+                    // See https://github.com/termux/termux-app/issues/1166.
+                    final int MAX_LENGTH = 100_000;
+                    if (transcriptText.length() > MAX_LENGTH) {
+                        int cutOffIndex = transcriptText.length() - MAX_LENGTH;
+                        int nextNewlineIndex = transcriptText.indexOf('\n', cutOffIndex);
+                        if (nextNewlineIndex != -1 && nextNewlineIndex != transcriptText.length() - 1) {
+                            cutOffIndex = nextNewlineIndex + 1;
+                        }
+                        transcriptText = transcriptText.substring(cutOffIndex).trim();
+                    }
+                    intent.putExtra(Intent.EXTRA_TEXT, transcriptText);
                     intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_transcript_title));
                     startActivity(Intent.createChooser(intent, getString(R.string.share_transcript_chooser_title)));
                 }
@@ -762,12 +838,9 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 final AlertDialog.Builder b = new AlertDialog.Builder(this);
                 b.setIcon(android.R.drawable.ic_dialog_alert);
                 b.setMessage(R.string.confirm_kill_process);
-                b.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int id) {
-                        dialog.dismiss();
-                        getCurrentTermSession().finishIfRunning();
-                    }
+                b.setPositiveButton(android.R.string.yes, (dialog, id) -> {
+                    dialog.dismiss();
+                    getCurrentTermSession().finishIfRunning();
                 });
                 b.setNegativeButton(android.R.string.no, null);
                 b.show();
@@ -788,21 +861,31 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                     // 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 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")));
-                            }
-                        }).setNegativeButton(android.R.string.cancel, null).show();
+                        .setPositiveButton(R.string.styling_install, (dialog, which) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://play.google.com/store/apps/details?id=com.termux.styling")))).setNegativeButton(android.R.string.cancel, null).show();
                 }
-            }
-            return true;
-            case CONTEXTMENU_TOGGLE_FULLSCREEN_ID:
-                toggleImmersive();
                 return true;
+            }
             case CONTEXTMENU_HELP_ID:
                 startActivity(new Intent(this, TermuxHelpActivity.class));
                 return true;
+            case CONTEXTMENU_TOGGLE_KEEP_SCREEN_ON: {
+                if(mTerminalView.getKeepScreenOn()) {
+                    mTerminalView.setKeepScreenOn(false);
+                    mSettings.setScreenAlwaysOn(this, false);
+                } else {
+                    mTerminalView.setKeepScreenOn(true);
+                    mSettings.setScreenAlwaysOn(this, true);
+                }
+                return true;
+            }
+            case CONTEXTMENU_AUTOFILL_ID: {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    AutofillManager autofillManager = getSystemService(AutofillManager.class);
+                    if (autofillManager != null && autofillManager.isEnabled()) {
+                        autofillManager.requestAutofill(mTerminalView);
+                    }
+                }
+            }
             default:
                 return super.onContextItemSelected(item);
         }
@@ -815,12 +898,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
         }
     }
 
-    void toggleImmersive() {
-        boolean newValue = !mSettings.isFullScreen();
-        mSettings.setFullScreen(this, newValue);
-        mFullScreenHelper.setImmersive(newValue);
-    }
-
     void changeFontSize(boolean increase) {
         mSettings.changeFontSize(this, increase);
         mTerminalView.setTextSize(mSettings.getFontSize());
@@ -839,9 +916,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
     public TerminalSession getStoredCurrentSessionOrLast() {
         TerminalSession stored = TermuxPreferences.getCurrentSession(this);
         if (stored != null) return stored;
-        int numberOfSessions = mTermService.getSessions().size();
-        if (numberOfSessions == 0) return null;
-        return mTermService.getSessions().get(numberOfSessions - 1);
+        List<TerminalSession> sessions = mTermService.getSessions();
+        return sessions.isEmpty() ? null : sessions.get(sessions.size() - 1);
     }
 
     /** Show a toast and dismiss the last one if still visible. */

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

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

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

@@ -4,10 +4,6 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 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;
@@ -19,13 +15,12 @@ import com.termux.R;
 import com.termux.terminal.EmulatorDebug;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 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;
@@ -40,10 +35,10 @@ import java.util.zip.ZipInputStream;
  * <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()}.
+ * (4) The zip file is loaded from a shared library.
  * <p/>
  * (5) The zip, containing entries relative to the $PREFIX, is is downloaded and extracted by a zip input stream
- * continously encountering zip file entries:
+ * continuously encountering zip file entries:
  * <p/>
  * (5.1) If the zip entry encountered is SYMLINKS.txt, go through it and remember all symlinks to setup.
  * <p/>
@@ -59,12 +54,7 @@ final class TermuxInstaller {
         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)
-                .setOnDismissListener(new OnDismissListener() {
-                    @Override
-                    public void onDismiss(DialogInterface dialog) {
-                        System.exit(0);
-                    }
-                }).setPositiveButton(android.R.string.ok, null).show();
+                .setOnDismissListener(dialog -> System.exit(0)).setPositiveButton(android.R.string.ok, null).show();
             return;
         }
 
@@ -89,8 +79,8 @@ final class TermuxInstaller {
                     final byte[] buffer = new byte[8096];
                     final List<Pair<String, String>> symlinks = new ArrayList<>(50);
 
-                    final URL zipUrl = determineZipUrl();
-                    try (ZipInputStream zipInput = new ZipInputStream(zipUrl.openStream())) {
+                    final byte[] zipBytes = loadZipBytes();
+                    try (ZipInputStream zipInput = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
                         ZipEntry zipEntry;
                         while ((zipEntry = zipInput.getNextEntry()) != null) {
                             if (zipEntry.getName().equals("SYMLINKS.txt")) {
@@ -103,14 +93,17 @@ final class TermuxInstaller {
                                     String oldPath = parts[0];
                                     String newPath = STAGING_PREFIX_PATH + "/" + parts[1];
                                     symlinks.add(Pair.create(oldPath, newPath));
+
+                                    ensureDirectoryExists(new File(newPath).getParentFile());
                                 }
                             } else {
                                 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());
-                                } else {
+                                boolean isDirectory = zipEntry.isDirectory();
+
+                                ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
+
+                                if (!isDirectory) {
                                     try (FileOutputStream outStream = new FileOutputStream(targetFile)) {
                                         int readBytes;
                                         while ((readBytes = zipInput.read(buffer)) != -1)
@@ -135,46 +128,29 @@ final class TermuxInstaller {
                         throw new RuntimeException("Unable to rename staging folder");
                     }
 
-                    activity.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            whenDone.run();
-                        }
-                    });
+                    activity.runOnUiThread(whenDone);
                 } catch (final Exception e) {
                     Log.e(EmulatorDebug.LOG_TAG, "Bootstrap error", e);
-                    activity.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(R.string.bootstrap_error_body)
-                                    .setNegativeButton(R.string.bootstrap_error_abort, new OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            dialog.dismiss();
-                                            activity.finish();
-                                        }
-                                    }).setPositiveButton(R.string.bootstrap_error_try_again, new OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        dialog.dismiss();
-                                        TermuxInstaller.setupIfNeeded(activity, whenDone);
-                                    }
+                    activity.runOnUiThread(() -> {
+                        try {
+                            new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(R.string.bootstrap_error_body)
+                                .setNegativeButton(R.string.bootstrap_error_abort, (dialog, which) -> {
+                                    dialog.dismiss();
+                                    activity.finish();
+                                }).setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
+                                    dialog.dismiss();
+                                    TermuxInstaller.setupIfNeeded(activity, whenDone);
                                 }).show();
-                            } catch (WindowManager.BadTokenException e) {
-                                // Activity already dismissed - ignore.
-                            }
+                        } catch (WindowManager.BadTokenException e1) {
+                            // Activity already dismissed - ignore.
                         }
                     });
                 } finally {
-                    activity.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                progress.dismiss();
-                            } catch (RuntimeException e) {
-                                // Activity already dismissed - ignore.
-                            }
+                    activity.runOnUiThread(() -> {
+                        try {
+                            progress.dismiss();
+                        } catch (RuntimeException e) {
+                            // Activity already dismissed - ignore.
                         }
                     });
                 }
@@ -182,52 +158,51 @@ final class TermuxInstaller {
         }.start();
     }
 
-    /** Get bootstrap zip url for this systems cpu architecture. */
-    static URL determineZipUrl() throws MalformedURLException {
-        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;
-            }
+    private static void ensureDirectoryExists(File directory) {
+        if (!directory.isDirectory() && !directory.mkdirs()) {
+            throw new RuntimeException("Unable to create directory: " + directory.getAbsolutePath());
         }
-
-        return new URL("https://termux.net/bootstrap/bootstrap-" + termuxArch + ".zip");
     }
 
-    /** Delete a folder and all its content or throw. */
-    static void deleteFolder(File fileOrDirectory) {
-        File[] children = fileOrDirectory.listFiles();
-        if (children != null) {
-            for (File child : children) {
-                deleteFolder(child);
+    public static byte[] loadZipBytes() {
+        // Only load the shared library when necessary to save memory usage.
+        System.loadLibrary("termux-bootstrap");
+        return getZip();
+    }
+
+    public static native byte[] getZip();
+
+    /** Delete a folder and all its content or throw. Don't follow symlinks. */
+    static void deleteFolder(File fileOrDirectory) throws IOException {
+        if (fileOrDirectory.getCanonicalPath().equals(fileOrDirectory.getAbsolutePath()) && fileOrDirectory.isDirectory()) {
+            File[] children = fileOrDirectory.listFiles();
+
+            if (children != null) {
+                for (File child : children) {
+                    deleteFolder(child);
+                }
             }
         }
+
         if (!fileOrDirectory.delete()) {
             throw new RuntimeException("Unable to delete " + (fileOrDirectory.isDirectory() ? "directory " : "file ") + fileOrDirectory.getAbsolutePath());
         }
     }
 
-    public static void setupStorageSymlinks(final Context context) {
+    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.exists()) {
+                        try {
+                            deleteFolder(storageDir);
+                        } catch (IOException e) {
+                            Log.e(LOG_TAG, "Could not delete old $HOME/storage, " + e.getMessage());
+                            return;
+                        }
                     }
 
                     if (!storageDir.mkdirs()) {
@@ -254,9 +229,13 @@ final class TermuxInstaller {
                     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());
+                    if (dirs != null && dirs.length > 1) {
+                        for (int i = 1; i < dirs.length; i++) {
+                            File dir = dirs[i];
+                            if (dir == null) continue;
+                            String symlinkName = "external-" + i;
+                            Os.symlink(dir.getAbsolutePath(), new File(storageDir, symlinkName).getAbsolutePath());
+                        }
                     }
                 } catch (Exception e) {
                     Log.e(LOG_TAG, "Error setting up link", e);

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

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

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

@@ -2,29 +2,55 @@ package com.termux.app;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 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 org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
+import androidx.annotation.IntDef;
+
 final class TermuxPreferences {
 
     @IntDef({BELL_VIBRATE, BELL_BEEP, BELL_IGNORE})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface AsciiBellBehaviour {
+    @interface AsciiBellBehaviour {
     }
 
+    final static class KeyboardShortcut {
+
+        KeyboardShortcut(int codePoint, int shortcutAction) {
+            this.codePoint = codePoint;
+            this.shortcutAction = shortcutAction;
+        }
+
+        final int codePoint;
+        final int shortcutAction;
+    }
+
+    static final int SHORTCUT_ACTION_CREATE_SESSION = 1;
+    static final int SHORTCUT_ACTION_NEXT_SESSION = 2;
+    static final int SHORTCUT_ACTION_PREVIOUS_SESSION = 3;
+    static final int SHORTCUT_ACTION_RENAME_SESSION = 4;
+
     static final int BELL_VIBRATE = 1;
     static final int BELL_BEEP = 2;
     static final int BELL_IGNORE = 3;
@@ -32,21 +58,33 @@ final class TermuxPreferences {
     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";
+    private static final String SCREEN_ALWAYS_ON_KEY = "screen_always_on";
 
-    private boolean mFullScreen;
+    private boolean mUseDarkUI;
+    private boolean mScreenAlwaysOn;
     private int mFontSize;
 
     @AsciiBellBehaviour
     int mBellBehaviour = BELL_VIBRATE;
 
     boolean mBackIsEscape;
+    boolean mDisableVolumeVirtualKeys;
     boolean mShowExtraKeys;
 
+    ExtraKeysInfos mExtraKeys;
+
+    final List<KeyboardShortcut> shortcuts = new ArrayList<>();
+
+    /**
+     * If value is not in the range [min, max], set it to either min or max.
+     */
+    static int clamp(int value, int min, int max) {
+        return Math.min(Math.max(value, min), max);
+    }
+
     TermuxPreferences(Context context) {
         reloadFromProperties(context);
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -57,8 +95,8 @@ final class TermuxPreferences {
         // to prevent invisible text due to zoom be mistake:
         MIN_FONTSIZE = (int) (4f * dipInPixels);
 
-        mFullScreen = prefs.getBoolean(FULLSCREEN_KEY, false);
-        mShowExtraKeys = prefs.getBoolean(SHOW_EXTRA_KEYS_KEY, false);
+        mShowExtraKeys = prefs.getBoolean(SHOW_EXTRA_KEYS_KEY, true);
+        mScreenAlwaysOn = prefs.getBoolean(SCREEN_ALWAYS_ON_KEY, false);
 
         // http://www.google.com/design/spec/style/typography.html#typography-line-height
         int defaultFontSize = Math.round(12 * dipInPixels);
@@ -70,20 +108,7 @@ final class TermuxPreferences {
         } catch (NumberFormatException | ClassCastException e) {
             mFontSize = defaultFontSize;
         }
-        mFontSize = Math.max(MIN_FONTSIZE, Math.min(mFontSize, MAX_FONTSIZE));
-    }
-
-    boolean isFullScreen() {
-        return mFullScreen;
-    }
-
-    void setFullScreen(Context context, boolean newValue) {
-        mFullScreen = newValue;
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(FULLSCREEN_KEY, newValue).apply();
-    }
-
-    boolean isShowExtraKeys() {
-        return mShowExtraKeys;
+        mFontSize = clamp(mFontSize, MIN_FONTSIZE, MAX_FONTSIZE); 
     }
 
     boolean toggleShowExtraKeys(Context context) {
@@ -104,8 +129,21 @@ final class TermuxPreferences {
         prefs.edit().putString(FONTSIZE_KEY, Integer.toString(mFontSize)).apply();
     }
 
+    boolean isScreenAlwaysOn() {
+        return mScreenAlwaysOn;
+    }
+
+    boolean isUsingBlackUI() {
+        return mUseDarkUI;
+    }
+
+    void setScreenAlwaysOn(Context context, boolean newValue) {
+        mScreenAlwaysOn = newValue;
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SCREEN_ALWAYS_ON_KEY, newValue).apply();
+    }
+
     static void storeCurrentSession(Context context, TerminalSession session) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(TermuxPreferences.CURRENT_SESSION_KEY, session.mHandle).commit();
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(TermuxPreferences.CURRENT_SESSION_KEY, session.mHandle).apply();
     }
 
     static TerminalSession getCurrentSession(TermuxActivity context) {
@@ -117,69 +155,75 @@ final class TermuxPreferences {
         return null;
     }
 
-    public static boolean isShowWelcomeDialog(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SHOW_WELCOME_DIALOG_KEY, true);
-    }
+    void reloadFromProperties(Context context) {
+        File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
+        if (!propsFile.exists())
+            propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
 
-    public static void disableWelcomeDialog(Context context) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SHOW_WELCOME_DIALOG_KEY, false).apply();
-    }
-
-    public void reloadFromProperties(Context context) {
+        Properties props = new Properties();
         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);
+                    props.load(new InputStreamReader(in, StandardCharsets.UTF_8));
                 }
             }
-
-            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();
+            Toast.makeText(context, "Could not open properties file termux.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;
+        switch (props.getProperty("bell-character", "vibrate")) {
+            case "beep":
+                mBellBehaviour = BELL_BEEP;
+                break;
+            case "ignore":
+                mBellBehaviour = BELL_IGNORE;
+                break;
+            default: // "vibrate".
+                mBellBehaviour = BELL_VIBRATE;
+                break;
         }
 
-        final int codePoint;
-        final int shortcutAction;
-    }
+        switch (props.getProperty("use-black-ui", "").toLowerCase()) {
+            case "true":
+                mUseDarkUI = true;
+                break;
+            case "false":
+                mUseDarkUI = false;
+                break;
+            default:
+                int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+                mUseDarkUI = nightMode == Configuration.UI_MODE_NIGHT_YES;
+        }
 
-    final List<KeyboardShortcut> shortcuts = new ArrayList<>();
+        String defaultExtraKeys = "[[ESC, TAB, CTRL, ALT, {key: '-', popup: '|'}, DOWN, UP]]";
+
+        try {
+            String extrakeyProp = props.getProperty("extra-keys", defaultExtraKeys);
+            String extraKeysStyle = props.getProperty("extra-keys-style", "default");
+            mExtraKeys = new ExtraKeysInfos(extrakeyProp, extraKeysStyle);
+        } catch (JSONException e) {
+            Toast.makeText(context, "Could not load the extra-keys property from the config: " + e.toString(), Toast.LENGTH_LONG).show();
+            Log.e("termux", "Error loading props", e);
+
+            try {
+                mExtraKeys = new ExtraKeysInfos(defaultExtraKeys, "default");
+            } catch (JSONException e2) {
+                e2.printStackTrace();
+                Toast.makeText(context, "Can't create default extra keys", Toast.LENGTH_LONG).show();
+                mExtraKeys = null;
+            }
+        }
+
+        mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
+        mDisableVolumeVirtualKeys = "volume".equals(props.getProperty("volume-keys", "virtual"));
+
+        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);
+    }
 
     private void parseAction(String name, int shortcutAction, Properties props) {
         String value = props.getProperty(name);

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

@@ -2,17 +2,22 @@ package com.termux.app;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Binder;
+import android.os.Build;
+import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.provider.Settings;
 import android.util.Log;
 import android.widget.ArrayAdapter;
 
@@ -22,7 +27,6 @@ import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,6 +44,8 @@ import java.util.List;
  */
 public final class TermuxService extends Service implements SessionChangedCallback {
 
+    private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
+
     /** Note that this is a symlink on the Android M preview. */
     @SuppressLint("SdCardPath")
     public static final String FILES_PATH = "/data/data/com.termux/files";
@@ -48,18 +54,16 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
     private static final int NOTIFICATION_ID = 1337;
 
-    /** Intent action to stop the service. */
     private static final String ACTION_STOP_SERVICE = "com.termux.service_stop";
-    /** Intent action to toggle the wake lock, {@link #mWakeLock}, which this service may hold. */
-    private static final String ACTION_LOCK_WAKE = "com.termux.service_toggle_wake_lock";
-    /** 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";
+    private static final String ACTION_LOCK_WAKE = "com.termux.service_wake_lock";
+    private static final String ACTION_UNLOCK_WAKE = "com.termux.service_wake_unlock";
     /** Intent action to launch a new terminal session. Executed from TermuxWidgetProvider. */
     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";
+    public static final String EXTRA_EXECUTE_IN_BACKGROUND = "com.termux.execute.background";
 
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {
@@ -68,6 +72,8 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
     private final IBinder mBinder = new LocalBinder();
 
+    private final Handler mHandler = new Handler();
+
     /**
      * The terminal sessions which this service manages.
      * <p/>
@@ -76,9 +82,12 @@ public final class TermuxService extends Service implements SessionChangedCallba
      */
     final List<TerminalSession> mTerminalSessions = new ArrayList<>();
 
+    final List<BackgroundJob> mBackgroundTasks = new ArrayList<>();
+
     /** Note that the service may often outlive the activity, so need to clear this reference. */
     SessionChangedCallback mSessionChangeCallback;
 
+    /** The wake lock and wifi lock are always acquired and released together. */
     private PowerManager.WakeLock mWakeLock;
     private WifiManager.WifiLock mWifiLock;
 
@@ -97,43 +106,69 @@ public final class TermuxService extends Service implements SessionChangedCallba
         } else if (ACTION_LOCK_WAKE.equals(action)) {
             if (mWakeLock == null) {
                 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG);
+                mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG + ":service-wakelock");
                 mWakeLock.acquire();
-            } else {
-                mWakeLock.release();
-                mWakeLock = null;
-            }
-            updateNotification();
-        } else if (ACTION_LOCK_WIFI.equals(action)) {
-            if (mWifiLock == null) {
-                WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+
+                // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
+                WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
                 mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, EmulatorDebug.LOG_TAG);
                 mWifiLock.acquire();
-            } else {
+
+                String packageName = getPackageName();
+                if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                    Intent whitelist = new Intent();
+                    whitelist.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                    whitelist.setData(Uri.parse("package:" + packageName));
+                    whitelist.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+                    try {
+                        startActivity(whitelist);
+                    } catch (ActivityNotFoundException e) {
+                        Log.e(EmulatorDebug.LOG_TAG, "Failed to call ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", e);
+                    }
+                }
+
+                updateNotification();
+            }
+        } else if (ACTION_UNLOCK_WAKE.equals(action)) {
+            if (mWakeLock != null) {
+                mWakeLock.release();
+                mWakeLock = null;
+
                 mWifiLock.release();
                 mWifiLock = null;
+
+                updateNotification();
             }
-            updateNotification();
         } else if (ACTION_EXECUTE.equals(action)) {
             Uri executableUri = intent.getData();
             String executablePath = (executableUri == null ? null : executableUri.getPath());
+
             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".
-            if (executablePath != null) {
-                int lastSlash = executablePath.lastIndexOf('/');
-                String name = (lastSlash == -1) ? executablePath : executablePath.substring(lastSlash + 1);
-                name = name.replace('-', ' ');
-                newSession.mSessionName = name;
+            if (intent.getBooleanExtra(EXTRA_EXECUTE_IN_BACKGROUND, false)) {
+                BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, intent.getParcelableExtra("pendingIntent"));
+                mBackgroundTasks.add(task);
+                updateNotification();
+            } else {
+                boolean failsafe = intent.getBooleanExtra(TermuxActivity.TERMUX_FAILSAFE_SESSION_ACTION, false);
+                TerminalSession newSession = createTermSession(executablePath, arguments, cwd, failsafe);
+
+                // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
+                if (executablePath != null) {
+                    int lastSlash = executablePath.lastIndexOf('/');
+                    String name = (lastSlash == -1) ? executablePath : executablePath.substring(lastSlash + 1);
+                    name = name.replace('-', ' ');
+                    newSession.mSessionName = name;
+                }
+
+                // Make the newly created session the current one to be displayed:
+                TermuxPreferences.storeCurrentSession(this, newSession);
+
+                // Launch the main Termux app, which will now show the current session:
+                startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
             }
-
-            // Make the newly created session the current one to be displayed:
-            TermuxPreferences.storeCurrentSession(this, newSession);
-
-            // Launch the main Termux app, which will now show to current session:
-            startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
         } else if (action != null) {
             Log.e(EmulatorDebug.LOG_TAG, "Unknown TermuxService action: '" + action + "'");
         }
@@ -150,13 +185,14 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
     @Override
     public void onCreate() {
+        setupNotificationChannel();
         startForeground(NOTIFICATION_ID, buildNotification());
     }
 
     /** Update the shown foreground service notification after making any changes that affect it. */
-    private void updateNotification() {
-        if (mWakeLock == null && mWifiLock == null && getSessions().isEmpty()) {
-            // Exit if we are updating after the user disabled all locks with no sessions.
+    void updateNotification() {
+        if (mWakeLock == null && mTerminalSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
+            // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             stopSelf();
         } else {
             ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(NOTIFICATION_ID, buildNotification());
@@ -171,18 +207,15 @@ public final class TermuxService extends Service implements SessionChangedCallba
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
 
         int sessionCount = mTerminalSessions.size();
-        String contentText = sessionCount + " terminal session" + (sessionCount == 1 ? "" : "s");
-
-        boolean wakeLockHeld = mWakeLock != null;
-        boolean wifiLockHeld = mWifiLock != null;
-        if (wakeLockHeld && wifiLockHeld) {
-            contentText += " (wake&wifi lock held)";
-        } else if (wakeLockHeld) {
-            contentText += " (wake lock held)";
-        } else if (wifiLockHeld) {
-            contentText += " (wifi lock held)";
+        int taskCount = mBackgroundTasks.size();
+        String contentText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
+        if (taskCount > 0) {
+            contentText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
         }
 
+        final boolean wakeLockHeld = mWakeLock != null;
+        if (wakeLockHeld) contentText += " (wake lock held)";
+
         Notification.Builder builder = new Notification.Builder(this);
         builder.setContentTitle(getText(R.string.application_name));
         builder.setContentText(contentText);
@@ -191,32 +224,48 @@ public final class TermuxService extends Service implements SessionChangedCallba
         builder.setOngoing(true);
 
         // If holding a wake or wifi lock consider the notification of high priority since it's using power,
-        // otherwise use a minimal priority since this is just a background service notification:
-        builder.setPriority((wakeLockHeld || wifiLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_MIN);
+        // otherwise use a low priority
+        builder.setPriority((wakeLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_LOW);
 
         // No need to show a timestamp:
         builder.setShowWhen(false);
 
         // Background color for small notification icon:
-        builder.setColor(0xFF000000);
+        builder.setColor(0xFF607D8B);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
+        }
 
         Resources res = getResources();
         Intent exitIntent = new Intent(this, TermuxService.class).setAction(ACTION_STOP_SERVICE);
         builder.addAction(android.R.drawable.ic_delete, res.getString(R.string.notification_action_exit), PendingIntent.getService(this, 0, exitIntent, 0));
 
-        Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(ACTION_LOCK_WAKE);
-        builder.addAction(android.R.drawable.ic_lock_lock, res.getString(R.string.notification_action_wakelock),
-            PendingIntent.getService(this, 0, toggleWakeLockIntent, 0));
-
-        Intent toggleWifiLockIntent = new Intent(this, TermuxService.class).setAction(ACTION_LOCK_WIFI);
-        builder.addAction(android.R.drawable.ic_lock_lock, res.getString(R.string.notification_action_wifilock),
-            PendingIntent.getService(this, 0, toggleWifiLockIntent, 0));
+        String newWakeAction = wakeLockHeld ? ACTION_UNLOCK_WAKE : ACTION_LOCK_WAKE;
+        Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(newWakeAction);
+        String actionTitle = res.getString(wakeLockHeld ?
+            R.string.notification_action_wake_unlock :
+            R.string.notification_action_wake_lock);
+        int actionIcon = wakeLockHeld ? android.R.drawable.ic_lock_idle_lock : android.R.drawable.ic_lock_lock;
+        builder.addAction(actionIcon, actionTitle, PendingIntent.getService(this, 0, toggleWakeLockIntent, 0));
 
         return builder.build();
     }
 
     @Override
     public void onDestroy() {
+        File termuxTmpDir = new File(TermuxService.PREFIX_PATH + "/tmp");
+
+        if (termuxTmpDir.exists()) {
+            try {
+                TermuxInstaller.deleteFolder(termuxTmpDir.getCanonicalFile());
+            } catch (Exception e) {
+                Log.e(EmulatorDebug.LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
+            }
+
+            termuxTmpDir.mkdirs();
+        }
+
         if (mWakeLock != null) mWakeLock.release();
         if (mWifiLock != null) mWifiLock.release();
 
@@ -224,7 +273,6 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
         for (int i = 0; i < mTerminalSessions.size(); i++)
             mTerminalSessions.get(i).finishIfRunning();
-        mTerminalSessions.clear();
     }
 
     public List<TerminalSession> getSessions() {
@@ -236,48 +284,12 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
         if (cwd == null) cwd = HOME_PATH;
 
-        final String termEnv = "TERM=xterm-256color";
-        final String homeEnv = "HOME=" + HOME_PATH;
-        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) {
-            // 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";
-            final String pwdEnv = "PWD=" + cwd;
+        String[] env = BackgroundJob.buildEnvironment(failSafe, cwd);
+        boolean isLoginShell = false;
 
-            env = new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv};
-        }
-
-        String shellName;
         if (executablePath == null) {
-            File shell = new File(HOME_PATH, ".termux/shell");
-            if (shell.exists()) {
-                try {
-                    File canonicalFile = shell.getCanonicalFile();
-                    if (canonicalFile.isFile() && canonicalFile.canExecute()) {
-                        executablePath = canonicalFile.getName().equals("busybox") ? (PREFIX_PATH + "/bin/ash") : canonicalFile.getAbsolutePath();
-                    } else {
-                        Log.w(EmulatorDebug.LOG_TAG, "$HOME/.termux/shell points to non-executable shell: " + canonicalFile.getAbsolutePath());
-                    }
-                } catch (IOException e) {
-                    Log.e(EmulatorDebug.LOG_TAG, "Error checking $HOME/.termux/shell", e);
-                }
-            }
-
-            if (executablePath == null) {
-                // Try bash, zsh and ash in that order:
-                for (String shellBinary : new String[]{"bash", "zsh", "ash"}) {
+            if (!failSafe) {
+                for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
                     File shellFile = new File(PREFIX_PATH + "/bin/" + shellBinary);
                     if (shellFile.canExecute()) {
                         executablePath = shellFile.getAbsolutePath();
@@ -290,27 +302,28 @@ public final class TermuxService extends Service implements SessionChangedCallba
                 // Fall back to system shell as last resort:
                 executablePath = "/system/bin/sh";
             }
-
-            String[] parts = executablePath.split("/");
-            shellName = "-" + parts[parts.length - 1];
-        } else {
-            int lastSlashIndex = executablePath.lastIndexOf('/');
-            shellName = lastSlashIndex == -1 ? executablePath : executablePath.substring(lastSlashIndex + 1);
+            isLoginShell = true;
         }
 
-        String[] args;
-        if (arguments == null) {
-            args = new String[]{shellName};
-        } else {
-            args = new String[arguments.length + 1];
-            args[0] = shellName;
+        String[] processArgs = BackgroundJob.setupProcessArgs(executablePath, arguments);
+        executablePath = processArgs[0];
+        int lastSlashIndex = executablePath.lastIndexOf('/');
+        String processName = (isLoginShell ? "-" : "") +
+            (lastSlashIndex == -1 ? executablePath : executablePath.substring(lastSlashIndex + 1));
 
-            System.arraycopy(arguments, 0, args, 1, arguments.length);
-        }
+        String[] args = new String[processArgs.length];
+        args[0] = processName;
+        if (processArgs.length > 1) System.arraycopy(processArgs, 1, args, 1, processArgs.length - 1);
 
         TerminalSession session = new TerminalSession(executablePath, cwd, args, env, this);
         mTerminalSessions.add(session);
         updateNotification();
+
+        // Make sure that terminal styling is always applied.
+        Intent stylingIntent = new Intent("com.termux.app.reload_style");
+        stylingIntent.putExtra("com.termux.app.reload_style", "styling");
+        sendBroadcast(stylingIntent);
+
         return session;
     }
 
@@ -358,4 +371,23 @@ public final class TermuxService extends Service implements SessionChangedCallba
         if (mSessionChangeCallback != null) mSessionChangeCallback.onColorsChanged(session);
     }
 
+    public void onBackgroundJobExited(final BackgroundJob task) {
+        mHandler.post(() -> {
+            mBackgroundTasks.remove(task);
+            updateNotification();
+        });
+    }
+
+    private void setupNotificationChannel() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+
+        String channelName = "Termux";
+        String channelDescription = "Notifications from Termux";
+        int importance = NotificationManager.IMPORTANCE_LOW;
+
+        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName,importance);
+        channel.setDescription(channelDescription);
+        NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        manager.createNotificationChannel(channel);
+    }
 }

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

@@ -2,8 +2,6 @@ package com.termux.app;
 
 import android.content.Context;
 import android.media.AudioManager;
-import android.support.v4.widget.DrawerLayout;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.InputDevice;
 import android.view.KeyEvent;
@@ -13,18 +11,20 @@ import android.view.inputmethod.InputMethodManager;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
-import com.termux.view.TerminalKeyListener;
+import com.termux.view.TerminalViewClient;
 
 import java.util.List;
 
-public final class TermuxKeyListener implements TerminalKeyListener {
+import androidx.drawerlayout.widget.DrawerLayout;
+
+public final class TermuxViewClient implements TerminalViewClient {
 
     final TermuxActivity mActivity;
 
     /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
-    public TermuxKeyListener(TermuxActivity activity) {
+    public TermuxViewClient(TermuxActivity activity) {
         this.mActivity = activity;
     }
 
@@ -62,7 +62,7 @@ public final class TermuxKeyListener implements TerminalKeyListener {
         if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) {
             mActivity.removeFinishedSession(currentSession);
             return true;
-        } else if (e.isCtrlPressed() && e.isShiftPressed()) {
+        } else if (e.isCtrlPressed() && e.isAltPressed()) {
             // Get the unmodified code point:
             int unicodeChar = e.getUnicodeChar(0);
 
@@ -74,8 +74,6 @@ public final class TermuxKeyListener implements TerminalKeyListener {
                 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);
@@ -115,12 +113,12 @@ public final class TermuxKeyListener implements TerminalKeyListener {
 
     @Override
     public boolean readControlKey() {
-        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readControlButton()) || mVirtualControlKeyDown;
+        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readSpecialButton(ExtraKeysView.SpecialButton.CTRL)) || mVirtualControlKeyDown;
     }
 
     @Override
     public boolean readAltKey() {
-        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readAltButton());
+        return (mActivity.mExtraKeysView != null && mActivity.mExtraKeysView.readSpecialButton(ExtraKeysView.SpecialButton.ALT));
     }
 
     @Override
@@ -161,7 +159,7 @@ public final class TermuxKeyListener implements TerminalKeyListener {
                     resultingKeyCode = KeyEvent.KEYCODE_INSERT;
                     break;
                 case 'h':
-                    resultingKeyCode = KeyEvent.KEYCODE_MOVE_HOME;
+                    resultingCodePoint = '~';
                     break;
 
                 // Special characters to input.
@@ -212,6 +210,7 @@ public final class TermuxKeyListener implements TerminalKeyListener {
 
                 // Writing mode:
                 case 'q':
+                case 'k':
                     mActivity.toggleShowExtraKeys();
                     break;
             }
@@ -257,10 +256,17 @@ public final class TermuxKeyListener implements TerminalKeyListener {
         return false;
     }
 
+    @Override
+    public boolean onLongPress(MotionEvent event) {
+        return false;
+    }
+
     /** Handle dedicated volume buttons as virtual keys if applicable. */
     private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         InputDevice inputDevice = event.getDevice();
-        if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+        if (mActivity.mSettings.mDisableVolumeVirtualKeys) {
+            return false;
+        } else 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) {

app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java

@@ -71,7 +71,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
         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_FLAGS, Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD);
         row.add(Root.COLUMN_TITLE, applicationName);
         row.add(Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
         row.add(Root.COLUMN_AVAILABLE_BYTES, BASE_DIR.getFreeSpace());
@@ -117,6 +117,29 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
         return true;
     }
 
+    @Override
+    public String createDocument(String parentDocumentId, String mimeType, String displayName) throws FileNotFoundException {
+        File newFile = new File(parentDocumentId, displayName);
+        int noConflictId = 2;
+        while (newFile.exists()) {
+            newFile = new File(parentDocumentId, displayName + " (" + noConflictId++ + ")");
+        }
+        try {
+            boolean succeeded;
+            if (Document.MIME_TYPE_DIR.equals(mimeType)) {
+                succeeded = newFile.mkdir();
+            } else {
+                succeeded = newFile.createNewFile();
+            }
+            if (!succeeded) {
+                throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
+            }
+        } catch (IOException e) {
+            throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
+        }
+        return newFile.getPath();
+    }
+
     @Override
     public void deleteDocument(String documentId) throws FileNotFoundException {
         File file = getFileForDocId(documentId);
@@ -169,6 +192,11 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
         return result;
     }
 
+    @Override
+    public boolean isChildDocument(String parentDocumentId, String documentId) {
+        return documentId.startsWith(parentDocumentId);
+    }
+
     /**
      * 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.
@@ -195,7 +223,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
             final String name = file.getName();
             final int lastDot = name.lastIndexOf('.');
             if (lastDot >= 0) {
-                final String extension = name.substring(lastDot + 1);
+                final String extension = name.substring(lastDot + 1).toLowerCase();
                 final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
                 if (mime != null) return mime;
             }
@@ -220,10 +248,11 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
 
         int flags = 0;
         if (file.isDirectory()) {
-            if (file.isDirectory() && file.canWrite()) flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
+            if (file.canWrite()) flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
         } else if (file.canWrite()) {
-            flags |= Document.FLAG_SUPPORTS_WRITE | Document.FLAG_SUPPORTS_DELETE;
+            flags |= Document.FLAG_SUPPORTS_WRITE;
         }
+        if (file.getParentFile().canWrite()) flags |= Document.FLAG_SUPPORTS_DELETE;
 
         final String displayName = file.getName();
         final String mimeType = getMimeType(file);

app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java

@@ -2,7 +2,6 @@ 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;
@@ -22,6 +21,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
 
 public class TermuxFileReceiverActivity extends Activity {
 
@@ -37,6 +37,11 @@ public class TermuxFileReceiverActivity extends Activity {
      */
     boolean mFinishOnDismissNameDialog = true;
 
+    static boolean isSharedTextAnUrl(String sharedText) {
+        return Patterns.WEB_URL.matcher(sharedText).matches()
+            || Pattern.matches("magnet:\\?xt=urn:btih:.*?", sharedText);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -51,7 +56,7 @@ public class TermuxFileReceiverActivity extends Activity {
             final Uri sharedUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
 
             if (sharedText != null) {
-                if (Patterns.WEB_URL.matcher(sharedText).matches()) {
+                if (isSharedTextAnUrl(sharedText)) {
                     handleUrlAndFinish(sharedText);
                 } else {
                     String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
@@ -83,17 +88,7 @@ public class TermuxFileReceiverActivity extends Activity {
 
     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();
+        new AlertDialog.Builder(this).setMessage(message).setOnDismissListener(dialog -> finish()).setPositiveButton(android.R.string.ok, (dialog, which) -> finish()).show();
     }
 
     void handleContentUri(final Uri uri, String subjectFromIntent) {
@@ -119,54 +114,40 @@ public class TermuxFileReceiverActivity extends Activity {
     }
 
     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;
+        DialogUtils.textInput(this, R.string.file_received_title, attachmentFileName, R.string.file_received_edit_button, 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;
-                    }
+            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);
+            // Do this for the user if necessary:
+            //noinspection ResultOfMethodCallIgnored
+            editorProgramFile.setExecutable(true);
 
-                    final Uri scriptUri = new Uri.Builder().scheme("file").path(EDITOR_PROGRAM).build();
+            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();
-                }
+            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, 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();
             },
-            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();
-                }
+            android.R.string.cancel, text -> finish(), dialog -> {
+                if (mFinishOnDismissNameDialog) finish();
             });
     }
 

app/src/main/java/com/termux/terminal/TextStyle.java

@@ -1,55 +0,0 @@
-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).
- */
-public final class TextStyle {
-
-    public final static int CHARACTER_ATTRIBUTE_BOLD = 1;
-    public final static int CHARACTER_ATTRIBUTE_ITALIC = 1 << 1;
-    public final static int CHARACTER_ATTRIBUTE_UNDERLINE = 1 << 2;
-    public final static int CHARACTER_ATTRIBUTE_BLINK = 1 << 3;
-    public final static int CHARACTER_ATTRIBUTE_INVERSE = 1 << 4;
-    public final static int CHARACTER_ATTRIBUTE_INVISIBLE = 1 << 5;
-    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.
-     */
-    public final static int CHARACTER_ATTRIBUTE_PROTECTED = 1 << 7;
-    /** Dim colors. Also known as faint or half intensity. */
-    public final static int CHARACTER_ATTRIBUTE_DIM = 1 << 8;
-
-    public final static int COLOR_INDEX_FOREGROUND = 256;
-    public final static int COLOR_INDEX_BACKGROUND = 257;
-    public final static int COLOR_INDEX_CURSOR = 258;
-
-    /** The 256 standard color entries and the three special (foreground, background and cursor) ones. */
-    public final static int NUM_INDEXED_COLORS = 259;
-
-    /** Normal foreground and background colors and no effects. */
-    final static int NORMAL = encode(COLOR_INDEX_FOREGROUND, COLOR_INDEX_BACKGROUND, 0);
-
-    static int encode(int foreColor, int backColor, int effect) {
-        return ((effect & 0b111111111) << 18) | ((foreColor & 0b111111111) << 9) | (backColor & 0b111111111);
-    }
-
-    public static int decodeForeColor(int encodedColor) {
-        return (encodedColor >> 9) & 0b111111111;
-    }
-
-    public static int decodeBackColor(int encodedColor) {
-        return encodedColor & 0b111111111;
-    }
-
-    public static int decodeEffect(int encodedColor) {
-        return (encodedColor >> 18) & 0b111111111;
-    }
-
-}

app/src/main/java/com/termux/terminal/WcWidth.java

@@ -1,458 +0,0 @@
-package com.termux.terminal;
-
-/**
- * Implementation of wcwidth(3) for Unicode 9.
- *
- * Implementation from https://github.com/jquast/wcwidth but we return 0 for unprintable characters.
- */
-public final class WcWidth {
-
-    // From https://github.com/jquast/wcwidth/blob/master/wcwidth/table_zero.py
-    // t commit 0d7de112202cc8b2ebe9232ff4a5c954f19d561a (2016-07-02):
-    private static final int[][] ZERO_WIDTH = {
-        {0x0300, 0x036f},  // Combining Grave Accent  ..Combining Latin Small Le
-        {0x0483, 0x0489},  // Combining Cyrillic Titlo..Combining Cyrillic Milli
-        {0x0591, 0x05bd},  // Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        {0x05bf, 0x05bf},  // Hebrew Point Rafe       ..Hebrew Point Rafe
-        {0x05c1, 0x05c2},  // Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        {0x05c4, 0x05c5},  // Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        {0x05c7, 0x05c7},  // Hebrew Point Qamats Qata..Hebrew Point Qamats Qata
-        {0x0610, 0x061a},  // Arabic Sign Sallallahou ..Arabic Small Kasra
-        {0x064b, 0x065f},  // Arabic Fathatan         ..Arabic Wavy Hamza Below
-        {0x0670, 0x0670},  // Arabic Letter Superscrip..Arabic Letter Superscrip
-        {0x06d6, 0x06dc},  // Arabic Small High Ligatu..Arabic Small High Seen
-        {0x06df, 0x06e4},  // Arabic Small High Rounde..Arabic Small High Madda
-        {0x06e7, 0x06e8},  // Arabic Small High Yeh   ..Arabic Small High Noon
-        {0x06ea, 0x06ed},  // Arabic Empty Centre Low ..Arabic Small Low Meem
-        {0x0711, 0x0711},  // Syriac Letter Superscrip..Syriac Letter Superscrip
-        {0x0730, 0x074a},  // Syriac Pthaha Above     ..Syriac Barrekh
-        {0x07a6, 0x07b0},  // Thaana Abafili          ..Thaana Sukun
-        {0x07eb, 0x07f3},  // Nko Combining Sh||t High..Nko Combining Double Dot
-        {0x0816, 0x0819},  // Samaritan Mark In       ..Samaritan Mark Dagesh
-        {0x081b, 0x0823},  // Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        {0x0825, 0x0827},  // Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        {0x0829, 0x082d},  // Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        {0x0859, 0x085b},  // Mandaic Affrication Mark..Mandaic Gemination Mark
-        {0x08d4, 0x08e1},  // (nil)                   ..
-        {0x08e3, 0x0902},  // Arabic Turned Damma Belo..Devanagari Sign Anusvara
-        {0x093a, 0x093a},  // Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe
-        {0x093c, 0x093c},  // Devanagari Sign Nukta   ..Devanagari Sign Nukta
-        {0x0941, 0x0948},  // Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai
-        {0x094d, 0x094d},  // Devanagari Sign Virama  ..Devanagari Sign Virama
-        {0x0951, 0x0957},  // Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        {0x0962, 0x0963},  // Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        {0x0981, 0x0981},  // Bengali Sign Candrabindu..Bengali Sign Candrabindu
-        {0x09bc, 0x09bc},  // Bengali Sign Nukta      ..Bengali Sign Nukta
-        {0x09c1, 0x09c4},  // Bengali Vowel Sign U    ..Bengali Vowel Sign Vocal
-        {0x09cd, 0x09cd},  // Bengali Sign Virama     ..Bengali Sign Virama
-        {0x09e2, 0x09e3},  // Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        {0x0a01, 0x0a02},  // Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi
-        {0x0a3c, 0x0a3c},  // Gurmukhi Sign Nukta     ..Gurmukhi Sign Nukta
-        {0x0a41, 0x0a42},  // Gurmukhi Vowel Sign U   ..Gurmukhi Vowel Sign Uu
-        {0x0a47, 0x0a48},  // Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        {0x0a4b, 0x0a4d},  // Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        {0x0a51, 0x0a51},  // Gurmukhi Sign Udaat     ..Gurmukhi Sign Udaat
-        {0x0a70, 0x0a71},  // Gurmukhi Tippi          ..Gurmukhi Addak
-        {0x0a75, 0x0a75},  // Gurmukhi Sign Yakash    ..Gurmukhi Sign Yakash
-        {0x0a81, 0x0a82},  // Gujarati Sign Candrabind..Gujarati Sign Anusvara
-        {0x0abc, 0x0abc},  // Gujarati Sign Nukta     ..Gujarati Sign Nukta
-        {0x0ac1, 0x0ac5},  // Gujarati Vowel Sign U   ..Gujarati Vowel Sign Cand
-        {0x0ac7, 0x0ac8},  // Gujarati Vowel Sign E   ..Gujarati Vowel Sign Ai
-        {0x0acd, 0x0acd},  // Gujarati Sign Virama    ..Gujarati Sign Virama
-        {0x0ae2, 0x0ae3},  // Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        {0x0b01, 0x0b01},  // ||iya Sign Candrabindu  ..||iya Sign Candrabindu
-        {0x0b3c, 0x0b3c},  // ||iya Sign Nukta        ..||iya Sign Nukta
-        {0x0b3f, 0x0b3f},  // ||iya Vowel Sign I      ..||iya Vowel Sign I
-        {0x0b41, 0x0b44},  // ||iya Vowel Sign U      ..||iya Vowel Sign Vocalic
-        {0x0b4d, 0x0b4d},  // ||iya Sign Virama       ..||iya Sign Virama
-        {0x0b56, 0x0b56},  // ||iya Ai Length Mark    ..||iya Ai Length Mark
-        {0x0b62, 0x0b63},  // ||iya Vowel Sign Vocalic..||iya Vowel Sign Vocalic
-        {0x0b82, 0x0b82},  // Tamil Sign Anusvara     ..Tamil Sign Anusvara
-        {0x0bc0, 0x0bc0},  // Tamil Vowel Sign Ii     ..Tamil Vowel Sign Ii
-        {0x0bcd, 0x0bcd},  // Tamil Sign Virama       ..Tamil Sign Virama
-        {0x0c00, 0x0c00},  // Telugu Sign Combining Ca..Telugu Sign Combining Ca
-        {0x0c3e, 0x0c40},  // Telugu Vowel Sign Aa    ..Telugu Vowel Sign Ii
-        {0x0c46, 0x0c48},  // Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        {0x0c4a, 0x0c4d},  // Telugu Vowel Sign O     ..Telugu Sign Virama
-        {0x0c55, 0x0c56},  // Telugu Length Mark      ..Telugu Ai Length Mark
-        {0x0c62, 0x0c63},  // Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        {0x0c81, 0x0c81},  // Kannada Sign Candrabindu..Kannada Sign Candrabindu
-        {0x0cbc, 0x0cbc},  // Kannada Sign Nukta      ..Kannada Sign Nukta
-        {0x0cbf, 0x0cbf},  // Kannada Vowel Sign I    ..Kannada Vowel Sign I
-        {0x0cc6, 0x0cc6},  // Kannada Vowel Sign E    ..Kannada Vowel Sign E
-        {0x0ccc, 0x0ccd},  // Kannada Vowel Sign Au   ..Kannada Sign Virama
-        {0x0ce2, 0x0ce3},  // Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        {0x0d01, 0x0d01},  // Malayalam Sign Candrabin..Malayalam Sign Candrabin
-        {0x0d41, 0x0d44},  // Malayalam Vowel Sign U  ..Malayalam Vowel Sign Voc
-        {0x0d4d, 0x0d4d},  // Malayalam Sign Virama   ..Malayalam Sign Virama
-        {0x0d62, 0x0d63},  // Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        {0x0dca, 0x0dca},  // Sinhala Sign Al-lakuna  ..Sinhala Sign Al-lakuna
-        {0x0dd2, 0x0dd4},  // Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti
-        {0x0dd6, 0x0dd6},  // Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        {0x0e31, 0x0e31},  // Thai Character Mai Han-a..Thai Character Mai Han-a
-        {0x0e34, 0x0e3a},  // Thai Character Sara I   ..Thai Character Phinthu
-        {0x0e47, 0x0e4e},  // Thai Character Maitaikhu..Thai Character Yamakkan
-        {0x0eb1, 0x0eb1},  // Lao Vowel Sign Mai Kan  ..Lao Vowel Sign Mai Kan
-        {0x0eb4, 0x0eb9},  // Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        {0x0ebb, 0x0ebc},  // Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        {0x0ec8, 0x0ecd},  // Lao Tone Mai Ek         ..Lao Niggahita
-        {0x0f18, 0x0f19},  // Tibetan Astrological Sig..Tibetan Astrological Sig
-        {0x0f35, 0x0f35},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
-        {0x0f37, 0x0f37},  // Tibetan Mark Ngas Bzung ..Tibetan Mark Ngas Bzung
-        {0x0f39, 0x0f39},  // Tibetan Mark Tsa -phru  ..Tibetan Mark Tsa -phru
-        {0x0f71, 0x0f7e},  // Tibetan Vowel Sign Aa   ..Tibetan Sign Rjes Su Nga
-        {0x0f80, 0x0f84},  // Tibetan Vowel Sign Rever..Tibetan Mark Halanta
-        {0x0f86, 0x0f87},  // Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        {0x0f8d, 0x0f97},  // Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        {0x0f99, 0x0fbc},  // Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        {0x0fc6, 0x0fc6},  // Tibetan Symbol Padma Gda..Tibetan Symbol Padma Gda
-        {0x102d, 0x1030},  // Myanmar Vowel Sign I    ..Myanmar Vowel Sign Uu
-        {0x1032, 0x1037},  // Myanmar Vowel Sign Ai   ..Myanmar Sign Dot Below
-        {0x1039, 0x103a},  // Myanmar Sign Virama     ..Myanmar Sign Asat
-        {0x103d, 0x103e},  // Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        {0x1058, 0x1059},  // Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        {0x105e, 0x1060},  // Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        {0x1071, 0x1074},  // Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        {0x1082, 0x1082},  // Myanmar Consonant Sign S..Myanmar Consonant Sign S
-        {0x1085, 0x1086},  // Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan
-        {0x108d, 0x108d},  // Myanmar Sign Shan Counci..Myanmar Sign Shan Counci
-        {0x109d, 0x109d},  // Myanmar Vowel Sign Aiton..Myanmar Vowel Sign Aiton
-        {0x135d, 0x135f},  // Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        {0x1712, 0x1714},  // Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        {0x1732, 0x1734},  // Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        {0x1752, 0x1753},  // Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        {0x1772, 0x1773},  // Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        {0x17b4, 0x17b5},  // Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa
-        {0x17b7, 0x17bd},  // Khmer Vowel Sign I      ..Khmer Vowel Sign Ua
-        {0x17c6, 0x17c6},  // Khmer Sign Nikahit      ..Khmer Sign Nikahit
-        {0x17c9, 0x17d3},  // Khmer Sign Muusikatoan  ..Khmer Sign Bathamasat
-        {0x17dd, 0x17dd},  // Khmer Sign Atthacan     ..Khmer Sign Atthacan
-        {0x180b, 0x180d},  // Mongolian Free Variation..Mongolian Free Variation
-        {0x1885, 0x1886},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        {0x18a9, 0x18a9},  // Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        {0x1920, 0x1922},  // Limbu Vowel Sign A      ..Limbu Vowel Sign U
-        {0x1927, 0x1928},  // Limbu Vowel Sign E      ..Limbu Vowel Sign O
-        {0x1932, 0x1932},  // Limbu Small Letter Anusv..Limbu Small Letter Anusv
-        {0x1939, 0x193b},  // Limbu Sign Mukphreng    ..Limbu Sign Sa-i
-        {0x1a17, 0x1a18},  // Buginese Vowel Sign I   ..Buginese Vowel Sign U
-        {0x1a1b, 0x1a1b},  // Buginese Vowel Sign Ae  ..Buginese Vowel Sign Ae
-        {0x1a56, 0x1a56},  // Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        {0x1a58, 0x1a5e},  // Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign
-        {0x1a60, 0x1a60},  // Tai Tham Sign Sakot     ..Tai Tham Sign Sakot
-        {0x1a62, 0x1a62},  // Tai Tham Vowel Sign Mai ..Tai Tham Vowel Sign Mai
-        {0x1a65, 0x1a6c},  // Tai Tham Vowel Sign I   ..Tai Tham Vowel Sign Oa B
-        {0x1a73, 0x1a7c},  // Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue
-        {0x1a7f, 0x1a7f},  // Tai Tham Combining Crypt..Tai Tham Combining Crypt
-        {0x1ab0, 0x1abe},  // Combining Doubled Circum..Combining Parentheses Ov
-        {0x1b00, 0x1b03},  // Balinese Sign Ulu Ricem ..Balinese Sign Surang
-        {0x1b34, 0x1b34},  // Balinese Sign Rerekan   ..Balinese Sign Rerekan
-        {0x1b36, 0x1b3a},  // Balinese Vowel Sign Ulu ..Balinese Vowel Sign Ra R
-        {0x1b3c, 0x1b3c},  // Balinese Vowel Sign La L..Balinese Vowel Sign La L
-        {0x1b42, 0x1b42},  // Balinese Vowel Sign Pepe..Balinese Vowel Sign Pepe
-        {0x1b6b, 0x1b73},  // Balinese Musical Symbol ..Balinese Musical Symbol
-        {0x1b80, 0x1b81},  // Sundanese Sign Panyecek ..Sundanese Sign Panglayar
-        {0x1ba2, 0x1ba5},  // Sundanese Consonant Sign..Sundanese Vowel Sign Pan
-        {0x1ba8, 0x1ba9},  // Sundanese Vowel Sign Pam..Sundanese Vowel Sign Pan
-        {0x1bab, 0x1bad},  // Sundanese Sign Virama   ..Sundanese Consonant Sign
-        {0x1be6, 0x1be6},  // Batak Sign Tompi        ..Batak Sign Tompi
-        {0x1be8, 0x1be9},  // Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee
-        {0x1bed, 0x1bed},  // Batak Vowel Sign Karo O ..Batak Vowel Sign Karo O
-        {0x1bef, 0x1bf1},  // Batak Vowel Sign U F|| S..Batak Consonant Sign H
-        {0x1c2c, 0x1c33},  // Lepcha Vowel Sign E     ..Lepcha Consonant Sign T
-        {0x1c36, 0x1c37},  // Lepcha Sign Ran         ..Lepcha Sign Nukta
-        {0x1cd0, 0x1cd2},  // Vedic Tone Karshana     ..Vedic Tone Prenkha
-        {0x1cd4, 0x1ce0},  // Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash
-        {0x1ce2, 0x1ce8},  // Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda
-        {0x1ced, 0x1ced},  // Vedic Sign Tiryak       ..Vedic Sign Tiryak
-        {0x1cf4, 0x1cf4},  // Vedic Tone Candra Above ..Vedic Tone Candra Above
-        {0x1cf8, 0x1cf9},  // Vedic Tone Ring Above   ..Vedic Tone Double Ring A
-        {0x1dc0, 0x1df5},  // Combining Dotted Grave A..Combining Up Tack Above
-        {0x1dfb, 0x1dff},  // (nil)                   ..Combining Right Arrowhea
-        {0x20d0, 0x20f0},  // Combining Left Harpoon A..Combining Asterisk Above
-        {0x2cef, 0x2cf1},  // Coptic Combining Ni Abov..Coptic Combining Spiritu
-        {0x2d7f, 0x2d7f},  // Tifinagh Consonant Joine..Tifinagh Consonant Joine
-        {0x2de0, 0x2dff},  // Combining Cyrillic Lette..Combining Cyrillic Lette
-        {0x302a, 0x302d},  // Ideographic Level Tone M..Ideographic Entering Ton
-        {0x3099, 0x309a},  // Combining Katakana-hirag..Combining Katakana-hirag
-        {0xa66f, 0xa672},  // Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        {0xa674, 0xa67d},  // Combining Cyrillic Lette..Combining Cyrillic Payer
-        {0xa69e, 0xa69f},  // Combining Cyrillic Lette..Combining Cyrillic Lette
-        {0xa6f0, 0xa6f1},  // Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        {0xa802, 0xa802},  // Syloti Nagri Sign Dvisva..Syloti Nagri Sign Dvisva
-        {0xa806, 0xa806},  // Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant
-        {0xa80b, 0xa80b},  // Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva
-        {0xa825, 0xa826},  // Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        {0xa8c4, 0xa8c5},  // Saurashtra Sign Virama  ..
-        {0xa8e0, 0xa8f1},  // Combining Devanagari Dig..Combining Devanagari Sig
-        {0xa926, 0xa92d},  // Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        {0xa947, 0xa951},  // Rejang Vowel Sign I     ..Rejang Consonant Sign R
-        {0xa980, 0xa982},  // Javanese Sign Panyangga ..Javanese Sign Layar
-        {0xa9b3, 0xa9b3},  // Javanese Sign Cecak Telu..Javanese Sign Cecak Telu
-        {0xa9b6, 0xa9b9},  // Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku
-        {0xa9bc, 0xa9bc},  // Javanese Vowel Sign Pepe..Javanese Vowel Sign Pepe
-        {0xa9e5, 0xa9e5},  // Myanmar Sign Shan Saw   ..Myanmar Sign Shan Saw
-        {0xaa29, 0xaa2e},  // Cham Vowel Sign Aa      ..Cham Vowel Sign Oe
-        {0xaa31, 0xaa32},  // Cham Vowel Sign Au      ..Cham Vowel Sign Ue
-        {0xaa35, 0xaa36},  // Cham Consonant Sign La  ..Cham Consonant Sign Wa
-        {0xaa43, 0xaa43},  // Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        {0xaa4c, 0xaa4c},  // Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        {0xaa7c, 0xaa7c},  // Myanmar Sign Tai Laing T..Myanmar Sign Tai Laing T
-        {0xaab0, 0xaab0},  // Tai Viet Mai Kang       ..Tai Viet Mai Kang
-        {0xaab2, 0xaab4},  // Tai Viet Vowel I        ..Tai Viet Vowel U
-        {0xaab7, 0xaab8},  // Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        {0xaabe, 0xaabf},  // Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        {0xaac1, 0xaac1},  // Tai Viet Tone Mai Tho   ..Tai Viet Tone Mai Tho
-        {0xaaec, 0xaaed},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        {0xaaf6, 0xaaf6},  // Meetei Mayek Virama     ..Meetei Mayek Virama
-        {0xabe5, 0xabe5},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        {0xabe8, 0xabe8},  // Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        {0xabed, 0xabed},  // Meetei Mayek Apun Iyek  ..Meetei Mayek Apun Iyek
-        {0xfb1e, 0xfb1e},  // Hebrew Point Judeo-spani..Hebrew Point Judeo-spani
-        {0xfe00, 0xfe0f},  // Variation Select||-1    ..Variation Select||-16
-        {0xfe20, 0xfe2f},  // Combining Ligature Left ..Combining Cyrillic Titlo
-        {0x101fd, 0x101fd},  // Phaistos Disc Sign Combi..Phaistos Disc Sign Combi
-        {0x102e0, 0x102e0},  // Coptic Epact Thousands M..Coptic Epact Thousands M
-        {0x10376, 0x1037a},  // Combining Old Permic Let..Combining Old Permic Let
-        {0x10a01, 0x10a03},  // Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        {0x10a05, 0x10a06},  // Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        {0x10a0c, 0x10a0f},  // Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        {0x10a38, 0x10a3a},  // Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        {0x10a3f, 0x10a3f},  // Kharoshthi Virama       ..Kharoshthi Virama
-        {0x10ae5, 0x10ae6},  // Manichaean Abbreviation ..Manichaean Abbreviation
-        {0x11001, 0x11001},  // Brahmi Sign Anusvara    ..Brahmi Sign Anusvara
-        {0x11038, 0x11046},  // Brahmi Vowel Sign Aa    ..Brahmi Virama
-        {0x1107f, 0x11081},  // Brahmi Number Joiner    ..Kaithi Sign Anusvara
-        {0x110b3, 0x110b6},  // Kaithi Vowel Sign U     ..Kaithi Vowel Sign Ai
-        {0x110b9, 0x110ba},  // Kaithi Sign Virama      ..Kaithi Sign Nukta
-        {0x11100, 0x11102},  // Chakma Sign Candrabindu ..Chakma Sign Visarga
-        {0x11127, 0x1112b},  // Chakma Vowel Sign A     ..Chakma Vowel Sign Uu
-        {0x1112d, 0x11134},  // Chakma Vowel Sign Ai    ..Chakma Maayyaa
-        {0x11173, 0x11173},  // Mahajani Sign Nukta     ..Mahajani Sign Nukta
-        {0x11180, 0x11181},  // Sharada Sign Candrabindu..Sharada Sign Anusvara
-        {0x111b6, 0x111be},  // Sharada Vowel Sign U    ..Sharada Vowel Sign O
-        {0x111ca, 0x111cc},  // Sharada Sign Nukta      ..Sharada Extra Sh||t Vowe
-        {0x1122f, 0x11231},  // Khojki Vowel Sign U     ..Khojki Vowel Sign Ai
-        {0x11234, 0x11234},  // Khojki Sign Anusvara    ..Khojki Sign Anusvara
-        {0x11236, 0x11237},  // Khojki Sign Nukta       ..Khojki Sign Shadda
-        {0x1123e, 0x1123e},  // (nil)                   ..
-        {0x112df, 0x112df},  // Khudawadi Sign Anusvara ..Khudawadi Sign Anusvara
-        {0x112e3, 0x112ea},  // Khudawadi Vowel Sign U  ..Khudawadi Sign Virama
-        {0x11300, 0x11301},  // Grantha Sign Combining A..Grantha Sign Candrabindu
-        {0x1133c, 0x1133c},  // Grantha Sign Nukta      ..Grantha Sign Nukta
-        {0x11340, 0x11340},  // Grantha Vowel Sign Ii   ..Grantha Vowel Sign Ii
-        {0x11366, 0x1136c},  // Combining Grantha Digit ..Combining Grantha Digit
-        {0x11370, 0x11374},  // Combining Grantha Letter..Combining Grantha Letter
-        {0x11438, 0x1143f},  // (nil)                   ..
-        {0x11442, 0x11444},  // (nil)                   ..
-        {0x11446, 0x11446},  // (nil)                   ..
-        {0x114b3, 0x114b8},  // Tirhuta Vowel Sign U    ..Tirhuta Vowel Sign Vocal
-        {0x114ba, 0x114ba},  // Tirhuta Vowel Sign Sh||t..Tirhuta Vowel Sign Sh||t
-        {0x114bf, 0x114c0},  // Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara
-        {0x114c2, 0x114c3},  // Tirhuta Sign Virama     ..Tirhuta Sign Nukta
-        {0x115b2, 0x115b5},  // Siddham Vowel Sign U    ..Siddham Vowel Sign Vocal
-        {0x115bc, 0x115bd},  // Siddham Sign Candrabindu..Siddham Sign Anusvara
-        {0x115bf, 0x115c0},  // Siddham Sign Virama     ..Siddham Sign Nukta
-        {0x115dc, 0x115dd},  // Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        {0x11633, 0x1163a},  // Modi Vowel Sign U       ..Modi Vowel Sign Ai
-        {0x1163d, 0x1163d},  // Modi Sign Anusvara      ..Modi Sign Anusvara
-        {0x1163f, 0x11640},  // Modi Sign Virama        ..Modi Sign Ardhacandra
-        {0x116ab, 0x116ab},  // Takri Sign Anusvara     ..Takri Sign Anusvara
-        {0x116ad, 0x116ad},  // Takri Vowel Sign Aa     ..Takri Vowel Sign Aa
-        {0x116b0, 0x116b5},  // Takri Vowel Sign U      ..Takri Vowel Sign Au
-        {0x116b7, 0x116b7},  // Takri Sign Nukta        ..Takri Sign Nukta
-        {0x1171d, 0x1171f},  // Ahom Consonant Sign Medi..Ahom Consonant Sign Medi
-        {0x11722, 0x11725},  // Ahom Vowel Sign I       ..Ahom Vowel Sign Uu
-        {0x11727, 0x1172b},  // Ahom Vowel Sign Aw      ..Ahom Sign Killer
-        {0x11c30, 0x11c36},  // (nil)                   ..
-        {0x11c38, 0x11c3d},  // (nil)                   ..
-        {0x11c3f, 0x11c3f},  // (nil)                   ..
-        {0x11c92, 0x11ca7},  // (nil)                   ..
-        {0x11caa, 0x11cb0},  // (nil)                   ..
-        {0x11cb2, 0x11cb3},  // (nil)                   ..
-        {0x11cb5, 0x11cb6},  // (nil)                   ..
-        {0x16af0, 0x16af4},  // Bassa Vah Combining High..Bassa Vah Combining High
-        {0x16b30, 0x16b36},  // Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        {0x16f8f, 0x16f92},  // Miao Tone Right         ..Miao Tone Below
-        {0x1bc9d, 0x1bc9e},  // Duployan Thick Letter Se..Duployan Double Mark
-        {0x1d167, 0x1d169},  // Musical Symbol Combining..Musical Symbol Combining
-        {0x1d17b, 0x1d182},  // Musical Symbol Combining..Musical Symbol Combining
-        {0x1d185, 0x1d18b},  // Musical Symbol Combining..Musical Symbol Combining
-        {0x1d1aa, 0x1d1ad},  // Musical Symbol Combining..Musical Symbol Combining
-        {0x1d242, 0x1d244},  // Combining Greek Musical ..Combining Greek Musical
-        {0x1da00, 0x1da36},  // Signwriting Head Rim    ..Signwriting Air Sucking
-        {0x1da3b, 0x1da6c},  // Signwriting Mouth Closed..Signwriting Excitement
-        {0x1da75, 0x1da75},  // Signwriting Upper Body T..Signwriting Upper Body T
-        {0x1da84, 0x1da84},  // Signwriting Location Hea..Signwriting Location Hea
-        {0x1da9b, 0x1da9f},  // Signwriting Fill Modifie..Signwriting Fill Modifie
-        {0x1daa1, 0x1daaf},  // Signwriting Rotation Mod..Signwriting Rotation Mod
-        {0x1e000, 0x1e006},  // (nil)                   ..
-        {0x1e008, 0x1e018},  // (nil)                   ..
-        {0x1e01b, 0x1e021},  // (nil)                   ..
-        {0x1e023, 0x1e024},  // (nil)                   ..
-        {0x1e026, 0x1e02a},  // (nil)                   ..
-        {0x1e8d0, 0x1e8d6},  // Mende Kikakui Combining ..Mende Kikakui Combining
-        {0x1e944, 0x1e94a},  // (nil)                   ..
-        {0xe0100, 0xe01ef},  // Variation Select||-17   ..Variation Select||-256
-    };
-
-    // https://github.com/jquast/wcwidth/blob/master/wcwidth/table_wide.py
-    // at commit 0d7de112202cc8b2ebe9232ff4a5c954f19d561a (2016-07-02):
-    private static final int[][] WIDE_EASTASIAN = {
-        {0x1100, 0x115f},  // Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        {0x231a, 0x231b},  // Watch                   ..Hourglass
-        {0x2329, 0x232a},  // Left-pointing Angle Brac..Right-pointing Angle Bra
-        {0x23e9, 0x23ec},  // Black Right-pointing Dou..Black Down-pointing Doub
-        {0x23f0, 0x23f0},  // Alarm Clock             ..Alarm Clock
-        {0x23f3, 0x23f3},  // Hourglass With Flowing S..Hourglass With Flowing S
-        {0x25fd, 0x25fe},  // White Medium Small Squar..Black Medium Small Squar
-        {0x2614, 0x2615},  // Umbrella With Rain Drops..Hot Beverage
-        {0x2648, 0x2653},  // Aries                   ..Pisces
-        {0x267f, 0x267f},  // Wheelchair Symbol       ..Wheelchair Symbol
-        {0x2693, 0x2693},  // Anch||                  ..Anch||
-        {0x26a1, 0x26a1},  // High Voltage Sign       ..High Voltage Sign
-        {0x26aa, 0x26ab},  // Medium White Circle     ..Medium Black Circle
-        {0x26bd, 0x26be},  // Soccer Ball             ..Baseball
-        {0x26c4, 0x26c5},  // Snowman Without Snow    ..Sun Behind Cloud
-        {0x26ce, 0x26ce},  // Ophiuchus               ..Ophiuchus
-        {0x26d4, 0x26d4},  // No Entry                ..No Entry
-        {0x26ea, 0x26ea},  // Church                  ..Church
-        {0x26f2, 0x26f3},  // Fountain                ..Flag In Hole
-        {0x26f5, 0x26f5},  // Sailboat                ..Sailboat
-        {0x26fa, 0x26fa},  // Tent                    ..Tent
-        {0x26fd, 0x26fd},  // Fuel Pump               ..Fuel Pump
-        {0x2705, 0x2705},  // White Heavy Check Mark  ..White Heavy Check Mark
-        {0x270a, 0x270b},  // Raised Fist             ..Raised Hand
-        {0x2728, 0x2728},  // Sparkles                ..Sparkles
-        {0x274c, 0x274c},  // Cross Mark              ..Cross Mark
-        {0x274e, 0x274e},  // Negative Squared Cross M..Negative Squared Cross M
-        {0x2753, 0x2755},  // Black Question Mark ||na..White Exclamation Mark O
-        {0x2757, 0x2757},  // Heavy Exclamation Mark S..Heavy Exclamation Mark S
-        {0x2795, 0x2797},  // Heavy Plus Sign         ..Heavy Division Sign
-        {0x27b0, 0x27b0},  // Curly Loop              ..Curly Loop
-        {0x27bf, 0x27bf},  // Double Curly Loop       ..Double Curly Loop
-        {0x2b1b, 0x2b1c},  // Black Large Square      ..White Large Square
-        {0x2b50, 0x2b50},  // White Medium Star       ..White Medium Star
-        {0x2b55, 0x2b55},  // Heavy Large Circle      ..Heavy Large Circle
-        {0x2e80, 0x2e99},  // Cjk Radical Repeat      ..Cjk Radical Rap
-        {0x2e9b, 0x2ef3},  // Cjk Radical Choke       ..Cjk Radical C-simplified
-        {0x2f00, 0x2fd5},  // Kangxi Radical One      ..Kangxi Radical Flute
-        {0x2ff0, 0x2ffb},  // Ideographic Description ..Ideographic Description
-        {0x3000, 0x303e},  // Ideographic Space       ..Ideographic Variation In
-        {0x3041, 0x3096},  // Hiragana Letter Small A ..Hiragana Letter Small Ke
-        {0x3099, 0x30ff},  // Combining Katakana-hirag..Katakana Digraph Koto
-        {0x3105, 0x312d},  // Bopomofo Letter B       ..Bopomofo Letter Ih
-        {0x3131, 0x318e},  // Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        {0x3190, 0x31ba},  // Ideographic Annotation L..Bopomofo Letter Zy
-        {0x31c0, 0x31e3},  // Cjk Stroke T            ..Cjk Stroke Q
-        {0x31f0, 0x321e},  // Katakana Letter Small Ku..Parenthesized K||ean Cha
-        {0x3220, 0x3247},  // Parenthesized Ideograph ..Circled Ideograph Koto
-        {0x3250, 0x32fe},  // Partnership Sign        ..Circled Katakana Wo
-        {0x3300, 0x4dbf},  // Square Apaato           ..
-        {0x4e00, 0xa48c},  // Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        {0xa490, 0xa4c6},  // Yi Radical Qot          ..Yi Radical Ke
-        {0xa960, 0xa97c},  // Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        {0xac00, 0xd7a3},  // Hangul Syllable Ga      ..Hangul Syllable Hih
-        {0xf900, 0xfaff},  // Cjk Compatibility Ideogr..
-        {0xfe10, 0xfe19},  // Presentation F||m F|| Ve..Presentation F||m F|| Ve
-        {0xfe30, 0xfe52},  // Presentation F||m F|| Ve..Small Full Stop
-        {0xfe54, 0xfe66},  // Small Semicolon         ..Small Equals Sign
-        {0xfe68, 0xfe6b},  // Small Reverse Solidus   ..Small Commercial At
-        {0xff01, 0xff60},  // Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        {0xffe0, 0xffe6},  // Fullwidth Cent Sign     ..Fullwidth Won Sign
-        {0x16fe0, 0x16fe0},  // (nil)                   ..
-        {0x17000, 0x187ec},  // (nil)                   ..
-        {0x18800, 0x18af2},  // (nil)                   ..
-        {0x1b000, 0x1b001},  // Katakana Letter Archaic ..Hiragana Letter Archaic
-        {0x1f004, 0x1f004},  // Mahjong Tile Red Dragon ..Mahjong Tile Red Dragon
-        {0x1f0cf, 0x1f0cf},  // Playing Card Black Joker..Playing Card Black Joker
-        {0x1f18e, 0x1f18e},  // Negative Squared Ab     ..Negative Squared Ab
-        {0x1f191, 0x1f19a},  // Squared Cl              ..Squared Vs
-        {0x1f200, 0x1f202},  // Square Hiragana Hoka    ..Squared Katakana Sa
-        {0x1f210, 0x1f23b},  // Squared Cjk Unified Ideo..
-        {0x1f240, 0x1f248},  // T||toise Shell Bracketed..T||toise Shell Bracketed
-        {0x1f250, 0x1f251},  // Circled Ideograph Advant..Circled Ideograph Accept
-        {0x1f300, 0x1f320},  // Cyclone                 ..Shooting Star
-        {0x1f32d, 0x1f335},  // Hot Dog                 ..Cactus
-        {0x1f337, 0x1f37c},  // Tulip                   ..Baby Bottle
-        {0x1f37e, 0x1f393},  // Bottle With Popping C||k..Graduation Cap
-        {0x1f3a0, 0x1f3ca},  // Carousel H||se          ..Swimmer
-        {0x1f3cf, 0x1f3d3},  // Cricket Bat And Ball    ..Table Tennis Paddle And
-        {0x1f3e0, 0x1f3f0},  // House Building          ..European Castle
-        {0x1f3f4, 0x1f3f4},  // Waving Black Flag       ..Waving Black Flag
-        {0x1f3f8, 0x1f43e},  // Badminton Racquet And Sh..Paw Prints
-        {0x1f440, 0x1f440},  // Eyes                    ..Eyes
-        {0x1f442, 0x1f4fc},  // Ear                     ..Videocassette
-        {0x1f4ff, 0x1f53d},  // Prayer Beads            ..Down-pointing Small Red
-        {0x1f54b, 0x1f54e},  // Kaaba                   ..Men||ah With Nine Branch
-        {0x1f550, 0x1f567},  // Clock Face One Oclock   ..Clock Face Twelve-thirty
-        {0x1f57a, 0x1f57a},  // (nil)                   ..
-        {0x1f595, 0x1f596},  // Reversed Hand With Middl..Raised Hand With Part Be
-        {0x1f5a4, 0x1f5a4},  // (nil)                   ..
-        {0x1f5fb, 0x1f64f},  // Mount Fuji              ..Person With Folded Hands
-        {0x1f680, 0x1f6c5},  // Rocket                  ..Left Luggage
-        {0x1f6cc, 0x1f6cc},  // Sleeping Accommodation  ..Sleeping Accommodation
-        {0x1f6d0, 0x1f6d2},  // Place Of W||ship        ..
-        {0x1f6eb, 0x1f6ec},  // Airplane Departure      ..Airplane Arriving
-        {0x1f6f4, 0x1f6f6},  // (nil)                   ..
-        {0x1f910, 0x1f91e},  // Zipper-mouth Face       ..
-        {0x1f920, 0x1f927},  // (nil)                   ..
-        {0x1f930, 0x1f930},  // (nil)                   ..
-        {0x1f933, 0x1f93e},  // (nil)                   ..
-        {0x1f940, 0x1f94b},  // (nil)                   ..
-        {0x1f950, 0x1f95e},  // (nil)                   ..
-        {0x1f980, 0x1f991},  // Crab                    ..
-        {0x1f9c0, 0x1f9c0},  // Cheese Wedge            ..Cheese Wedge
-        {0x20000, 0x2fffd},  // Cjk Unified Ideograph-20..
-        {0x30000, 0x3fffd},  // (nil)                   ..
-    };
-
-
-    private static boolean intable(int[][] table, int c) {
-        // First quick check f|| Latin1 etc. characters.
-        if (c < table[0][0]) return false;
-
-        // Binary search in table.
-        int bot = 0;
-        int top = table.length - 1; // (int)(size / sizeof(struct interval) - 1);
-        while (top >= bot) {
-            int mid = (bot + top) / 2;
-            if (table[mid][1] < c) {
-                bot = mid + 1;
-            } else if (table[mid][0] > c) {
-                top = mid - 1;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /** Return the terminal display width of a code point: 0, 1 || 2. */
-    public static int width(int ucs) {
-        if (ucs == 0 ||
-            ucs == 0x034F ||
-            (0x200B <= ucs && ucs <= 0x200F) ||
-            ucs == 0x2028 ||
-            ucs == 0x2029 ||
-            (0x202A <= ucs && ucs <= 0x202E) ||
-            (0x2060 <= ucs && ucs <= 0x2063)) {
-            return 0;
-        }
-
-        // C0/C1 control characters
-        // Termux change: Return 0 instead of -1.
-        if (ucs < 32 || (0x07F <= ucs && ucs < 0x0A0)) return 0;
-
-        // combining characters with zero width
-        if (intable(ZERO_WIDTH, ucs)) return 0;
-
-        return intable(WIDE_EASTASIAN, ucs) ? 2 : 1;
-    }
-
-    /** The width at an index position in a java char array. */
-    public static int width(char[] chars, int index) {
-        char c = chars[index];
-        return Character.isHighSurrogate(c) ? width(Character.toCodePoint(c, chars[index + 1])) : width(c);
-    }
-
-}

app/src/main/java/com/termux/view/TerminalView.java

@@ -1,906 +0,0 @@
-package com.termux.view;
-
-import android.annotation.SuppressLint;
-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;
-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 {
-
-    /** Log view key and IME events. */
-    private static final boolean LOG_KEY_EVENTS = false;
-
-    /** The currently displayed terminal session, whose emulator is {@link #mEmulator}. */
-    TerminalSession mTermSession;
-    /** Our terminal emulator whose session is {@link #mTermSession}. */
-    TerminalEmulator mEmulator;
-
-    TerminalRenderer mRenderer;
-
-    TerminalKeyListener mOnKeyListener;
-
-    /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
-    int mTopRow;
-
-    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;
-
-    /** Keep track of where mouse touch event started which we report as mouse scroll. */
-    private int mMouseScrollStartX = -1, mMouseScrollStartY = -1;
-    /** Keep track of the time when a touch event leading to sending mouse scroll events started. */
-    private long mMouseStartDownTime = -1;
-
-    final Scroller mScroller;
-
-    /** What was left in from scrolling movement. */
-    float mScrollRemainder;
-
-    /** If non-zero, this is the last unicode code point received if that was a combining character. */
-    int mCombiningAccent;
-
-    public TerminalView(Context context, AttributeSet attributes) { // NO_UCD (unused code)
-        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() && !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)) {
-                        mOnKeyListener.onSingleTapUp(e);
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            @Override
-            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(e, TerminalEmulator.MOUSE_LEFT_BUTTON_MOVED, true);
-                } else {
-                    scrolledWithFinger = true;
-                    distanceY += mScrollRemainder;
-                    int deltaRows = (int) (distanceY / mRenderer.mFontLineSpacing);
-                    mScrollRemainder = distanceY - deltaRows * mRenderer.mFontLineSpacing;
-                    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;
-            }
-
-            @Override
-            public boolean onFling(final MotionEvent e2, float velocityX, float velocityY) {
-                if (mEmulator == null || mIsSelectingText) return true;
-                // Do not start scrolling until last fling has been taken care of:
-                if (!mScroller.isFinished()) return true;
-
-                final boolean mouseTrackingAtStartOfFling = mEmulator.isMouseTrackingActive();
-                float SCALE = 0.25f;
-                if (mouseTrackingAtStartOfFling) {
-                    mScroller.fling(0, 0, 0, -(int) (velocityY * SCALE), 0, 0, -mEmulator.mRows / 2, mEmulator.mRows / 2);
-                } else {
-                    mScroller.fling(0, mTopRow, 0, -(int) (velocityY * SCALE), 0, 0, -mEmulator.getScreen().getActiveTranscriptRows(), 0);
-                }
-
-                post(new Runnable() {
-                    private int mLastY = 0;
-
-                    @Override
-                    public void run() {
-                        if (mouseTrackingAtStartOfFling != mEmulator.isMouseTrackingActive()) {
-                            mScroller.abortAnimation();
-                            return;
-                        }
-                        if (mScroller.isFinished()) return;
-                        boolean more = mScroller.computeScrollOffset();
-                        int newY = mScroller.getCurrY();
-                        int diff = mouseTrackingAtStartOfFling ? (newY - mLastY) : (newY - mTopRow);
-                        doScroll(e2, diff);
-                        mLastY = newY;
-                        if (more) post(this);
-                    }
-                });
-
-                return true;
-            }
-
-            @Override
-            public boolean onDown(float x, float y) {
-                return false;
-            }
-
-            @Override
-            public boolean onDoubleTap(MotionEvent e) {
-                // Do not treat is as a single confirmed tap - it may be followed by zoom.
-                return false;
-            }
-
-            @Override
-            public void onLongPress(MotionEvent e) {
-                if (!mGestureRecognizer.isInProgress() && !mIsSelectingText) {
-                    performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                    toggleSelectingText(e);
-                }
-            }
-        });
-        mScroller = new Scroller(context);
-    }
-
-    /**
-     * @param onKeyListener Listener for all kinds of key events, both hardware and IME (which makes it different from that
-     *                      available with {@link View#setOnKeyListener(OnKeyListener)}.
-     */
-    public void setOnKeyListener(TerminalKeyListener onKeyListener) {
-        this.mOnKeyListener = onKeyListener;
-    }
-
-    /**
-     * Attach a {@link TerminalSession} to this view.
-     *
-     * @param session The {@link TerminalSession} this view will be displaying.
-     */
-    public boolean attachSession(TerminalSession session) {
-        if (session == mTermSession) return false;
-        mTopRow = 0;
-
-        mTermSession = session;
-        mEmulator = null;
-        mCombiningAccent = 0;
-
-        updateSize();
-
-        // Wait with enabling the scrollbar until we have a terminal to get scroll position from.
-        setVerticalScrollBarEnabled(true);
-
-        return true;
-    }
-
-    @Override
-    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        // Using InputType.NULL is the most correct input type and avoids issues with other hacks.
-        //
-        // Previous keyboard issues:
-        // https://github.com/termux/termux-packages/issues/25
-        // https://github.com/termux/termux-app/issues/87.
-        // https://github.com/termux/termux-app/issues/126 for breakage from that.
-        outAttrs.inputType = InputType.TYPE_NULL;
-
-        // 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 finishComposingText() {
-                if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "IME: finishComposingText()");
-                commitText(getEditable(), 0);
-
-                // Clear the editable.
-                getEditable().clear();
-
-                return true;
-            }
-
-            @Override
-            public boolean commitText(CharSequence text, int 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++) {
-                    char firstChar = text.charAt(i);
-                    int codePoint;
-                    if (Character.isHighSurrogate(firstChar)) {
-                        if (++i < textLengthInChars) {
-                            codePoint = Character.toCodePoint(firstChar, text.charAt(i));
-                        } else {
-                            // At end of string, with no low surrogate following the high:
-                            codePoint = TerminalEmulator.UNICODE_REPLACEMENT_CHAR;
-                        }
-                    } else {
-                        codePoint = firstChar;
-                    }
-
-                    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 leftLength=2 it may be due to a UTF-16 surrogate pair. So we cannot send
-                // multiple key events for that. Let's just hope that keyboards don't use
-                // leftLength > 1 for other purposes (such as holding down backspace for repeat).
-                sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
-                return true;
-            }
-
-            @Override
-            public boolean setComposingText(CharSequence text, int newCursorPosition) {
-                if (LOG_KEY_EVENTS)
-                    Log.i(EmulatorDebug.LOG_TAG, "IME: setComposingText(\"" + text  + "\", " + 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;
-            }
-        };
-    }
-
-    @Override
-    protected int computeVerticalScrollRange() {
-        return mEmulator == null ? 1 : mEmulator.getScreen().getActiveRows();
-    }
-
-    @Override
-    protected int computeVerticalScrollExtent() {
-        return mEmulator == null ? 1 : mEmulator.mRows;
-    }
-
-    @Override
-    protected int computeVerticalScrollOffset() {
-        return mEmulator == null ? 1 : mEmulator.getScreen().getActiveRows() + mTopRow - mEmulator.mRows;
-    }
-
-    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;
-            }
-        }
-
-        if (!skipScrolling && mTopRow != 0) {
-            // Scroll down if not already there.
-            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();
-    }
-
-    /**
-     * Sets the text size, which in turn sets the number of rows and columns.
-     *
-     * @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;
-    }
-
-    @Override
-    public boolean isOpaque() {
-        return true;
-    }
-
-    /** Send a single mouse event code to the terminal. */
-    void sendMouseEventCode(MotionEvent e, int button, boolean pressed) {
-        int x = (int) (e.getX() / mRenderer.mFontWidth) + 1;
-        int y = (int) ((e.getY() - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing) + 1;
-        if (pressed && (button == TerminalEmulator.MOUSE_WHEELDOWN_BUTTON || button == TerminalEmulator.MOUSE_WHEELUP_BUTTON)) {
-            if (mMouseStartDownTime == e.getDownTime()) {
-                x = mMouseScrollStartX;
-                y = mMouseScrollStartY;
-            } else {
-                mMouseStartDownTime = e.getDownTime();
-                mMouseScrollStartX = x;
-                mMouseScrollStartY = y;
-            }
-        }
-        mEmulator.sendMouseEvent(button, x, y, pressed);
-    }
-
-    /** Perform a scroll, either from dragging the screen or by scrolling a mouse wheel. */
-    void doScroll(MotionEvent event, int rowsDown) {
-        boolean up = rowsDown < 0;
-        int amount = Math.abs(rowsDown);
-        for (int i = 0; i < amount; i++) {
-            if (mEmulator.isMouseTrackingActive()) {
-                sendMouseEventCode(event, up ? TerminalEmulator.MOUSE_WHEELUP_BUTTON : TerminalEmulator.MOUSE_WHEELDOWN_BUTTON, true);
-            } else if (mEmulator.isAlternateBufferActive()) {
-                // Send up and down key events for scrolling, which is what some terminals do to make scroll work in
-                // e.g. less, which shifts to the alt screen without mouse handling.
-                handleKeyCode(up ? KeyEvent.KEYCODE_DPAD_UP : KeyEvent.KEYCODE_DPAD_DOWN, 0);
-            } else {
-                mTopRow = Math.min(0, Math.max(-(mEmulator.getScreen().getActiveTranscriptRows()), mTopRow + (up ? -1 : 1)));
-                if (!awakenScrollBars()) invalidate();
-            }
-        }
-    }
-
-    /** Overriding {@link View#onGenericMotionEvent(MotionEvent)}. */
-    @Override
-    public boolean onGenericMotionEvent(MotionEvent event) {
-        if (mEmulator != null && event.isFromSource(InputDevice.SOURCE_MOUSE) && event.getAction() == MotionEvent.ACTION_SCROLL) {
-            // Handle mouse wheel scrolling.
-            boolean up = event.getAxisValue(MotionEvent.AXIS_VSCROLL) > 0.0f;
-            doScroll(event, up ? -3 : 3);
-            return true;
-        }
-        return false;
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    @TargetApi(23)
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (mEmulator == null) return true;
-        final int action = ev.getAction();
-
-        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 (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 (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;
-    }
-
-    @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_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);
-                    case KeyEvent.ACTION_UP:
-                        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 (mEmulator == null) return true;
-
-        if (mOnKeyListener.onKeyDown(keyCode, event, mTermSession)) {
-            invalidate();
-            return true;
-        } 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;
-        if (event.isShiftPressed()) keyMod |= KeyHandler.KEYMOD_SHIFT;
-        if (handleKeyCode(keyCode, keyMod)) {
-            if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "handleKeyCode() took key event");
-            return true;
-        }
-
-        // Clear Ctrl since we handle that ourselves:
-        int bitsToClear = KeyEvent.META_CTRL_MASK;
-        if (rightAltDownFromEvent) {
-            // Let right Alt/Alt Gr be used to compose characters.
-        } else {
-            // Use left alt to send to terminal (e.g. Left Alt+B to jump back a word), so remove:
-            bitsToClear |= KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON;
-        }
-        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 (result == 0) {
-            return true;
-        }
-
-        int oldCombiningAccent = mCombiningAccent;
-        if ((result & KeyCharacterMap.COMBINING_ACCENT) != 0) {
-            // If entered combining accent previously, write it out:
-            if (mCombiningAccent != 0)
-                inputCodePoint(mCombiningAccent, controlDownFromEvent, leftAltDownFromEvent);
-            mCombiningAccent = result & KeyCharacterMap.COMBINING_ACCENT_MASK;
-        } else {
-            if (mCombiningAccent != 0) {
-                int combinedChar = KeyCharacterMap.getDeadChar(mCombiningAccent, result);
-                if (combinedChar > 0) result = combinedChar;
-                mCombiningAccent = 0;
-            }
-            inputCodePoint(result, controlDownFromEvent, leftAltDownFromEvent);
-        }
-
-        if (mCombiningAccent != oldCombiningAccent) invalidate();
-
-        return true;
-    }
-
-    void inputCodePoint(int codePoint, boolean controlDownFromEvent, boolean leftAltDownFromEvent) {
-        if (LOG_KEY_EVENTS) {
-            Log.i(EmulatorDebug.LOG_TAG, "inputCodePoint(codePoint=" + codePoint + ", controlDownFromEvent=" + controlDownFromEvent + ", leftAltDownFromEvent="
-                + leftAltDownFromEvent + ")");
-        }
-
-        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') {
-                codePoint = codePoint - 'A' + 1;
-            } else if (codePoint == ' ' || codePoint == '2') {
-                codePoint = 0;
-            } else if (codePoint == '[' || codePoint == '3') {
-                codePoint = 27; // ^[ (Esc)
-            } else if (codePoint == '\\' || codePoint == '4') {
-                codePoint = 28;
-            } else if (codePoint == ']' || codePoint == '5') {
-                codePoint = 29;
-            } else if (codePoint == '^' || codePoint == '6') {
-                codePoint = 30; // control-^
-            } 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
-            }
-        }
-
-        if (codePoint > -1) {
-            // 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(altDown, codePoint);
-        }
-    }
-
-    /** Input the specified keyCode if applicable and return if the input was consumed. */
-    public boolean handleKeyCode(int keyCode, int keyMod) {
-        TerminalEmulator term = mTermSession.getEmulator();
-        String code = KeyHandler.getCode(keyCode, keyMod, term.isCursorKeysApplicationMode(), term.isKeypadApplicationMode());
-        if (code == null) return false;
-        mTermSession.write(code);
-        return true;
-    }
-
-    /**
-     * 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.
-     * @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 (mEmulator == null) return true;
-
-        if (mOnKeyListener.onKeyUp(keyCode, event)) {
-            invalidate();
-            return true;
-        } else if (event.isSystem()) {
-            // Let system key events through.
-            return super.onKeyUp(keyCode, event);
-        }
-
-        return true;
-    }
-
-    /**
-     * 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.
-     */
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        updateSize();
-    }
-
-    /** Check if the terminal size in rows and columns should be updated. */
-    public void updateSize() {
-        int viewWidth = getWidth();
-        int viewHeight = getHeight();
-        if (viewWidth == 0 || viewHeight == 0 || mTermSession == null) return;
-
-        // Set to 80 and 24 if you want to enable vttest.
-        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);
-            mEmulator = mTermSession.getEmulator();
-
-            mTopRow = 0;
-            scrollTo(0, 0);
-            invalidate();
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (mEmulator == null) {
-            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. */
-    @TargetApi(23)
-    public void toggleSelectingText(MotionEvent ev) {
-        mIsSelectingText = !mIsSelectingText;
-        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() {
-        return mTermSession;
-    }
-
-}

app/src/main/res/drawable-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/black"/>
+    <foreground android:drawable="@drawable/ic_foreground"/>
+</adaptive-icon>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="#E0E0E0" />
-</shape>
+</shape>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#212325" />
+</shape>

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

@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <!-- Keep in sync with non-adaptive ic_launcher.xml -->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M34,38
+                          h6
+                          l12,16
+                          l-12,16
+                          h-6
+                          l12,-16
+                          "
+        />
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M56,66
+                          h18
+                          v4
+                          h-18
+                          "
+        />
+
+</vector>

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

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M18,54
+                          A36,36 0 1,1 90,54
+                          A36,36 0 1,1 18,54 Z" />
+
+    <!-- Keep in sync with adaptive ic_foreground.xml: -->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M34,38
+                          h6
+                          l12,16
+                          l-12,16
+                          h-6
+                          l12,-16
+                          "
+        />
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M56,66
+                          h18
+                          v4
+                          h-18
+                          "
+        />
+
+</vector>

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

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M 12, 12
+                          m -10.5, 0
+                          a 10.5,10.5 0 1,0 21,0
+                          a 10.5,10.5 0 1,0 -21,0"/>
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+</vector>

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

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <!--
+        Updated notification icon compliant with system icons guidelines
+        https://material.io/design/iconography/system-icons.html
+    -->
+
+    <group>
+        <clip-path
+            android:pathData="M0,0h24v24h-24z"/>
+
+        <path
+            android:pathData="M5,4H2L8,12L2,20H5L11,12L5,4Z"
+            android:fillColor="#ffffff"/>
+
+        <path
+            android:pathData="M13,18H22V20H13V18Z"
+            android:fillColor="#ffffff"/>
+
+    </group>
+</vector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:drawable="@drawable/current_session_black"/>
+    <item android:state_activated="false" android:drawable="@drawable/session_ripple_black"/>
+</selector>

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

@@ -4,4 +4,4 @@
     <item>
         <color android:color="@android:color/white" />
     </item>
-</ripple>
+</ripple>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@android:color/darker_gray" >
+    <item>
+        <color android:color="@android:color/background_dark" />
+    </item>
+</ripple>

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

@@ -1,4 +0,0 @@
-<?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" />

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

@@ -1,4 +0,0 @@
-<?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" />

app/src/main/res/layout/drawer_layout.xml

@@ -1,9 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_alignParentTop="true"
@@ -14,9 +15,13 @@
             android:id="@+id/terminal_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginRight="3dp"
+            android:layout_marginLeft="3dp"
             android:focusableInTouchMode="true"
             android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"
+            android:importantForAutofill="no"
+            android:autofillHints="password" />
 
         <LinearLayout
             android:id="@+id/left_drawer"
@@ -63,13 +68,13 @@
             </LinearLayout>
         </LinearLayout>
 
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:visibility="gone"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="37.5dp"
         android:background="@android:drawable/screen_background_dark_transparent"
         android:layout_alignParentBottom="true" />
 </RelativeLayout>

app/src/main/res/layout/extra_keys_right.xml

@@ -7,8 +7,8 @@
     android:imeOptions="actionSend|flagNoFullscreen"
     android:maxLines="1"
     android:inputType="text"
-    android:singleLine="true"
     android:textColor="@android:color/white"
+    android:textColorHighlight="@android:color/darker_gray"
     android:paddingTop="0dp"
     android:textCursorDrawable="@null"
     android:paddingBottom="0dp"

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

@@ -1,60 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-   <string name="application_name">Termux</string>
-   <string name="shared_user_label">Termux user</string>
-   <string name="new_session">New session</string>
-   <string name="new_session_failsafe">Failsafe</string>
-   <string name="toggle_soft_keyboard">Keyboard</string>
-   <string name="reset_terminal">Reset</string>
-   <string name="style_terminal">Style</string>
-   <string name="toggle_fullscreen">Fullscreen</string>
-   <string name="share_transcript_title">Terminal transcript</string>
-   <string name="help">Help</string>
+    <string name="application_name">Termux</string>
+    <string name="shared_user_label">Termux user</string>
+    <string name="run_command_permission_label">Run commands in Termux environment</string>
+    <string name="run_command_permission_description">execute arbitrary commands within Termux environment</string>
+    <string name="new_session">New session</string>
+    <string name="new_session_failsafe">Failsafe</string>
+    <string name="toggle_soft_keyboard">Keyboard</string>
+    <string name="reset_terminal">Reset</string>
+    <string name="style_terminal">Style</string>
+    <string name="share_transcript_title">Terminal transcript</string>
+    <string name="help">Help</string>
+    <string name="toggle_keep_screen_on">Keep screen on</string>
+    <string name="autofill_password">Autofill password</string>
 
-   <string name="welcome_dialog_title">Welcome to Termux</string>
-   <string name="welcome_dialog_body">Long press and select <i>More…</i> to show a menu where <i>Help</i> is available.\n\nExecute <b>apt update</b> to update the packages list before installing packages.</string>
-   <string name="welcome_dialog_dont_show_again_button">Do not show again</string>
+    <string name="bootstrap_installer_body">Installing…</string>
+    <string name="bootstrap_error_title">Unable to install</string>
+    <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.</string>
+    <string name="bootstrap_error_abort">Abort</string>
+    <string name="bootstrap_error_try_again">Try again</string>
+    <string name="bootstrap_error_not_primary_user_message">Termux can only be installed on the primary user account.</string>
 
-   <string name="bootstrap_installer_body">Installing…</string>
-   <string name="bootstrap_error_title">Unable to install</string>
-   <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.\n\nCheck your network connection and try again.</string>
-   <string name="bootstrap_error_abort">Abort</string>
-   <string name="bootstrap_error_try_again">Try again</string>
-   <string name="bootstrap_error_not_primary_user_message">Termux can only be installed on the primary user account.</string>
+    <string name="max_terminals_reached_title">Max terminals reached</string>
+    <string name="max_terminals_reached_message">Close down existing ones before creating new.</string>
 
-   <string name="max_terminals_reached_title">Max terminals reached</string>
-   <string name="max_terminals_reached_message">Close down existing ones before creating new.</string>
+    <string name="reset_toast_notification">Terminal reset.</string>
 
-   <string name="reset_toast_notification">Terminal reset.</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">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="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">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="kill_process">Kill process (%d)</string>
+    <string name="confirm_kill_process">Really kill this session?</string>
 
-  <string name="paste_text">Paste</string>
-  <string name="copy_text">Copy</string>
-  <string name="text_selection_more">More…</string>
+    <string name="session_rename_title">Set session name</string>
+    <string name="session_rename_positive_button">Set</string>
+    <string name="session_new_named_title">New named session</string>
+    <string name="session_new_named_positive_button">Create</string>
 
-  <string name="kill_process">Kill process (%d)</string>
-  <string name="confirm_kill_process">Really kill this session?</string>
+    <string name="styling_not_installed">The Termux:Style add-on is not installed.</string>
+    <string name="styling_install">Install</string>
 
-  <string name="session_rename_title">Set session name</string>
-  <string name="session_rename_positive_button">Set</string>
-  <string name="session_new_named_title">New named session</string>
-  <string name="session_new_named_positive_button">Create</string>
-
-  <string name="styling_not_installed">The Termux:Style add-on is not installed.</string>
-  <string name="styling_install">Install</string>
-
-  <string name="notification_action_exit">Exit</string>
-  <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>
+    <string name="notification_action_exit">Exit</string>
+    <string name="notification_action_wake_lock">Acquire wakelock</string>
+    <string name="notification_action_wake_unlock">Release wakelock</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>

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- See https://developer.android.com/training/material/theme.html for how to customize the Material theme. -->
-    <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
     <style name="Theme.Termux" parent="@android:style/Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">#000000</item>
+        <item name="android:colorPrimary">#FF000000</item>
         <item name="android:windowBackground">@android:color/black</item>
 
         <!-- Seen in buttons on left drawer: -->
@@ -13,11 +12,38 @@
         <!-- Avoid action mode toolbar pushing down terminal content when
              selecting text on pre-6.0 (non-floating toolbar). -->
         <item name="android:windowActionModeOverlay">true</item>
+
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+
+        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
     </style>
 
-	<style name="TermuxAlertDialogStyle" parent="@android:style/Theme.Material.Light.Dialog.Alert">
-	    <!-- Seen in buttons on alert dialog: -->
+    <style name="TermuxAlertDialogStyle" parent="@android:style/Theme.Material.Light.Dialog.Alert">
+        <!-- Seen in buttons on alert dialog: -->
         <item name="android:colorAccent">#212121</item>
     </style>
 
+    <!-- See https://developer.android.com/training/material/theme.html for how to customize the Material theme. -->
+    <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
+    <style name="Theme.Termux.Black" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:statusBarColor">#000000</item>
+        <item name="android:colorPrimary">#FF000000</item>
+        <item name="android:windowBackground">@android:color/black</item>
+
+        <!-- Seen in buttons on left drawer: -->
+        <item name="android:colorAccent">#FDFDFD</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>
+
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+
+        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+    </style>
 </resources>

app/src/main/res/xml/backupscheme.xml

@@ -1,5 +0,0 @@
-<?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>

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

@@ -0,0 +1,30 @@
+<shortcuts xmlns:tools="http://schemas.android.com/tools"
+           xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:shortcutId="new_session"
+        android:enabled="true"
+        android:icon="@drawable/ic_new_session"
+        android:shortcutShortLabel="@string/new_session"
+        tools:targetApi="n_mr1">
+        <intent
+            android:action="android.intent.action.RUN"
+            android:targetPackage="com.termux"
+            android:targetClass="com.termux.app.TermuxActivity"/>
+    </shortcut>
+
+    <shortcut
+        android:shortcutId="new_failsafe_session"
+        android:enabled="true"
+        android:icon="@drawable/ic_new_session"
+        android:shortcutShortLabel="@string/new_session_failsafe"
+        tools:targetApi="n_mr1">
+        <intent
+            android:action="android.intent.action.RUN"
+            android:targetPackage="com.termux"
+            android:targetClass="com.termux.app.TermuxActivity">
+            <extra android:name="com.termux.app.failsafe_session" android:value="true" />
+        </intent>
+    </shortcut>
+
+</shortcuts>

app/src/test/java/com/termux/app/TermuxActivityTest.java

@@ -1,25 +1,30 @@
 package com.termux.app;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
 
-public class TermuxActivityTest extends TestCase {
+public class TermuxActivityTest {
 
-	private void assertUrlsAre(String text, String... urls) {
-		LinkedHashSet<String> expected = new LinkedHashSet<>();
-		Collections.addAll(expected, urls);
-		assertEquals(expected, TermuxActivity.extractUrls(text));
-	}
+    private void assertUrlsAre(String text, String... urls) {
+        LinkedHashSet<String> expected = new LinkedHashSet<>();
+        Collections.addAll(expected, urls);
+        Assert.assertEquals(expected, TermuxActivity.extractUrls(text));
+    }
 
-	public void testExtractUrls() {
-		assertUrlsAre("hello http://example.com world", "http://example.com");
+    @Test
+    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("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");
-	}
+        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");
+
+        assertUrlsAre("hello https://example.com/#bar https://example.com/foo#bar",
+            "https://example.com/#bar", "https://example.com/foo#bar");
+    }
 
 }

app/src/test/java/com/termux/filepicker/TermuxFileReceiverActivityTest.java

@@ -0,0 +1,32 @@
+package com.termux.filepicker;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class TermuxFileReceiverActivityTest {
+
+    @Test
+    public void testIsSharedTextAnUrl() {
+        List<String> validUrls = new ArrayList<>();
+        validUrls.add("http://example.com");
+        validUrls.add("https://example.com");
+        validUrls.add("https://example.com/path/parameter=foo");
+        validUrls.add("magnet:?xt=urn:btih:d540fc48eb12f2833163eed6421d449dd8f1ce1f&dn=Ubuntu+desktop+19.04+%2864bit%29&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80&tr=udp%3A%2F%2Ftracker.ccc.de%3A80");
+        for (String url : validUrls) {
+            Assert.assertTrue(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
+        }
+
+        List<String> invalidUrls = new ArrayList<>();
+        invalidUrls.add("a test with example.com");
+        for (String url : invalidUrls) {
+            Assert.assertFalse(TermuxFileReceiverActivity.isSharedTextAnUrl(url));
+        }
+    }
+
+}

app/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java

@@ -1,32 +0,0 @@
-package com.termux.terminal;
-
-/** "\033[" is the Control Sequence Introducer char sequence (CSI). */
-public class ControlSequenceIntroducerTest extends TerminalTestCase {
-
-	/** CSI Ps P Scroll down Ps lines (default = 1) (SD). */
-	public void testCsiT() {
-		withTerminalSized(4, 6).enterString("1\r\n2\r\n3\r\nhi\033[2Tyo\r\nA\r\nB").assertLinesAre("    ", "    ", "1   ", "2 yo", "A   ",
-				"Bi  ");
-		// Default value (1):
-		withTerminalSized(4, 6).enterString("1\r\n2\r\n3\r\nhi\033[Tyo\r\nA\r\nB").assertLinesAre("    ", "1   ", "2   ", "3 yo", "Ai  ",
-				"B   ");
-	}
-
-	/** CSI Ps S Scroll up Ps lines (default = 1) (SU). */
-	public void testCsiS() {
-		// The behaviour here is a bit inconsistent between terminals - this is how the OS X Terminal.app does it:
-		withTerminalSized(3, 4).enterString("1\r\n2\r\n3\r\nhi\033[2Sy").assertLinesAre("3  ", "hi ", "   ", "  y");
-		// Default value (1):
-		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      ", "             ");
-	}
-
-}

art/copy-to-other-apps.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e -u
+
+for APP in api boot styling tasker widget; do
+	APPDIR=../../termux-$APP
+	for file in ic_foreground ic_launcher; do
+		cp ../app/src/main/res/drawable/$file.xml \
+			$APPDIR/app/src/main/res/drawable/$file.xml
+	done
+
+	cp ../app/src/main/res/drawable-anydpi-v26/ic_launcher.xml \
+		$APPDIR/app/src/main/res/drawable-anydpi-v26/$file.xml
+done

art/feature-graphic.svg

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

art/generate-big-icon.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e -u
+
+echo "Generating ~/termux-icons/ic_launcher.png..."
+mkdir -p ~/termux-icons/
+
+vector2svg ../app/src/main/res/drawable/ic_launcher.xml ~/termux-icons/ic_launcher.svg
+
+sed -i "" 's/viewBox="0 0 108 108"/viewBox="18 18 72 72"/' ~/termux-icons/ic_launcher.svg
+
+SIZE=512
+rsvg-convert \
+	-w $SIZE \
+	-h $SIZE \
+	-o ~/termux-icons/ic_launcher_$SIZE.png \
+	~/termux-icons/ic_launcher.svg
+
+rsvg-convert \
+	-b black \
+	-w $SIZE \
+	-h $SIZE \
+	-o ~/termux-icons/ic_launcher_square_$SIZE.png \
+	~/termux-icons/ic_launcher.svg

art/generate-feature-graphic.sh

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

art/generate-launcher-images.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+for DENSITY in mdpi hdpi xhdpi xxhdpi xxxhdpi; do
+	case $DENSITY in
+		mdpi) SIZE=48;;
+		hdpi) SIZE=72;;
+		xhdpi) SIZE=96;;
+		xxhdpi) SIZE=144;;
+		xxxhdpi) SIZE=192;;
+	esac
+
+	FOLDER=../app/src/main/res/mipmap-$DENSITY
+	mkdir -p $FOLDER
+
+	for FILE in ic_launcher ic_launcher_round; do
+		PNG=$FOLDER/$FILE.png
+		rsvg-convert -w $SIZE -h $SIZE $FILE.svg > $PNG
+		zopflipng -y $PNG $PNG
+	done
+done

art/generate-tv-banner.sh

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

art/ic_launcher.svg

@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+
+    <!-- Screen and border. -->
+    <path fill="#000"
+          stroke="#BFCBCD"
+          stroke-width="2"
+          d="M9,6
+             l30,0
+             q3 0,3 3
+             l0,30
+             q0 3, -3 3
+             l-30,0
+             q-3 0, -3-3
+             l0 -30
+             q0 -3, 3 -3"
+    />
+
+    <!-- Block cursor. -->
+    <path fill="#FFF"
+          d="M14,14
+             l5,0
+             l0,10
+             l-5,0"
+    />
+
+</svg>

art/tv-banner.svg

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

build.gradle

@@ -1,19 +1,16 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }

gradle.properties

@@ -12,6 +12,10 @@
 # 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
+android.useAndroidX=true
+
+minSdkVersion=24
+targetSdkVersion=28
+ndkVersion=21.3.6528147
+compileSdkVersion=28

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Jul 23 17:08:29 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://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.
+#
 
 ##############################################################################
 ##
@@ -28,16 +44,16 @@ 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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,27 +156,30 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=`save "$@"`
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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

scripts/bintray-publish.gradle

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

settings.gradle

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

terminal-emulator/build.gradle

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

terminal-emulator/proguard-rules.pro

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

terminal-emulator/src/main/AndroidManifest.xml

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

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

@@ -26,9 +26,9 @@ 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_MOVE_HOME;
 import static android.view.KeyEvent.KEYCODE_NUMPAD_0;
 import static android.view.KeyEvent.KEYCODE_NUMPAD_1;
 import static android.view.KeyEvent.KEYCODE_NUMPAD_2;
@@ -66,7 +66,7 @@ public final class KeyHandler {
         // terminfo: http://pubs.opengroup.org/onlinepubs/7990989799/xcurses/terminfo.html
         // termcap: http://man7.org/linux/man-pages/man5/termcap.5.html
         TERMCAP_TO_KEYCODE.put("%i", KEYMOD_SHIFT | KEYCODE_DPAD_RIGHT);
-        TERMCAP_TO_KEYCODE.put("#2", KEYMOD_SHIFT | KEYCODE_HOME); // Shifted home
+        TERMCAP_TO_KEYCODE.put("#2", KEYMOD_SHIFT | KEYCODE_MOVE_HOME); // Shifted home
         TERMCAP_TO_KEYCODE.put("#4", KEYMOD_SHIFT | KEYCODE_DPAD_LEFT);
         TERMCAP_TO_KEYCODE.put("*7", KEYMOD_SHIFT | KEYCODE_MOVE_END); // Shifted end key
 
@@ -98,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", KEYCODE_HOME);
+        TERMCAP_TO_KEYCODE.put("kh", KEYCODE_MOVE_HOME);
         TERMCAP_TO_KEYCODE.put("kl", KEYCODE_DPAD_LEFT);
         TERMCAP_TO_KEYCODE.put("kr", KEYCODE_DPAD_RIGHT);
 
@@ -107,7 +107,7 @@ 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", KEYCODE_HOME);
+        TERMCAP_TO_KEYCODE.put("K1", KEYCODE_MOVE_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);
@@ -162,7 +162,9 @@ public final class KeyHandler {
             case KEYCODE_DPAD_LEFT:
                 return (keyMode == 0) ? (cursorApp ? "\033OD" : "\033[D") : transformForModifiers("\033[1", keyMode, 'D');
 
-            case KEYCODE_HOME:
+            case KEYCODE_MOVE_HOME:
+                // Note that KEYCODE_HOME is handled by the system and never delivered to applications.
+                // On a Logitech k810 keyboard KEYCODE_MOVE_HOME is sent by FN+LeftArrow.
                 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');
@@ -217,9 +219,6 @@ public final class KeyHandler {
             case KEYCODE_FORWARD_DEL:
                 return transformForModifiers("\033[3", keyMode, '~');
 
-            case KEYCODE_NUMPAD_DOT:
-                return keypadApplication ? "\033On" : "\033[3~";
-
             case KEYCODE_PAGE_UP:
                 return "\033[5~";
             case KEYCODE_PAGE_DOWN:
@@ -249,12 +248,14 @@ public final class KeyHandler {
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'k') : "+";
             case KEYCODE_NUMPAD_COMMA:
                 return ",";
+            case KEYCODE_NUMPAD_DOT:
+                return keypadApplication ? "\033On" : ".";
             case KEYCODE_NUMPAD_SUBTRACT:
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'm') : "-";
             case KEYCODE_NUMPAD_DIVIDE:
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'o') : "/";
             case KEYCODE_NUMPAD_0:
-                return keypadApplication ? transformForModifiers("\033O", keyMode, 'p') : "1";
+                return keypadApplication ? transformForModifiers("\033O", keyMode, 'p') : "0";
             case KEYCODE_NUMPAD_1:
                 return keypadApplication ? transformForModifiers("\033O", keyMode, 'q') : "1";
             case KEYCODE_NUMPAD_2: