diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
index 21d6518785..d8b3585c7e 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
@@ -455,6 +455,17 @@ public void setChar(int column, int row, int codePoint, long style) {
allocateFullLineIfNecessary(row).setChar(column, codePoint, style);
}
+ /** used to read aloud the character under the cursor in A11Y */
+ public Character getChar(int column, int row) {
+ if (row < 0 || row >= mScreenRows || column < 0 || column >= mColumns)
+ throw new IllegalArgumentException("TerminalBuffer.setChar(): row=" + row + ", column=" + column + ", mScreenRows=" + mScreenRows + ", mColumns=" + mColumns);
+ row = externalToInternalRow(row);
+ if(column < mLines[row].mText.length)
+ return mLines[row].mText[column];
+ else
+ return null;
+ }
+
public long getStyleAt(int externalRow, int column) {
return allocateFullLineIfNecessary(externalToInternalRow(externalRow)).getStyle(column);
}
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
index cbbccbb4f2..94bb939ecc 100644
--- a/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -2443,6 +2443,11 @@ public String getSelectedText(int x1, int y1, int x2, int y2) {
return mScreen.getSelectedText(x1, y1, x2, y2);
}
+ /** used to read aloud the character under the cursor in A11Y */
+ public Character getChar(int x, int y) {
+ return mScreen.getChar(x, y);
+ }
+
/** Get the terminal session's title (null if not set). */
public String getTitle() {
return mTitle;
diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
index b4254a9832..3412c9d807 100644
--- a/terminal-view/src/main/java/com/termux/view/TerminalView.java
+++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java
@@ -9,6 +9,7 @@
import android.graphics.Canvas;
import android.graphics.Typeface;
import android.os.Build;
+import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
@@ -27,11 +28,14 @@
import android.view.ViewConfiguration;
import android.view.ViewTreeObserver;
import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
import android.view.autofill.AutofillValue;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.widget.Scroller;
+import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -221,6 +225,10 @@ public void onLongPress(MotionEvent event) {
mScroller = new Scroller(context);
AccessibilityManager am = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
mAccessibilityEnabled = am.isEnabled();
+
+ // A view is important for accessibility if it fires accessibility events
+ // and if it is reported to accessibility services that query the screen.
+ setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
}
@@ -457,7 +465,158 @@ public void onScreenUpdated(boolean skipScrolling) {
mEmulator.clearScrollCounter();
invalidate();
- if (mAccessibilityEnabled) setContentDescription(getText());
+ if (mAccessibilityEnabled) {
+ // fire off events that the content of this control changed,
+ // so that the accessibility service gets the updated text
+ sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED);
+ }
+ }
+
+ // ultimately called as a result of the code in updateScreen
+ @Override
+ public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
+ super.onPopulateAccessibilityEvent(event);
+
+ // add our (most up to date) text
+ final CharSequence text = getText();
+ if (!TextUtils.isEmpty(text)) {
+ event.getText().add(text);
+ }
+ }
+
+ // called by accessibility service exploring what's available
+ @Override
+ public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo node) {
+ super.onInitializeAccessibilityNodeInfo(node);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ node.setImportantForAccessibility(true);
+ }
+
+ final CharSequence text = getText();
+ node.setText(text);
+
+ // why only if text is non-empty? cargo cult, core TextView does this check,
+ // and the accessibility guide example also does this check, who am I to argue
+ if (!TextUtils.isEmpty(text)) {
+ // all granularities are valid, don't let the accessibility system guess;
+ // this allows a TalkBack user to navigate by char/word/paragraph within
+ // the TerminalView text only without accidently breaking out; other navigation
+ // modes such as default/controls allow you to move to other controls
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_NEXT_AT_MOVEMENT_GRANULARITY);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY);
+ node.setMovementGranularities(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER
+ | AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD
+ | AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE
+ | AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH
+ | AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE);
+
+ // add more selection actions
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_SELECTION);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLEAR_SELECTION);
+ }
+
+ // behave more like a multiline text view
+ node.setEditable(true);
+ node.setMultiLine(true);
+ node.setScrollable(true);
+ node.setCanOpenPopup(true);
+
+ // add actions that you can do on this thing
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_FOCUS);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_COPY);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_PASTE);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_FORWARD);
+ node.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_BACKWARD);
+
+ // Add accessibility actions
+
+ node.addAction(new AccessibilityNodeInfo.AccessibilityAction(
+ R.id.a11y_speak_cursor_position,
+ getResources().getString(R.string.a11y_speak_cursor_position_text)));
+ node.addAction(new AccessibilityNodeInfo.AccessibilityAction(
+ R.id.a11y_speak_cursor_line,
+ getResources().getString(R.string.a11y_speak_cursor_line_text)));
+ // Using a different to the Copy action in the popup, which you can technically
+ // get to if someone tells you it's there. You can't have the same button label
+ // do different things in different contexts; hence, different label
+ node.addAction(new AccessibilityNodeInfo.AccessibilityAction(
+ R.id.a11y_copy_id,
+ getResources().getString(R.string.a11y_copy_screen_text)));
+ node.addAction(new AccessibilityNodeInfo.AccessibilityAction(
+ R.id.a11y_paste_id,
+ getResources().getString(R.string.paste_text)));
+ node.addAction(new AccessibilityNodeInfo.AccessibilityAction(
+ R.id.a11y_show_termux_menu_id,
+ getResources().getString(R.string.a11y_termux_menu_text)));
+ }
+
+ @Override
+ public boolean performAccessibilityAction(int action, Bundle args) {
+ // only handle custom actions here, the defaults implemented by super are good enough
+ if (action == R.id.a11y_show_termux_menu_id) {
+ showContextMenu();
+ return true;
+ } else if (action == R.id.a11y_paste_id) {
+ doPaste();
+ return true;
+ } else if (action == R.id.a11y_copy_id) {
+ // I can't quite figure out how to make TextSelectionHandleView and/or
+ // TextSelectionCursor accessible; and I can't figure out how to hook up
+ // with the Accessibility Selection (2 finger 2x tap & hold) either;
+ // so at least give people the option to copy the screen; the whole
+ // transcript might be too much, plus there's a share transcript option
+ // in the More... menu;
+ // 3 finger double tap works as copy, but editable fields elsewhere tend
+ // to offer a Copy accessibility option
+ ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+ ClipData clip = ClipData.newPlainText("screen text", getText());
+ clipboard.setPrimaryClip(clip);
+ Toast toast = Toast.makeText(
+ getContext(),
+ getResources().getText(R.string.copied_to_clipboard_text),
+ Toast.LENGTH_SHORT);
+ toast.show();
+
+ return true;
+ } else if (action == R.id.a11y_speak_cursor_position && mEmulator != null) {
+ // because TalkBack might omit speaking out whitespace or punctuation,
+ // get the character under cursor to get a better idea what "column 24" means...
+ // in conjunction with "speak line", it should give you a good idea where you are
+ Character charAtCursor = mEmulator.getChar(mEmulator.getCursorCol(), mTopRow + mEmulator.getCursorRow());
+ // get the unicode name of the character; The screen reader may be configured to not
+ // speak out punctuation, and it will probably not say " "
+ String namedCharAtCursor = charAtCursor != null
+ ? Character.getName(charAtCursor)
+ : "";
+ // Character.getName() is allowed to return null...
+ // ...and it's easy to "accidently" your terminal with an unfortunate cat
+ if (namedCharAtCursor == null)
+ namedCharAtCursor = "unknown";
+ // "line Y / nScreenLines column X / nScreenColumns. unicode_name_of_character"
+ final String text = getResources().getString(R.string.a11y_line_text) +
+ " " +
+ (mEmulator.getCursorRow() + 1) +
+ " / " +
+ mEmulator.mRows +
+ " " +
+ getResources().getString(R.string.a11y_column_text) +
+ " " +
+ (mEmulator.getCursorCol() + 1) +
+ " / " +
+ mEmulator.mColumns +
+ ". " +
+ namedCharAtCursor;
+ announceForAccessibility(text);
+ return true;
+ } else if (action == R.id.a11y_speak_cursor_line && mEmulator != null) {
+ CharSequence lineText = mEmulator.getScreen().getSelectedText(0, mTopRow + mEmulator.getCursorRow(), mEmulator.mColumns, mTopRow + mEmulator.getCursorRow());
+ announceForAccessibility(lineText);
+ return true;
+ }
+
+ return super.performAccessibilityAction(action, args);
}
/** This must be called by the hosting activity in {@link Activity#onContextMenuClosed(Menu)}
@@ -578,15 +737,7 @@ public boolean onTouchEvent(MotionEvent event) {
if (action == MotionEvent.ACTION_DOWN) showContextMenu();
return true;
} else if (event.isButtonPressed(MotionEvent.BUTTON_TERTIARY)) {
- ClipboardManager clipboardManager = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
- ClipData clipData = clipboardManager.getPrimaryClip();
- if (clipData != null) {
- ClipData.Item clipItem = clipData.getItemAt(0);
- if (clipItem != null) {
- CharSequence text = clipItem.coerceToText(getContext());
- if (!TextUtils.isEmpty(text)) mEmulator.paste(text.toString());
- }
- }
+ doPaste();
} else if (mEmulator.isMouseTrackingActive()) { // BUTTON_PRIMARY.
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
@@ -604,6 +755,18 @@ public boolean onTouchEvent(MotionEvent event) {
return true;
}
+ private void doPaste() {
+ ClipboardManager clipboardManager = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+ ClipData clipData = clipboardManager.getPrimaryClip();
+ if (clipData != null) {
+ ClipData.Item clipItem = clipData.getItemAt(0);
+ if (clipItem != null) {
+ CharSequence text = clipItem.coerceToText(getContext());
+ if (!TextUtils.isEmpty(text)) mEmulator.paste(text.toString());
+ }
+ }
+ }
+
@Override
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)
@@ -987,6 +1150,7 @@ public TerminalSession getCurrentSession() {
}
private CharSequence getText() {
+ if (mEmulator == null) return "";
return mEmulator.getScreen().getSelectedText(0, mTopRow, mEmulator.mColumns, mTopRow + mEmulator.mRows);
}
diff --git a/terminal-view/src/main/res/values/ids.xml b/terminal-view/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..88abcd8c61
--- /dev/null
+++ b/terminal-view/src/main/res/values/ids.xml
@@ -0,0 +1,8 @@
+
+
+