Compare commits

..

3 Commits
v0.86 ... v0.88

Author SHA1 Message Date
Edontin
90e6260d5e Allow the user to disable virtual key emulation.
Use volume-keys=volume within termux.properties to disable.
2020-01-06 10:21:32 +01:00
Fredrik Fornwall
566d656c16 Avoid trailing slash in CWD (fixes #1413) 2020-01-05 19:14:52 +01:00
Fredrik Fornwall
b729085d52 Bump version to 0.88 2020-01-05 19:14:35 +01:00
4 changed files with 10 additions and 5 deletions

View File

@@ -16,8 +16,8 @@ android {
applicationId "com.termux" applicationId "com.termux"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 28 targetSdkVersion 28
versionCode 86 versionCode 88
versionName "0.86" versionName "0.88"
externalNativeBuild { externalNativeBuild {
ndkBuild { ndkBuild {

View File

@@ -66,6 +66,7 @@ final class TermuxPreferences {
int mBellBehaviour = BELL_VIBRATE; int mBellBehaviour = BELL_VIBRATE;
boolean mBackIsEscape; boolean mBackIsEscape;
boolean mDisableVolumeVirtualKeys;
boolean mShowExtraKeys; boolean mShowExtraKeys;
String[][] mExtraKeys; String[][] mExtraKeys;
@@ -198,6 +199,7 @@ final class TermuxPreferences {
} }
mBackIsEscape = "escape".equals(props.getProperty("back-key", "back")); mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
mDisableVolumeVirtualKeys = "volume".equals(props.getProperty("volume-keys", "virtual"));
shortcuts.clear(); shortcuts.clear();
parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props); parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);

View File

@@ -264,7 +264,9 @@ public final class TermuxViewClient implements TerminalViewClient {
/** Handle dedicated volume buttons as virtual keys if applicable. */ /** Handle dedicated volume buttons as virtual keys if applicable. */
private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) { private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
InputDevice inputDevice = event.getDevice(); 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. // Do not steal dedicated buttons from a full external keyboard.
return false; return false;
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {

View File

@@ -348,10 +348,11 @@ public final class TerminalSession extends TerminalOutput {
try { try {
final String cwdSymlink = String.format("/proc/%s/cwd/", mShellPid); final String cwdSymlink = String.format("/proc/%s/cwd/", mShellPid);
String outputPath = new File(cwdSymlink).getCanonicalPath(); String outputPath = new File(cwdSymlink).getCanonicalPath();
String outputPathWithTrailingSlash = outputPath;
if (!outputPath.endsWith("/")) { if (!outputPath.endsWith("/")) {
outputPath += '/'; outputPathWithTrailingSlash += '/';
} }
if (!cwdSymlink.equals(outputPath)) { if (!cwdSymlink.equals(outputPathWithTrailingSlash)) {
return outputPath; return outputPath;
} }
} catch (IOException | SecurityException e) { } catch (IOException | SecurityException e) {