Skip to content

Added: Add support for sending terminal cursor position to accessibil… #4539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gamegame12 wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −2
Open

Added: Add support for sending terminal cursor position to accessibil… #4539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions terminal-view/src/main/java/com/termux/view/TerminalView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewTreeObserver;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.autofill.AutofillValue;
import android.view.inputmethod.BaseInputConnection;
Expand All @@ -35,6 +36,7 @@
import com.termux.terminal.KeyHandler;
import com.termux.terminal.TerminalEmulator;
import com.termux.terminal.TerminalSession;
import com.termux.view.accessibility.TerminalAccessibilityDelegate;
import com.termux.view.textselection.TextSelectionCursorController;

/** View displaying and interacting with a {@link TerminalSession}. */
Expand Down Expand Up @@ -217,6 +219,7 @@ public void onLongPress(MotionEvent event) {
mScroller = new Scroller(context);
AccessibilityManager am = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
mAccessibilityEnabled = am.isEnabled();
setAccessibilityDelegate(new TerminalAccessibilityDelegate(this));
}


Expand Down Expand Up @@ -443,7 +446,9 @@ public void onScreenUpdated() {
mEmulator.clearScrollCounter();

invalidate();
if (mAccessibilityEnabled) setContentDescription(getText());

if (mAccessibilityEnabled)
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED);
}

/**
Expand Down Expand Up @@ -938,7 +943,7 @@ public TerminalSession getCurrentSession() {
return mTermSession;
}

private CharSequence getText() {
public CharSequence getText() {
return mEmulator.getScreen().getSelectedText(0, mTopRow, mEmulator.mColumns, mTopRow + mEmulator.mRows);
}

Expand Down
39 changes: 39 additions & 0 deletions terminal-view/src/main/java/com/termux/view/accessibility/TerminalAccessibilityDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.termux.view.accessibility;

import android.os.Bundle;
import android.view.View;
import android.view.accessibility.AccessibilityNodeInfo;

import androidx.annotation.NonNull;

import com.termux.view.TerminalView;

public class TerminalAccessibilityDelegate extends View.AccessibilityDelegate {

private static final String LOG_TAG = "TerminalAccessibilityDelegate";

public static String EXTRA_ACCESSIBILITY_NODE_TYPE = "accessibility-node-type";
public static String EXTRA_TERMINAL_CURSOR_COL = "terminal-cursor-col";
public static String EXTRA_TERMINAL_CURSOR_ROW = "terminal-cursor-row";

private final TerminalView mTerminalView;

public TerminalAccessibilityDelegate(@NonNull TerminalView terminalView) {
mTerminalView = terminalView;
}

@Override
public void onInitializeAccessibilityNodeInfo(@NonNull View host, @NonNull AccessibilityNodeInfo info) {
mTerminalView.mClient.logInfo(LOG_TAG, "onInitializeAccessibilityNodeInfo");
super.onInitializeAccessibilityNodeInfo(host, info);
Bundle extra = info.getExtras();
if (mTerminalView.mEmulator != null) {
extra.putString(EXTRA_ACCESSIBILITY_NODE_TYPE, "terminal");
extra.putInt(EXTRA_TERMINAL_CURSOR_COL, mTerminalView.mEmulator.getCursorCol());
extra.putInt(EXTRA_TERMINAL_CURSOR_ROW, mTerminalView.mEmulator.getCursorRow());
mTerminalView.mClient.logInfo(LOG_TAG, "col=" + mTerminalView.mEmulator.getCursorCol() + ", row=" + mTerminalView.mEmulator.getCursorRow());
}

info.setContentDescription(mTerminalView.getText());
}
}