Show bold text in bright colors

Fixes 17. Could be made an option in the future if necessary.

.editorconfig

@@ -0,0 +1,14 @@
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided this notice is
+# preserved.  This file is offered as-is, without any warranty.
+
+# EditorConfig
+# http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8

.gitignore

@@ -4,6 +4,7 @@
 
 # Built application files
 build/
+*.apk
 
 # Crashlytics configuations
 com_crashlytics_export_strings.xml

README.md

@@ -5,7 +5,8 @@ Termux app
 
 Termux is an Android terminal app and Linux environment.
 
-* [Termux on Google Play](http://play.google.com/store/apps/details?id=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)
@@ -14,7 +15,7 @@ Termux is an Android terminal app and Linux environment.
 
 License
 =======
-Released under the GPLv3 license. Contains code from `Terminal Emulator for Android` which is released under the Apache 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/).
 
 Building JNI libraries
 ======================
@@ -29,9 +30,9 @@ Terminal resources
 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: Mac 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)).
+* 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).
+* 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

@@ -14,31 +14,14 @@ android {
         applicationId "com.termux"
         minSdkVersion 21
         targetSdkVersion 22
-        versionCode 18
-        versionName "0.18"
-    }
-
-    signingConfigs {
-	release {
-	    if (System.getenv("TRAVIS")) {
-		    storeFile rootProject.file('travis.keystore')
-		    storePassword 'abcdef'
-		    keyAlias 'travis'
-		    keyPassword 'abcdef'
-	    } else {
-		    storeFile new File(TERMUX_KEYSTORE_FILE)
-		    storePassword TERMUX_KEYSTORE_PASSWORD
-		    keyAlias TERMUX_KEYSTORE_ALIAS
-		    keyPassword TERMUX_KEYSTORE_PASSWORD
-	    }
-	}
+        versionCode 20
+        versionName "0.20"
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-	    signingConfig signingConfigs.release
         }
     }
 }

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

@@ -52,6 +52,7 @@ import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -414,18 +415,22 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 				TermuxInstaller.setupIfNeeded(TermuxActivity.this, new Runnable() {
 					@Override
 					public void run() {
-						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();
+						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.
 						}
-						addNewSession(false, null);
 					}
 				});
 			} else {

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

@@ -21,6 +21,7 @@ import android.content.DialogInterface.OnDismissListener;
 import android.system.Os;
 import android.util.Log;
 import android.util.Pair;
+import android.view.WindowManager;
 
 import com.termux.R;
 import com.termux.terminal.EmulatorDebug;
@@ -138,27 +139,35 @@ final class TermuxInstaller {
 					activity.runOnUiThread(new Runnable() {
 						@Override
 						public void run() {
-							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);
-								}
-							}).show();
+							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);
+									}
+								}).show();
+							} catch (WindowManager.BadTokenException e) {
+								// Activity already dismissed - ignore.
+							}
 						}
 					});
 				} finally {
 					activity.runOnUiThread(new Runnable() {
 						@Override
 						public void run() {
-							progress.dismiss();
+							try {
+								progress.dismiss();
+							} catch (RuntimeException e) {
+								// Activity already dismissed - ignore.
+							}
 						}
 					});
 				}

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

@@ -119,7 +119,7 @@ public final class TerminalSession extends TerminalOutput {
 					// Negated signal.
 					exitDescription += " with signal " + (-exitCode);
 				}
-				exitDescription += "]";
+				exitDescription += " - press Enter to close]";
 
 				byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
 				mEmulator.append(bytesToWrite, bytesToWrite.length);

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

@@ -80,6 +80,7 @@ final class TerminalRenderer {
 
 			TerminalRow lineObject = screen.allocateFullLineIfNecessary(screen.externalToInternalRow(row));
 			final char[] line = lineObject.mText;
+			final int charsUsedInLine = lineObject.getSpaceUsed();
 
 			int lastRunStyle = 0;
 			boolean lastRunInsideCursor = false;
@@ -125,7 +126,7 @@ final class TerminalRenderer {
 				measuredWidthForRun += measuredCodePointWidth;
 				column += codePointWcWidth;
 				currentCharIndex += charsForCodePoint;
-				while (WcWidth.width(line, currentCharIndex) <= 0) {
+				while (currentCharIndex < charsUsedInLine && WcWidth.width(line, currentCharIndex) <= 0) {
 					// Eat combining chars so that they are treated as part of the last non-combining code point,
 					// instead of e.g. being considered inside the cursor in the next run.
 					currentCharIndex += Character.isHighSurrogate(line[currentCharIndex]) ? 2 : 1;
@@ -204,7 +205,10 @@ final class TerminalRenderer {
 			final boolean strikeThrough = (effect & TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH) != 0;
 			final boolean dim = (effect & TextStyle.CHARACTER_ATTRIBUTE_DIM) != 0;
 
-			int foreColorARGB = palette[foreColor];
+			// Let bold have bright colors if applicable (one of the first 8):
+			final int actualForeColor = foreColor + (bold && foreColor < 8 ? 8 : 0);
+
+			int foreColorARGB = palette[actualForeColor];
 			if (dim) {
 				int red = (0xFF & (foreColorARGB >> 16));
 				int green = (0xFF & (foreColorARGB >> 8));

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:1.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 22 22:50:58 CEST 2015
+#Tue Nov 17 21:52:59 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

gradlew

@@ -56,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar