Refine terminal input panel

app/src/main/java/com/neatstudio/tmuxandroid/MainActivity.java

@@ -22,11 +22,13 @@ import android.provider.Settings;
 import android.text.InputType;
 import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.HorizontalScrollView;
@@ -100,6 +102,8 @@ public final class MainActivity extends Activity {
     private final StringBuilder queuedTerminalInput = new StringBuilder();
     private boolean terminalConnected;
     private boolean terminalRenderPending;
+    private boolean terminalSelectionEnabled;
+    private boolean terminalFollowOutput = true;
     private long lastTerminalRenderMs;
     private int terminalCols = DEFAULT_TERMINAL_COLS;
     private int terminalRows = DEFAULT_TERMINAL_ROWS;
@@ -171,7 +175,7 @@ public final class MainActivity extends Activity {
         view.setOnApplyWindowInsetsListener((target, insets) -> {
             int bottom = insets.getSystemWindowInsetBottom();
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                bottom = Math.max(bottom, insets.getInsets(WindowInsets.Type.ime()).bottom);
+                bottom = insets.getInsets(WindowInsets.Type.systemBars()).bottom;
             }
             target.setPadding(
                     0,
@@ -969,6 +973,8 @@ public final class MainActivity extends Activity {
         queuedTerminalInput.setLength(0);
         terminalConnected = false;
         terminalRenderPending = false;
+        terminalSelectionEnabled = false;
+        terminalFollowOutput = true;
         lastTerminalRenderMs = 0L;
         terminalCols = DEFAULT_TERMINAL_COLS;
         terminalRows = DEFAULT_TERMINAL_ROWS;
@@ -985,7 +991,7 @@ public final class MainActivity extends Activity {
         terminalText.setIncludeFontPadding(false);
         terminalText.setLineSpacing(0, 1.05f);
         terminalText.setGravity(Gravity.BOTTOM | Gravity.START);
-        terminalText.setTextIsSelectable(false);
+        terminalText.setTextIsSelectable(terminalSelectionEnabled);
         terminalText.setPadding(dp(10), dp(10), dp(10), dp(10));
         terminalText.setBackgroundColor(Color.rgb(4, 7, 10));
         terminalScroll.addView(terminalText, new ScrollView.LayoutParams(
@@ -994,15 +1000,17 @@ public final class MainActivity extends Activity {
         ));
         terminalScroll.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) ->
                 resizeTerminalToViewport(false));
+        terminalScroll.setOnScrollChangeListener((view, scrollX, scrollY, oldScrollX, oldScrollY) ->
+                terminalFollowOutput = !view.canScrollVertically(1));
         root.addView(terminalScroll, new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 0,
                 1
         ));
-        root.addView(createInputBar(), matchWrap());
+        root.addView(createComposerBar(), matchWrap());
-        root.addView(createSoftKeyBar(), new LinearLayout.LayoutParams(
+        root.addView(createSoftKeyPad(), new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
-                dp(46)
+                dp(138)
         ));
         root.addView(statusText, new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -1176,30 +1184,64 @@ public final class MainActivity extends Activity {
                 .show();
     }
 
-    private LinearLayout createInputBar() {
+    private LinearLayout createComposerBar() {
         LinearLayout bar = new LinearLayout(this);
-        bar.setOrientation(LinearLayout.HORIZONTAL);
+        bar.setOrientation(LinearLayout.VERTICAL);
-        bar.setGravity(Gravity.CENTER_VERTICAL);
+        bar.setPadding(dp(8), dp(5), dp(8), dp(6));
-        bar.setPadding(dp(8), dp(5), dp(8), dp(5));
         bar.setBackgroundColor(Color.rgb(17, 20, 24));
 
+        LinearLayout row = new LinearLayout(this);
+        row.setOrientation(LinearLayout.HORIZONTAL);
+        row.setGravity(Gravity.BOTTOM);
+
         inputField = new EditText(this);
-        inputField.setSingleLine(true);
         inputField.setTextColor(Color.WHITE);
         inputField.setHintTextColor(Color.rgb(150, 158, 168));
-        inputField.setHint("type command or text");
+        inputField.setHint("type command, text, or multi-line paste");
-        inputField.setImeOptions(EditorInfo.IME_ACTION_SEND);
+        inputField.setSingleLine(false);
-        inputField.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        inputField.setMinLines(1);
-        styleInput(inputField);
+        inputField.setMaxLines(4);
+        inputField.setGravity(Gravity.TOP | Gravity.START);
+        inputField.setImeOptions(EditorInfo.IME_ACTION_NONE);
+        inputField.setInputType(InputType.TYPE_CLASS_TEXT
+                | InputType.TYPE_TEXT_FLAG_MULTI_LINE
+                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        styleComposerInput(inputField);
         inputField.setOnEditorActionListener((view, actionId, event) -> {
-            if (actionId == EditorInfo.IME_ACTION_SEND) {
+            if (event != null
+                    && event.getKeyCode() == KeyEvent.KEYCODE_ENTER
+                    && event.isShiftPressed()
+                    && event.getAction() == KeyEvent.ACTION_UP) {
                 sendLine();
                 return true;
             }
             return false;
         });
-        bar.addView(inputField, new LinearLayout.LayoutParams(0, dp(42), 1));
+        row.addView(inputField, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1));
-        bar.addView(toolbarButton("Send", view -> sendLine()));
+        row.addView(toolbarButton("Send", view -> sendLine()), new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                dp(54)
+        ));
+        bar.addView(row, matchWrap());
+
+        HorizontalScrollView actionScroller = new HorizontalScrollView(this);
+        actionScroller.setHorizontalScrollBarEnabled(false);
+        LinearLayout actions = new LinearLayout(this);
+        actions.setOrientation(LinearLayout.HORIZONTAL);
+        actions.setGravity(Gravity.CENTER_VERTICAL);
+        actions.setPadding(0, dp(5), 0, 0);
+        actions.addView(compactButton("Enter", view -> sendTerminalInput("\r")));
+        actions.addView(compactButton("NL", view -> insertComposerText("\n")));
+        actions.addView(compactButton("Keyboard", view -> showKeyboard()));
+        actions.addView(compactButton("Hide", view -> hideKeyboard()));
+        actions.addView(compactButton("Bottom", view -> scrollTerminalBottom()));
+        actions.addView(compactButton("Select", view -> toggleTerminalSelection()));
+        actions.addView(compactButton("Clear", view -> inputField.setText("")));
+        actionScroller.addView(actions, new HorizontalScrollView.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        ));
+        bar.addView(actionScroller, matchWrap());
         return bar;
     }
 
@@ -1720,7 +1762,25 @@ public final class MainActivity extends Activity {
         return input;
     }
 
-    private HorizontalScrollView createSoftKeyBar() {
+    private LinearLayout createSoftKeyPad() {
+        LinearLayout pad = new LinearLayout(this);
+        pad.setOrientation(LinearLayout.VERTICAL);
+        pad.setBackgroundColor(Color.rgb(22, 27, 34));
+        pad.addView(createSoftKeyRow(
+                new String[]{"Esc", "Tab", "Ctrl+C", "Ctrl+D", "Ctrl+L", "Ctrl+R", "Ctrl+A", "Ctrl+E", "Paste"},
+                new String[]{"\u001b", "\t", "\u0003", "\u0004", "\u000c", "\u0012", "\u0001", "\u0005", null}
+        ), new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
+        pad.addView(createSoftKeyRow(
+                new String[]{"Tmux", "Detach", "NewWin", "PrevWin", "NextWin", "Left", "Down", "Up", "Right", "PgUp", "PgDn", "Home", "End"},
+                new String[]{"\u0002", "\u0002d", "\u0002c", "\u0002p", "\u0002n", "\u001b[D", "\u001b[B", "\u001b[A", "\u001b[C", "\u001b[5~", "\u001b[6~", "\u001b[H", "\u001b[F"}
+        ), new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
+        pad.addView(createTextKeyRow(
+                new String[]{"/", "-", "_", ".", "~", "|", "&", ";", ":", "\"", "'", "$", "Space", "Back"}
+        ), new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
+        return pad;
+    }
+
+    private HorizontalScrollView createSoftKeyRow(String[] labels, String[] sequences) {
         HorizontalScrollView scroller = new HorizontalScrollView(this);
         scroller.setHorizontalScrollBarEnabled(false);
         scroller.setBackgroundColor(Color.rgb(22, 27, 34));
@@ -1729,32 +1789,40 @@ public final class MainActivity extends Activity {
         row.setOrientation(LinearLayout.HORIZONTAL);
         row.setGravity(Gravity.CENTER_VERTICAL);
         row.setPadding(dp(6), dp(4), dp(6), dp(4));
-        addSoftKey(row, "Enter", "\r");
+        for (int index = 0; index < labels.length; index++) {
-        addSoftKey(row, "Esc", "\u001b");
+            String label = labels[index];
-        addSoftKey(row, "Tab", "\t");
+            String sequence = sequences[index];
-        addSoftKey(row, "^C", "\u0003");
+            if (sequence == null) {
-        addSoftKey(row, "^D", "\u0004");
+                addSoftButton(row, label, view -> pasteClipboard());
-        addSoftKey(row, "^L", "\u000c");
+            } else {
-        addSoftKey(row, "^R", "\u0012");
+                addSoftKey(row, label, sequence);
-        addSoftKey(row, "^A", "\u0001");
+            }
-        addSoftKey(row, "^E", "\u0005");
+        }
-        addSoftKey(row, "^V", "\u0016");
+        scroller.addView(row, new HorizontalScrollView.LayoutParams(
-        addSoftKey(row, "^Z", "\u001a");
+                ViewGroup.LayoutParams.WRAP_CONTENT,
-        addSoftKey(row, "^\\", "\u001c");
+                ViewGroup.LayoutParams.MATCH_PARENT
-        addSoftKey(row, "Tmux", "\u0002");
+        ));
-        addSoftKey(row, "Detach", "\u0002d");
+        return scroller;
-        addSoftKey(row, "NewWin", "\u0002c");
+    }
-        addSoftKey(row, "NextWin", "\u0002n");
+
-        addSoftKey(row, "PrevWin", "\u0002p");
+    private HorizontalScrollView createTextKeyRow(String[] labels) {
-        addSoftKey(row, "Left", "\u001b[D");
+        HorizontalScrollView scroller = new HorizontalScrollView(this);
-        addSoftKey(row, "Down", "\u001b[B");
+        scroller.setHorizontalScrollBarEnabled(false);
-        addSoftKey(row, "Up", "\u001b[A");
+        scroller.setBackgroundColor(Color.rgb(22, 27, 34));
-        addSoftKey(row, "Right", "\u001b[C");
+
-        addSoftKey(row, "PgUp", "\u001b[5~");
+        LinearLayout row = new LinearLayout(this);
-        addSoftKey(row, "PgDn", "\u001b[6~");
+        row.setOrientation(LinearLayout.HORIZONTAL);
-        addSoftKey(row, "Home", "\u001b[H");
+        row.setGravity(Gravity.CENTER_VERTICAL);
-        addSoftKey(row, "End", "\u001b[F");
+        row.setPadding(dp(6), dp(4), dp(6), dp(4));
-        addSoftButton(row, "Paste", view -> pasteClipboard());
+        for (String label : labels) {
+            if ("Space".equals(label)) {
+                addTextKey(row, label, " ");
+            } else if ("Back".equals(label)) {
+                addSoftButton(row, label, view -> backspaceComposerText());
+            } else {
+                addTextKey(row, label, label);
+            }
+        }
         scroller.addView(row, new HorizontalScrollView.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
@@ -1845,10 +1913,17 @@ public final class MainActivity extends Activity {
         String text = inputField.getText().toString();
         if (text.isEmpty()) {
             sendTerminalInput("\r");
-        } else {
+            return;
-            sendTerminalInput(text + "\r");
-            inputField.setText("");
         }
+        String normalized = text.replace("\r\n", "\n").replace('\r', '\n').replace('\n', '\r');
+        if (!normalized.endsWith("\r")) {
+            normalized = normalized + "\r";
+        }
+        terminalFollowOutput = true;
+        sendTerminalInput(normalized);
+        inputField.setText("");
+        hideKeyboard();
+        setStatus("Sent " + text.length() + " chars");
     }
 
     private void sendTerminalInput(String data) {
@@ -1906,6 +1981,70 @@ public final class MainActivity extends Activity {
         }
     }
 
+    private void insertComposerText(String text) {
+        if (inputField == null) {
+            return;
+        }
+        int start = Math.max(0, inputField.getSelectionStart());
+        int end = Math.max(0, inputField.getSelectionEnd());
+        inputField.getText().replace(Math.min(start, end), Math.max(start, end), text);
+        inputField.requestFocus();
+    }
+
+    private void backspaceComposerText() {
+        if (inputField == null) {
+            return;
+        }
+        int start = Math.max(0, inputField.getSelectionStart());
+        int end = Math.max(0, inputField.getSelectionEnd());
+        int from = Math.min(start, end);
+        int to = Math.max(start, end);
+        if (from != to) {
+            inputField.getText().delete(from, to);
+        } else if (from > 0) {
+            inputField.getText().delete(from - 1, from);
+        }
+        inputField.requestFocus();
+    }
+
+    private void showKeyboard() {
+        if (inputField == null) {
+            return;
+        }
+        inputField.requestFocus();
+        InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (manager != null) {
+            manager.showSoftInput(inputField, InputMethodManager.SHOW_IMPLICIT);
+        }
+    }
+
+    private void hideKeyboard() {
+        if (inputField == null) {
+            return;
+        }
+        InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (manager != null) {
+            manager.hideSoftInputFromWindow(inputField.getWindowToken(), 0);
+        }
+        inputField.clearFocus();
+    }
+
+    private void toggleTerminalSelection() {
+        terminalSelectionEnabled = !terminalSelectionEnabled;
+        if (terminalText != null) {
+            terminalText.setTextIsSelectable(terminalSelectionEnabled);
+        }
+        setStatus(terminalSelectionEnabled ? "Terminal selection on" : "Terminal selection off");
+    }
+
+    private void scrollTerminalBottom() {
+        terminalFollowOutput = true;
+        if (terminalScroll != null) {
+            terminalScroll.post(() -> terminalScroll.fullScroll(View.FOCUS_DOWN));
+        }
+        setStatus("Following terminal output");
+    }
+
     private void appendTerminal(String data) {
         terminalScreen.write(data);
         scheduleTerminalRender();
@@ -1930,8 +2069,10 @@ public final class MainActivity extends Activity {
         }
         lastTerminalRenderMs = System.currentTimeMillis();
         terminalText.setText(terminalScreen.render());
+        if (terminalFollowOutput) {
             terminalScroll.post(() -> terminalScroll.fullScroll(View.FOCUS_DOWN));
         }
+    }
 
     private void saveServerAndRefresh() {
         String url = normalizeServerUrl(urlField.getText().toString());
@@ -2039,6 +2180,23 @@ public final class MainActivity extends Activity {
         input.setBackground(rounded(Color.rgb(12, 17, 23), 8, Color.rgb(48, 58, 70), 1));
     }
 
+    private void styleComposerInput(EditText input) {
+        input.setTextColor(Color.rgb(240, 246, 252));
+        input.setHintTextColor(Color.rgb(139, 148, 158));
+        input.setTextSize(14);
+        input.setPadding(dp(10), dp(8), dp(10), dp(8));
+        input.setBackground(rounded(Color.rgb(12, 17, 23), 8, Color.rgb(48, 58, 70), 1));
+    }
+
+    private Button compactButton(String label, View.OnClickListener listener) {
+        Button button = toolbarButton(label, listener);
+        button.setTextSize(11);
+        button.setPadding(dp(8), 0, dp(8), 0);
+        button.setMinWidth(dp(48));
+        button.setMinimumWidth(dp(48));
+        return button;
+    }
+
     private StateListDrawable buttonBackground() {
         StateListDrawable states = new StateListDrawable();
         states.addState(new int[]{-android.R.attr.state_enabled}, rounded(Color.rgb(24, 30, 37), 8, Color.rgb(35, 42, 50), 1));
@@ -2062,10 +2220,16 @@ public final class MainActivity extends Activity {
         addSoftButton(row, label, view -> sendTerminalInput(sequence));
     }
 
+    private void addTextKey(LinearLayout row, String label, String text) {
+        addSoftButton(row, label, view -> insertComposerText(text));
+    }
+
     private void addSoftButton(LinearLayout row, String label, View.OnClickListener listener) {
         Button button = toolbarButton(label, listener);
-        button.setMinWidth(dp(50));
+        button.setTextSize(11);
-        button.setMinimumWidth(dp(50));
+        button.setPadding(dp(8), 0, dp(8), 0);
+        button.setMinWidth(dp("Space".equals(label) ? 72 : 50));
+        button.setMinimumWidth(dp("Space".equals(label) ? 72 : 50));
         row.addView(button, new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.MATCH_PARENT

app/src/main/java/com/neatstudio/tmuxandroid/TerminalScreenBuffer.java

@@ -109,6 +109,8 @@ final class TerminalScreenBuffer {
                     putChar(' ');
                 }
                 index++;
+            } else if (isNakedDeviceAttributesTail(text, index)) {
+                index = skipNakedDeviceAttributesTail(text, index);
             } else if (item >= 0x20 && item != 0x7f) {
                 putChar(item);
                 index++;
@@ -495,6 +497,36 @@ final class TerminalScreenBuffer {
         return -1;
     }
 
+    private boolean isNakedDeviceAttributesTail(String text, int index) {
+        int cursor = index;
+        boolean hasSemicolon = false;
+        if (cursor < text.length() && (text.charAt(cursor) == '?' || text.charAt(cursor) == '>')) {
+            cursor++;
+        }
+        while (cursor < text.length()) {
+            char item = text.charAt(cursor);
+            if (item >= '0' && item <= '9') {
+                cursor++;
+                continue;
+            }
+            if (item == ';') {
+                hasSemicolon = true;
+                cursor++;
+                continue;
+            }
+            return item == 'c' && hasSemicolon && cursor > index && cursor - index <= 16;
+        }
+        return false;
+    }
+
+    private int skipNakedDeviceAttributesTail(String text, int index) {
+        int cursor = index;
+        while (cursor < text.length() && text.charAt(cursor) != 'c') {
+            cursor++;
+        }
+        return Math.min(cursor + 1, text.length());
+    }
+
     private int findAnsiEnd(String text, int start) {
         for (int index = start; index < text.length(); index++) {
             char item = text.charAt(index);