Refine terminal input panel

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

@@ -19,19 +19,16 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
 import android.text.InputType;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.StyleSpan;
 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;
@@ -62,7 +59,6 @@ public final class MainActivity extends Activity {
     private static final int MAX_TERMINAL_COLS = 140;
     private static final int MIN_TERMINAL_ROWS = 8;
     private static final int MAX_TERMINAL_ROWS = 80;
-    private static final int MAX_TERMINAL_CHARS = 40_000;
     private static final int STATUS_NORMAL = 0;
     private static final int STATUS_BUSY = 1;
     private static final int STATUS_SUCCESS = 2;
@@ -102,10 +98,12 @@ public final class MainActivity extends Activity {
     private String activeSessionName;
     private String activeMainPage = PAGE_SESSIONS;
     private String pendingImageUploadSession;
-    private final StringBuilder terminalBuffer = new StringBuilder();
+    private TerminalScreenBuffer terminalScreen = new TerminalScreenBuffer(DEFAULT_TERMINAL_COLS, DEFAULT_TERMINAL_ROWS);
     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;
@@ -177,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,
@@ -971,10 +969,12 @@ public final class MainActivity extends Activity {
 
     private void openTerminal(String sessionName) {
         activeSessionName = sessionName;
-        terminalBuffer.setLength(0);
+        terminalScreen = new TerminalScreenBuffer(DEFAULT_TERMINAL_COLS, DEFAULT_TERMINAL_ROWS);
         queuedTerminalInput.setLength(0);
         terminalConnected = false;
         terminalRenderPending = false;
+        terminalSelectionEnabled = false;
+        terminalFollowOutput = true;
         lastTerminalRenderMs = 0L;
         terminalCols = DEFAULT_TERMINAL_COLS;
         terminalRows = DEFAULT_TERMINAL_ROWS;
@@ -991,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(
@@ -1000,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,
@@ -1132,7 +1134,7 @@ public final class MainActivity extends Activity {
                 .setItems(items, (dialog, which) -> {
                     switch (which) {
                         case 0:
-                            terminalBuffer.setLength(0);
+                            terminalScreen.clear();
                             terminalText.setText("");
                             if (terminalSocket != null) {
                                 terminalSocket.clearHistory();
@@ -1182,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;
     }
 
@@ -1726,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));
@@ -1735,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
@@ -1829,13 +1891,15 @@ public final class MainActivity extends Activity {
         if (lineHeight <= 0) {
             lineHeight = dp(16);
         }
-        int cols = clamp((int) Math.floor((width - horizontalPadding) / charWidth), MIN_TERMINAL_COLS, MAX_TERMINAL_COLS);
+        int cols = clamp((int) Math.floor((width - horizontalPadding) / charWidth) - 1, MIN_TERMINAL_COLS, MAX_TERMINAL_COLS);
         int rows = clamp((height - verticalPadding) / lineHeight, MIN_TERMINAL_ROWS, MAX_TERMINAL_ROWS);
         if (cols == terminalCols && rows == terminalRows && !forceSend) {
             return;
         }
         terminalCols = cols;
         terminalRows = rows;
+        terminalScreen.resize(cols, rows);
+        scheduleTerminalRender();
         TerminalSocketClient socket = terminalSocket;
         if (socket != null && !socket.isClosed() && terminalConnected) {
             socket.resize(cols, rows);
@@ -1849,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) {
@@ -1910,11 +1981,72 @@ public final class MainActivity extends Activity {
         }
     }
 
-    private void appendTerminal(String data) {
+    private void insertComposerText(String text) {
-        terminalBuffer.append(data);
+        if (inputField == null) {
-        if (terminalBuffer.length() > MAX_TERMINAL_CHARS) {
+            return;
-            terminalBuffer.delete(0, terminalBuffer.length() - MAX_TERMINAL_CHARS);
         }
+        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();
     }
 
@@ -1936,131 +2068,9 @@ public final class MainActivity extends Activity {
             return;
         }
         lastTerminalRenderMs = System.currentTimeMillis();
-        terminalText.setText(renderAnsiForTerminal(terminalBuffer.toString()));
+        terminalText.setText(terminalScreen.render());
-        terminalScroll.post(() -> terminalScroll.fullScroll(View.FOCUS_DOWN));
+        if (terminalFollowOutput) {
-    }
+            terminalScroll.post(() -> terminalScroll.fullScroll(View.FOCUS_DOWN));
-
-    private CharSequence renderAnsiForTerminal(String text) {
-        SpannableStringBuilder output = new SpannableStringBuilder();
-        int fg = Color.rgb(230, 235, 242);
-        int bg = Color.TRANSPARENT;
-        boolean bold = false;
-        int index = 0;
-        while (index < text.length()) {
-            char item = text.charAt(index);
-            if (item == '\r') {
-                index++;
-                continue;
-            }
-            if (item == '\u001b' && index + 1 < text.length() && text.charAt(index + 1) == '[') {
-                int end = findAnsiEnd(text, index + 2);
-                if (end == -1) {
-                    break;
-                }
-                char command = text.charAt(end);
-                if (command == 'm') {
-                    int[] state = applySgr(text.substring(index + 2, end), fg, bg, bold);
-                    fg = state[0];
-                    bg = state[1];
-                    bold = state[2] == 1;
-                }
-                index = end + 1;
-                continue;
-            }
-
-            int runStart = index;
-            while (index < text.length()) {
-                char runItem = text.charAt(index);
-                if (runItem == '\r' || (runItem == '\u001b' && index + 1 < text.length() && text.charAt(index + 1) == '[')) {
-                    break;
-                }
-                index++;
-            }
-            appendTerminalRun(output, text.substring(runStart, index), fg, bg, bold);
-        }
-        return output;
-    }
-
-    private void appendTerminalRun(SpannableStringBuilder output, String text, int fg, int bg, boolean bold) {
-        if (text.isEmpty()) {
-            return;
-        }
-        int start = output.length();
-        output.append(text);
-        int finish = output.length();
-        output.setSpan(new ForegroundColorSpan(fg), start, finish, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        if (bg != Color.TRANSPARENT) {
-            output.setSpan(new BackgroundColorSpan(bg), start, finish, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
-        if (bold) {
-            output.setSpan(new StyleSpan(Typeface.BOLD), start, finish, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
-    }
-
-    private int findAnsiEnd(String text, int start) {
-        for (int index = start; index < text.length(); index++) {
-            char item = text.charAt(index);
-            if (item >= '@' && item <= '~') {
-                return index;
-            }
-        }
-        return -1;
-    }
-
-    private int[] applySgr(String params, int fg, int bg, boolean bold) {
-        if (params.isEmpty()) {
-            params = "0";
-        }
-        String[] parts = params.split(";");
-        for (String part : parts) {
-            int value;
-            try {
-                value = part.isEmpty() ? 0 : Integer.parseInt(part);
-            } catch (NumberFormatException ignored) {
-                continue;
-            }
-            if (value == 0) {
-                fg = Color.rgb(230, 235, 242);
-                bg = Color.TRANSPARENT;
-                bold = false;
-            } else if (value == 1) {
-                bold = true;
-            } else if (value == 22) {
-                bold = false;
-            } else if (value == 39) {
-                fg = Color.rgb(230, 235, 242);
-            } else if (value == 49) {
-                bg = Color.TRANSPARENT;
-            } else if ((value >= 30 && value <= 37) || (value >= 90 && value <= 97)) {
-                fg = ansiColor(value, false);
-            } else if ((value >= 40 && value <= 47) || (value >= 100 && value <= 107)) {
-                bg = ansiColor(value, true);
-            }
-        }
-        return new int[]{fg, bg, bold ? 1 : 0};
-    }
-
-    private int ansiColor(int code, boolean background) {
-        int base = background ? (code >= 100 ? code - 100 : code - 40) : (code >= 90 ? code - 90 : code - 30);
-        boolean bright = code >= 90;
-        switch (base) {
-            case 0:
-                return bright ? Color.rgb(80, 88, 100) : Color.rgb(33, 38, 45);
-            case 1:
-                return bright ? Color.rgb(255, 123, 114) : Color.rgb(248, 81, 73);
-            case 2:
-                return bright ? Color.rgb(86, 211, 100) : Color.rgb(63, 185, 80);
-            case 3:
-                return bright ? Color.rgb(234, 179, 8) : Color.rgb(210, 153, 34);
-            case 4:
-                return bright ? Color.rgb(121, 192, 255) : Color.rgb(88, 166, 255);
-            case 5:
-                return bright ? Color.rgb(210, 168, 255) : Color.rgb(188, 140, 255);
-            case 6:
-                return bright ? Color.rgb(86, 211, 219) : Color.rgb(57, 197, 187);
-            case 7:
-            default:
-                return bright ? Color.rgb(240, 246, 252) : Color.rgb(201, 209, 217);
         }
     }
 
@@ -2170,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));
@@ -2193,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

@@ -0,0 +1,647 @@
+package com.neatstudio.tmuxandroid;
+
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+final class TerminalScreenBuffer {
+    private static final int DEFAULT_FG = 0xffe6ebf2;
+    private static final int DEFAULT_BG = Color.TRANSPARENT;
+
+    private int cols;
+    private int rows;
+    private Cell[][] cells;
+    private int cursorRow;
+    private int cursorCol;
+    private int savedRow;
+    private int savedCol;
+    private String pendingControl = "";
+    private boolean wrapPending;
+    private int fg = DEFAULT_FG;
+    private int bg = DEFAULT_BG;
+    private boolean bold;
+
+    TerminalScreenBuffer(int cols, int rows) {
+        resize(cols, rows);
+    }
+
+    void resize(int nextCols, int nextRows) {
+        nextCols = Math.max(1, nextCols);
+        nextRows = Math.max(1, nextRows);
+        Cell[][] previous = cells;
+        int previousRows = rows;
+        int previousCols = cols;
+        cols = nextCols;
+        rows = nextRows;
+        cells = new Cell[rows][cols];
+        for (int row = 0; row < rows; row++) {
+            for (int col = 0; col < cols; col++) {
+                cells[row][col] = new Cell();
+            }
+        }
+        if (previous != null) {
+            int copyRows = Math.min(previousRows, rows);
+            int copyCols = Math.min(previousCols, cols);
+            int previousStart = Math.max(0, previousRows - copyRows);
+            int nextStart = Math.max(0, rows - copyRows);
+            for (int row = 0; row < copyRows; row++) {
+                for (int col = 0; col < copyCols; col++) {
+                    cells[nextStart + row][col].copyFrom(previous[previousStart + row][col]);
+                }
+            }
+        }
+        cursorRow = clamp(cursorRow, 0, rows - 1);
+        cursorCol = clamp(cursorCol, 0, cols - 1);
+        savedRow = clamp(savedRow, 0, rows - 1);
+        savedCol = clamp(savedCol, 0, cols - 1);
+    }
+
+    void clear() {
+        clearScreen();
+        cursorRow = 0;
+        cursorCol = 0;
+        savedRow = 0;
+        savedCol = 0;
+        pendingControl = "";
+        wrapPending = false;
+        fg = DEFAULT_FG;
+        bg = DEFAULT_BG;
+        bold = false;
+    }
+
+    void write(String text) {
+        if (!pendingControl.isEmpty()) {
+            text = pendingControl + text;
+            pendingControl = "";
+        }
+        int index = 0;
+        while (index < text.length()) {
+            char item = text.charAt(index);
+            if (item == '\u001b') {
+                int next = handleEscape(text, index);
+                if (next < 0) {
+                    pendingControl = text.substring(index);
+                    return;
+                }
+                index = next;
+            } else if (item == '\r') {
+                wrapPending = false;
+                cursorCol = 0;
+                index++;
+            } else if (item == '\n') {
+                wrapPending = false;
+                newLine();
+                index++;
+            } else if (item == '\b') {
+                wrapPending = false;
+                cursorCol = Math.max(0, cursorCol - 1);
+                index++;
+            } else if (item == '\t') {
+                int nextTab = ((cursorCol / 8) + 1) * 8;
+                while (cursorCol < Math.min(nextTab, cols)) {
+                    putChar(' ');
+                }
+                index++;
+            } else if (isNakedDeviceAttributesTail(text, index)) {
+                index = skipNakedDeviceAttributesTail(text, index);
+            } else if (item >= 0x20 && item != 0x7f) {
+                putChar(item);
+                index++;
+            } else {
+                index++;
+            }
+        }
+    }
+
+    CharSequence render() {
+        SpannableStringBuilder output = new SpannableStringBuilder();
+        for (int row = 0; row < rows; row++) {
+            appendRow(output, row);
+            if (row + 1 < rows) {
+                output.append('\n');
+            }
+        }
+        return output;
+    }
+
+    private int handleEscape(String text, int index) {
+        if (index + 1 >= text.length()) {
+            return -1;
+        }
+        char next = text.charAt(index + 1);
+        wrapPending = false;
+        if (next == '[') {
+            int end = findAnsiEnd(text, index + 2);
+            if (end == -1) {
+                return -1;
+            }
+            applyCsi(text.substring(index + 2, end), text.charAt(end));
+            return end + 1;
+        }
+        if (next == ']') {
+            return skipStringEscape(text, index + 2);
+        }
+        if (next == 'P' || next == '^' || next == '_') {
+            return skipStringEscape(text, index + 2);
+        }
+        if (next == '(' || next == ')' || next == '*' || next == '+' || next == '-' || next == '.') {
+            if (index + 2 >= text.length()) {
+                return -1;
+            }
+            return Math.min(index + 3, text.length());
+        }
+        if (next == '7') {
+            saveCursor();
+        } else if (next == '8') {
+            restoreCursor();
+        } else if (next == 'D') {
+            newLine();
+        } else if (next == 'E') {
+            cursorCol = 0;
+            newLine();
+        } else if (next == 'M') {
+            reverseIndex();
+        } else if (next == 'c') {
+            clear();
+        }
+        return Math.min(index + 2, text.length());
+    }
+
+    private void applyCsi(String rawParams, char command) {
+        wrapPending = false;
+        String params = rawParams;
+        while (!params.isEmpty()) {
+            char first = params.charAt(0);
+            if (first == '?' || first == '>' || first == '!' || first == '=') {
+                params = params.substring(1);
+            } else {
+                break;
+            }
+        }
+        List<Integer> values = parseParams(params);
+        switch (command) {
+            case 'm':
+                applySgr(values);
+                break;
+            case 'H':
+            case 'f':
+                cursorRow = clamp(param(values, 0, 1) - 1, 0, rows - 1);
+                cursorCol = clamp(param(values, 1, 1) - 1, 0, cols - 1);
+                break;
+            case 'A':
+                cursorRow = clamp(cursorRow - param(values, 0, 1), 0, rows - 1);
+                break;
+            case 'B':
+                cursorRow = clamp(cursorRow + param(values, 0, 1), 0, rows - 1);
+                break;
+            case 'C':
+                cursorCol = clamp(cursorCol + param(values, 0, 1), 0, cols - 1);
+                break;
+            case 'D':
+                cursorCol = clamp(cursorCol - param(values, 0, 1), 0, cols - 1);
+                break;
+            case 'G':
+                cursorCol = clamp(param(values, 0, 1) - 1, 0, cols - 1);
+                break;
+            case 'd':
+                cursorRow = clamp(param(values, 0, 1) - 1, 0, rows - 1);
+                break;
+            case 'J':
+                eraseDisplay(param(values, 0, 0));
+                break;
+            case 'K':
+                eraseLine(param(values, 0, 0));
+                break;
+            case 'P':
+                deleteChars(param(values, 0, 1));
+                break;
+            case '@':
+                insertChars(param(values, 0, 1));
+                break;
+            case 'X':
+                eraseChars(param(values, 0, 1));
+                break;
+            case 'L':
+                insertLines(param(values, 0, 1));
+                break;
+            case 'M':
+                deleteLines(param(values, 0, 1));
+                break;
+            case 's':
+                saveCursor();
+                break;
+            case 'u':
+                restoreCursor();
+                break;
+            case 'c':
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void applySgr(List<Integer> values) {
+        if (values.isEmpty()) {
+            values.add(0);
+        }
+        for (int index = 0; index < values.size(); index++) {
+            int value = values.get(index);
+            if (value == 0) {
+                fg = DEFAULT_FG;
+                bg = DEFAULT_BG;
+                bold = false;
+            } else if (value == 1) {
+                bold = true;
+            } else if (value == 22) {
+                bold = false;
+            } else if (value == 39) {
+                fg = DEFAULT_FG;
+            } else if (value == 49) {
+                bg = DEFAULT_BG;
+            } else if ((value >= 30 && value <= 37) || (value >= 90 && value <= 97)) {
+                fg = ansiColor(value, false);
+            } else if ((value >= 40 && value <= 47) || (value >= 100 && value <= 107)) {
+                bg = ansiColor(value, true);
+            } else if ((value == 38 || value == 48) && index + 2 < values.size()) {
+                boolean background = value == 48;
+                int mode = values.get(index + 1);
+                if (mode == 5) {
+                    int color = xtermColor(values.get(index + 2));
+                    if (background) {
+                        bg = color;
+                    } else {
+                        fg = color;
+                    }
+                    index += 2;
+                } else if (mode == 2 && index + 4 < values.size()) {
+                    int color = Color.rgb(
+                            clamp(values.get(index + 2), 0, 255),
+                            clamp(values.get(index + 3), 0, 255),
+                            clamp(values.get(index + 4), 0, 255)
+                    );
+                    if (background) {
+                        bg = color;
+                    } else {
+                        fg = color;
+                    }
+                    index += 4;
+                }
+            }
+        }
+    }
+
+    private void putChar(char value) {
+        if (wrapPending) {
+            wrapPending = false;
+            newLine();
+        }
+        cells[cursorRow][cursorCol].set(value, fg, bg, bold);
+        if (cursorCol == cols - 1) {
+            wrapPending = true;
+        } else {
+            cursorCol++;
+        }
+    }
+
+    private void newLine() {
+        wrapPending = false;
+        cursorRow++;
+        if (cursorRow >= rows) {
+            scrollUp(1);
+            cursorRow = rows - 1;
+        }
+        cursorCol = 0;
+    }
+
+    private void reverseIndex() {
+        if (cursorRow == 0) {
+            scrollDown(1);
+        } else {
+            cursorRow--;
+        }
+    }
+
+    private void eraseDisplay(int mode) {
+        if (mode == 2 || mode == 3) {
+            clearScreen();
+        } else if (mode == 1) {
+            for (int row = 0; row < cursorRow; row++) {
+                clearLine(row, 0, cols - 1);
+            }
+            clearLine(cursorRow, 0, cursorCol);
+        } else {
+            clearLine(cursorRow, cursorCol, cols - 1);
+            for (int row = cursorRow + 1; row < rows; row++) {
+                clearLine(row, 0, cols - 1);
+            }
+        }
+    }
+
+    private void eraseLine(int mode) {
+        if (mode == 2) {
+            clearLine(cursorRow, 0, cols - 1);
+        } else if (mode == 1) {
+            clearLine(cursorRow, 0, cursorCol);
+        } else {
+            clearLine(cursorRow, cursorCol, cols - 1);
+        }
+    }
+
+    private void eraseChars(int count) {
+        int end = Math.min(cols - 1, cursorCol + Math.max(1, count) - 1);
+        clearLine(cursorRow, cursorCol, end);
+    }
+
+    private void deleteChars(int count) {
+        count = Math.max(1, count);
+        Cell[] line = cells[cursorRow];
+        for (int col = cursorCol; col < cols; col++) {
+            int source = col + count;
+            if (source < cols) {
+                line[col].copyFrom(line[source]);
+            } else {
+                line[col].clear();
+            }
+        }
+    }
+
+    private void insertChars(int count) {
+        count = Math.max(1, count);
+        Cell[] line = cells[cursorRow];
+        for (int col = cols - 1; col >= cursorCol; col--) {
+            int source = col - count;
+            if (source >= cursorCol) {
+                line[col].copyFrom(line[source]);
+            } else {
+                line[col].clear();
+            }
+        }
+    }
+
+    private void insertLines(int count) {
+        count = Math.min(Math.max(1, count), rows - cursorRow);
+        for (int row = rows - 1; row >= cursorRow + count; row--) {
+            copyLine(row, row - count);
+        }
+        for (int row = cursorRow; row < cursorRow + count; row++) {
+            clearLine(row, 0, cols - 1);
+        }
+    }
+
+    private void deleteLines(int count) {
+        count = Math.min(Math.max(1, count), rows - cursorRow);
+        for (int row = cursorRow; row + count < rows; row++) {
+            copyLine(row, row + count);
+        }
+        for (int row = rows - count; row < rows; row++) {
+            clearLine(row, 0, cols - 1);
+        }
+    }
+
+    private void clearScreen() {
+        for (int row = 0; row < rows; row++) {
+            clearLine(row, 0, cols - 1);
+        }
+    }
+
+    private void clearLine(int row, int start, int end) {
+        start = clamp(start, 0, cols - 1);
+        end = clamp(end, 0, cols - 1);
+        for (int col = start; col <= end; col++) {
+            cells[row][col].clear();
+        }
+    }
+
+    private void scrollUp(int count) {
+        count = Math.min(Math.max(1, count), rows);
+        for (int row = 0; row + count < rows; row++) {
+            copyLine(row, row + count);
+        }
+        for (int row = rows - count; row < rows; row++) {
+            clearLine(row, 0, cols - 1);
+        }
+    }
+
+    private void scrollDown(int count) {
+        count = Math.min(Math.max(1, count), rows);
+        for (int row = rows - 1; row - count >= 0; row--) {
+            copyLine(row, row - count);
+        }
+        for (int row = 0; row < count; row++) {
+            clearLine(row, 0, cols - 1);
+        }
+    }
+
+    private void copyLine(int target, int source) {
+        for (int col = 0; col < cols; col++) {
+            cells[target][col].copyFrom(cells[source][col]);
+        }
+    }
+
+    private void appendRow(SpannableStringBuilder output, int row) {
+        int col = 0;
+        while (col < cols) {
+            Cell first = cells[row][col];
+            int start = output.length();
+            int fgColor = first.fg;
+            int bgColor = first.bg;
+            boolean isBold = first.bold;
+            while (col < cols) {
+                Cell cell = cells[row][col];
+                if (cell.fg != fgColor || cell.bg != bgColor || cell.bold != isBold) {
+                    break;
+                }
+                output.append(cell.value);
+                col++;
+            }
+            int end = output.length();
+            output.setSpan(new ForegroundColorSpan(fgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            if (bgColor != DEFAULT_BG) {
+                output.setSpan(new BackgroundColorSpan(bgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+            if (isBold) {
+                output.setSpan(new StyleSpan(Typeface.BOLD), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+        }
+    }
+
+    private void saveCursor() {
+        savedRow = cursorRow;
+        savedCol = cursorCol;
+    }
+
+    private void restoreCursor() {
+        cursorRow = clamp(savedRow, 0, rows - 1);
+        cursorCol = clamp(savedCol, 0, cols - 1);
+    }
+
+    private int skipStringEscape(String text, int start) {
+        int cursor = start;
+        while (cursor < text.length()) {
+            char item = text.charAt(cursor);
+            if (item == '\u0007') {
+                return cursor + 1;
+            }
+            if (item == '\u001b' && cursor + 1 < text.length() && text.charAt(cursor + 1) == '\\') {
+                return cursor + 2;
+            }
+            cursor++;
+        }
+        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);
+            if (item >= '@' && item <= '~') {
+                return index;
+            }
+        }
+        return -1;
+    }
+
+    private List<Integer> parseParams(String params) {
+        List<Integer> values = new ArrayList<>();
+        if (params.isEmpty()) {
+            return values;
+        }
+        String[] parts = params.split(";", -1);
+        for (String part : parts) {
+            String cleaned = part.trim();
+            if (cleaned.isEmpty()) {
+                values.add(0);
+                continue;
+            }
+            try {
+                values.add(Integer.parseInt(cleaned));
+            } catch (NumberFormatException ignored) {
+                values.add(0);
+            }
+        }
+        return values;
+    }
+
+    private int param(List<Integer> values, int index, int fallback) {
+        if (index >= values.size()) {
+            return fallback;
+        }
+        int value = values.get(index);
+        return value == 0 ? fallback : value;
+    }
+
+    private int ansiColor(int code, boolean background) {
+        int base = background ? (code >= 100 ? code - 100 : code - 40) : (code >= 90 ? code - 90 : code - 30);
+        boolean bright = code >= 90;
+        switch (base) {
+            case 0:
+                return bright ? Color.rgb(80, 88, 100) : Color.rgb(33, 38, 45);
+            case 1:
+                return bright ? Color.rgb(255, 123, 114) : Color.rgb(248, 81, 73);
+            case 2:
+                return bright ? Color.rgb(86, 211, 100) : Color.rgb(63, 185, 80);
+            case 3:
+                return bright ? Color.rgb(234, 179, 8) : Color.rgb(210, 153, 34);
+            case 4:
+                return bright ? Color.rgb(121, 192, 255) : Color.rgb(88, 166, 255);
+            case 5:
+                return bright ? Color.rgb(210, 168, 255) : Color.rgb(188, 140, 255);
+            case 6:
+                return bright ? Color.rgb(86, 211, 219) : Color.rgb(57, 197, 187);
+            case 7:
+            default:
+                return bright ? Color.rgb(240, 246, 252) : Color.rgb(201, 209, 217);
+        }
+    }
+
+    private int xtermColor(int value) {
+        value = clamp(value, 0, 255);
+        if (value < 16) {
+            if (value < 8) {
+                return ansiColor(30 + value, false);
+            }
+            return ansiColor(90 + value - 8, false);
+        }
+        if (value >= 232) {
+            int shade = 8 + (value - 232) * 10;
+            return Color.rgb(shade, shade, shade);
+        }
+        int index = value - 16;
+        int red = xtermComponent(index / 36);
+        int green = xtermComponent((index / 6) % 6);
+        int blue = xtermComponent(index % 6);
+        return Color.rgb(red, green, blue);
+    }
+
+    private int xtermComponent(int value) {
+        return value == 0 ? 0 : 55 + value * 40;
+    }
+
+    private static int clamp(int value, int min, int max) {
+        return Math.max(min, Math.min(max, value));
+    }
+
+    private static final class Cell {
+        char value = ' ';
+        int fg = DEFAULT_FG;
+        int bg = DEFAULT_BG;
+        boolean bold;
+
+        void clear() {
+            value = ' ';
+            fg = DEFAULT_FG;
+            bg = DEFAULT_BG;
+            bold = false;
+        }
+
+        void set(char nextValue, int nextFg, int nextBg, boolean nextBold) {
+            value = nextValue;
+            fg = nextFg;
+            bg = nextBg;
+            bold = nextBold;
+        }
+
+        void copyFrom(Cell other) {
+            value = other.value;
+            fg = other.fg;
+            bg = other.bg;
+            bold = other.bold;
+        }
+    }
+}