From 2db6923bc4d946586c061f00d30a0b1678d56fd5 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 28 Jun 2016 01:03:03 +0200 Subject: [PATCH] Reformat code project-wide (getting rid of tabs) --- .idea/codeStyleSettings.xml | 231 + .../java/com/termux/app/BackgroundJob.java | 48 +- .../main/java/com/termux/app/DialogUtils.java | 80 +- .../java/com/termux/app/ExtraKeysView.java | 31 +- .../java/com/termux/app/TermuxActivity.java | 999 ++-- .../com/termux/app/TermuxHelpActivity.java | 98 +- .../java/com/termux/app/TermuxInstaller.java | 353 +- .../com/termux/app/TermuxKeyListener.java | 5 +- .../com/termux/app/TermuxPreferences.java | 188 +- .../java/com/termux/app/TermuxService.java | 533 +- .../filepicker/TermuxDocumentsProvider.java | 6 +- .../java/com/termux/terminal/ByteQueue.java | 188 +- .../com/termux/terminal/EmulatorDebug.java | 4 +- .../main/java/com/termux/terminal/JNI.java | 61 +- .../java/com/termux/terminal/KeyHandler.java | 471 +- .../com/termux/terminal/TerminalBuffer.java | 768 ++- .../termux/terminal/TerminalColorScheme.java | 157 +- .../com/termux/terminal/TerminalColors.java | 122 +- .../com/termux/terminal/TerminalEmulator.java | 4387 +++++++++-------- .../com/termux/terminal/TerminalOutput.java | 26 +- .../java/com/termux/terminal/TerminalRow.java | 394 +- .../com/termux/terminal/TerminalSession.java | 462 +- .../java/com/termux/terminal/TextStyle.java | 72 +- .../java/com/termux/terminal/WcWidth.java | 190 +- .../view/GestureAndScaleRecognizer.java | 158 +- .../com/termux/view/TerminalKeyListener.java | 14 +- .../com/termux/view/TerminalRenderer.java | 368 +- .../java/com/termux/view/TerminalView.java | 1334 ++--- 28 files changed, 6000 insertions(+), 5748 deletions(-) create mode 100644 .idea/codeStyleSettings.xml diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 00000000..73f689d5 --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,231 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/termux/app/BackgroundJob.java b/app/src/main/java/com/termux/app/BackgroundJob.java index 04e0a8b1..2be30101 100644 --- a/app/src/main/java/com/termux/app/BackgroundJob.java +++ b/app/src/main/java/com/termux/app/BackgroundJob.java @@ -21,7 +21,7 @@ public final class BackgroundJob { public BackgroundJob(File cwd, File fileToExecute, String[] args) throws IOException { String[] env = buildEnvironment(false, cwd.getAbsolutePath()); - String[] progArray = new String[args.length+1]; + String[] progArray = new String[args.length + 1]; mProcess = Runtime.getRuntime().exec(progArray, env, cwd); @@ -81,32 +81,32 @@ public final class BackgroundJob { } public String[] buildEnvironment(boolean failSafe, String cwd) { - new File(TermuxService.HOME_PATH).mkdirs(); + new File(TermuxService.HOME_PATH).mkdirs(); - if (cwd == null) cwd = TermuxService.HOME_PATH; + if (cwd == null) cwd = TermuxService.HOME_PATH; - final String termEnv = "TERM=xterm-256color"; - final String homeEnv = "HOME=" + TermuxService.HOME_PATH; - final String prefixEnv = "PREFIX=" + TermuxService.PREFIX_PATH; - final String androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"); - final String androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA"); - // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least - // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3. - final String externalStorageEnv = "EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"); - String[] env; - if (failSafe) { - // Keep the default path so that system binaries can be used in the failsafe session. - final String pathEnv = "PATH=" + System.getenv("PATH"); - return new String[] { termEnv, homeEnv, prefixEnv, androidRootEnv, androidDataEnv, pathEnv, externalStorageEnv }; - } else { - final String ps1Env = "PS1=$ "; - final String ldEnv = "LD_LIBRARY_PATH=" + TermuxService.PREFIX_PATH + "/lib"; - final String langEnv = "LANG=en_US.UTF-8"; - final String pathEnv = "PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets"; - final String pwdEnv = "PWD=" + cwd; + final String termEnv = "TERM=xterm-256color"; + final String homeEnv = "HOME=" + TermuxService.HOME_PATH; + final String prefixEnv = "PREFIX=" + TermuxService.PREFIX_PATH; + final String androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT"); + final String androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA"); + // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least + // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3. + final String externalStorageEnv = "EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE"); + String[] env; + if (failSafe) { + // Keep the default path so that system binaries can be used in the failsafe session. + final String pathEnv = "PATH=" + System.getenv("PATH"); + return new String[]{termEnv, homeEnv, prefixEnv, androidRootEnv, androidDataEnv, pathEnv, externalStorageEnv}; + } else { + final String ps1Env = "PS1=$ "; + final String ldEnv = "LD_LIBRARY_PATH=" + TermuxService.PREFIX_PATH + "/lib"; + final String langEnv = "LANG=en_US.UTF-8"; + final String pathEnv = "PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets"; + final String pwdEnv = "PWD=" + cwd; - return new String[] { termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv }; - } + return new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv}; } + } } diff --git a/app/src/main/java/com/termux/app/DialogUtils.java b/app/src/main/java/com/termux/app/DialogUtils.java index b097fbd3..8e8be19f 100644 --- a/app/src/main/java/com/termux/app/DialogUtils.java +++ b/app/src/main/java/com/termux/app/DialogUtils.java @@ -13,52 +13,52 @@ import android.widget.TextView; public final class DialogUtils { - public interface TextSetListener { - void onTextSet(String text); - } + public interface TextSetListener { + void onTextSet(String text); + } - public static void textInput(Activity activity, int titleText, String initialText, + public static void textInput(Activity activity, int titleText, String initialText, int positiveButtonText, final TextSetListener onPositive, int neutralButtonText, final TextSetListener onNeutral, int negativeButtonText, final TextSetListener onNegative, final DialogInterface.OnDismissListener onDismiss) { - final EditText input = new EditText(activity); - input.setSingleLine(); - if (initialText != null) { - input.setText(initialText); - Selection.setSelection(input.getText(), initialText.length()); - } + final EditText input = new EditText(activity); + input.setSingleLine(); + if (initialText != null) { + input.setText(initialText); + Selection.setSelection(input.getText(), initialText.length()); + } - final AlertDialog[] dialogHolder = new AlertDialog[1]; - input.setImeActionLabel(activity.getResources().getString(positiveButtonText), KeyEvent.KEYCODE_ENTER); - input.setOnEditorActionListener(new TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - onPositive.onTextSet(input.getText().toString()); - dialogHolder[0].dismiss(); - return true; - } - }); + final AlertDialog[] dialogHolder = new AlertDialog[1]; + input.setImeActionLabel(activity.getResources().getString(positiveButtonText), KeyEvent.KEYCODE_ENTER); + input.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + onPositive.onTextSet(input.getText().toString()); + dialogHolder[0].dismiss(); + return true; + } + }); - float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, activity.getResources().getDisplayMetrics()); - // https://www.google.com/design/spec/components/dialogs.html#dialogs-specs - int paddingTopAndSides = Math.round(16 * dipInPixels); - int paddingBottom = Math.round(24 * dipInPixels); + float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, activity.getResources().getDisplayMetrics()); + // https://www.google.com/design/spec/components/dialogs.html#dialogs-specs + int paddingTopAndSides = Math.round(16 * dipInPixels); + int paddingBottom = Math.round(24 * dipInPixels); - LinearLayout layout = new LinearLayout(activity); - layout.setOrientation(LinearLayout.VERTICAL); - layout.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); - layout.setPadding(paddingTopAndSides, paddingTopAndSides, paddingTopAndSides, paddingBottom); - layout.addView(input); + LinearLayout layout = new LinearLayout(activity); + layout.setOrientation(LinearLayout.VERTICAL); + layout.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); + layout.setPadding(paddingTopAndSides, paddingTopAndSides, paddingTopAndSides, paddingBottom); + layout.addView(input); - 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()); - } - }); + 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()); + } + }); if (onNeutral != null) { builder.setNeutralButton(neutralButtonText, new DialogInterface.OnClickListener() { @@ -82,9 +82,9 @@ public final class DialogUtils { if (onDismiss != null) builder.setOnDismissListener(onDismiss); - dialogHolder[0] = builder.create(); + dialogHolder[0] = builder.create(); dialogHolder[0].setCanceledOnTouchOutside(false); - dialogHolder[0].show(); - } + dialogHolder[0].show(); + } } diff --git a/app/src/main/java/com/termux/app/ExtraKeysView.java b/app/src/main/java/com/termux/app/ExtraKeysView.java index b0d74ee3..a1cf70c4 100644 --- a/app/src/main/java/com/termux/app/ExtraKeysView.java +++ b/app/src/main/java/com/termux/app/ExtraKeysView.java @@ -31,14 +31,29 @@ public final class ExtraKeysView extends GridLayout { 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; + case "ESC": + keyCode = KeyEvent.KEYCODE_ESCAPE; + break; + case "TAB": + keyCode = KeyEvent.KEYCODE_TAB; + break; + case "▲": + keyCode = KeyEvent.KEYCODE_DPAD_UP; + break; + case "◀": + keyCode = KeyEvent.KEYCODE_DPAD_LEFT; + break; + case "▶": + keyCode = KeyEvent.KEYCODE_DPAD_RIGHT; + break; + case "▼": + keyCode = KeyEvent.KEYCODE_DPAD_DOWN; + break; + case "―": + chars = "-"; + break; + default: + chars = keyName; } if (keyCode > 0) { diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java index b66e2f62..d0efb248 100644 --- a/app/src/main/java/com/termux/app/TermuxActivity.java +++ b/app/src/main/java/com/termux/app/TermuxActivity.java @@ -79,7 +79,7 @@ import java.util.regex.Pattern; /** * A terminal emulator activity. - * + *

* See *