mirror of https://github.com/termux/termux-app
Rename TerminalKeyListener to TerminalViewClient
This commit is contained in:
parent
7d3a988d2f
commit
63adb2b132
|
@ -213,7 +213,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
|
|||
|
||||
setContentView(R.layout.drawer_layout);
|
||||
mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
|
||||
mTerminalView.setOnKeyListener(new TermuxKeyListener(this));
|
||||
mTerminalView.setOnKeyListener(new TermuxViewClient(this));
|
||||
|
||||
mTerminalView.setTextSize(mSettings.getFontSize());
|
||||
mFullScreenHelper.setImmersive(mSettings.isFullScreen());
|
||||
|
|
|
@ -12,18 +12,18 @@ import android.view.inputmethod.InputMethodManager;
|
|||
import com.termux.terminal.KeyHandler;
|
||||
import com.termux.terminal.TerminalEmulator;
|
||||
import com.termux.terminal.TerminalSession;
|
||||
import com.termux.view.TerminalKeyListener;
|
||||
import com.termux.view.TerminalViewClient;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public final class TermuxKeyListener implements TerminalKeyListener {
|
||||
public final class TermuxViewClient implements TerminalViewClient {
|
||||
|
||||
final TermuxActivity mActivity;
|
||||
|
||||
/** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
|
||||
boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
|
||||
|
||||
public TermuxKeyListener(TermuxActivity activity) {
|
||||
public TermuxViewClient(TermuxActivity activity) {
|
||||
this.mActivity = activity;
|
||||
}
|
||||
|
|
@ -87,7 +87,7 @@ public class TermuxFloatView extends LinearLayout {
|
|||
|
||||
public void initializeFloatingWindow() {
|
||||
mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
|
||||
mTerminalView.setOnKeyListener(new TermuxFloatKeyListener(this));
|
||||
mTerminalView.setOnKeyListener(new TermuxFloatViewClient(this));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -10,9 +10,9 @@ import android.view.inputmethod.InputMethodManager;
|
|||
import com.termux.terminal.KeyHandler;
|
||||
import com.termux.terminal.TerminalEmulator;
|
||||
import com.termux.terminal.TerminalSession;
|
||||
import com.termux.view.TerminalKeyListener;
|
||||
import com.termux.view.TerminalViewClient;
|
||||
|
||||
public class TermuxFloatKeyListener implements TerminalKeyListener {
|
||||
public class TermuxFloatViewClient implements TerminalViewClient {
|
||||
|
||||
private final TermuxFloatView view;
|
||||
/**
|
||||
|
@ -20,7 +20,7 @@ public class TermuxFloatKeyListener implements TerminalKeyListener {
|
|||
*/
|
||||
boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
|
||||
|
||||
public TermuxFloatKeyListener(TermuxFloatView view) {
|
||||
public TermuxFloatViewClient(TermuxFloatView view) {
|
||||
this.view = view;
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ public final class TerminalView extends View {
|
|||
|
||||
TerminalRenderer mRenderer;
|
||||
|
||||
TerminalKeyListener mOnKeyListener;
|
||||
TerminalViewClient mClient;
|
||||
|
||||
/** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
|
||||
int mTopRow;
|
||||
|
@ -105,7 +105,7 @@ public final class TerminalView extends View {
|
|||
requestFocus();
|
||||
if (!mEmulator.isMouseTrackingActive()) {
|
||||
if (!e.isFromSource(InputDevice.SOURCE_MOUSE)) {
|
||||
mOnKeyListener.onSingleTapUp(e);
|
||||
mClient.onSingleTapUp(e);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -135,7 +135,7 @@ public final class TerminalView extends View {
|
|||
public boolean onScale(float focusX, float focusY, float scale) {
|
||||
if (mEmulator == null || mIsSelectingText) return true;
|
||||
mScaleFactor *= scale;
|
||||
mScaleFactor = mOnKeyListener.onScale(mScaleFactor);
|
||||
mScaleFactor = mClient.onScale(mScaleFactor);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -189,7 +189,7 @@ public final class TerminalView extends View {
|
|||
@Override
|
||||
public void onLongPress(MotionEvent e) {
|
||||
if (mGestureRecognizer.isInProgress()) return;
|
||||
if (mOnKeyListener.onLongPress(e)) return;
|
||||
if (mClient.onLongPress(e)) return;
|
||||
if (!mIsSelectingText) {
|
||||
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
|
||||
toggleSelectingText(e);
|
||||
|
@ -203,8 +203,8 @@ public final class TerminalView extends View {
|
|||
* @param onKeyListener Listener for all kinds of key events, both hardware and IME (which makes it different from that
|
||||
* available with {@link View#setOnKeyListener(OnKeyListener)}.
|
||||
*/
|
||||
public void setOnKeyListener(TerminalKeyListener onKeyListener) {
|
||||
this.mOnKeyListener = onKeyListener;
|
||||
public void setOnKeyListener(TerminalViewClient onKeyListener) {
|
||||
this.mClient = onKeyListener;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -556,7 +556,7 @@ public final class TerminalView extends View {
|
|||
if (mIsSelectingText) {
|
||||
toggleSelectingText(null);
|
||||
return true;
|
||||
} else if (mOnKeyListener.shouldBackButtonBeMappedToEscape()) {
|
||||
} else if (mClient.shouldBackButtonBeMappedToEscape()) {
|
||||
// Intercept back button to treat it as escape:
|
||||
switch (event.getAction()) {
|
||||
case KeyEvent.ACTION_DOWN:
|
||||
|
@ -575,10 +575,10 @@ public final class TerminalView extends View {
|
|||
Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
|
||||
if (mEmulator == null) return true;
|
||||
|
||||
if (mOnKeyListener.onKeyDown(keyCode, event, mTermSession)) {
|
||||
if (mClient.onKeyDown(keyCode, event, mTermSession)) {
|
||||
invalidate();
|
||||
return true;
|
||||
} else if (event.isSystem() && (!mOnKeyListener.shouldBackButtonBeMappedToEscape() || keyCode != KeyEvent.KEYCODE_BACK)) {
|
||||
} else if (event.isSystem() && (!mClient.shouldBackButtonBeMappedToEscape() || keyCode != KeyEvent.KEYCODE_BACK)) {
|
||||
return super.onKeyDown(keyCode, event);
|
||||
} else if (event.getAction() == KeyEvent.ACTION_MULTIPLE && keyCode == KeyEvent.KEYCODE_UNKNOWN) {
|
||||
mTermSession.write(event.getCharacters());
|
||||
|
@ -642,10 +642,10 @@ public final class TerminalView extends View {
|
|||
+ leftAltDownFromEvent + ")");
|
||||
}
|
||||
|
||||
final boolean controlDown = controlDownFromEvent || mOnKeyListener.readControlKey();
|
||||
final boolean altDown = leftAltDownFromEvent || mOnKeyListener.readAltKey();
|
||||
final boolean controlDown = controlDownFromEvent || mClient.readControlKey();
|
||||
final boolean altDown = leftAltDownFromEvent || mClient.readAltKey();
|
||||
|
||||
if (mOnKeyListener.onCodePoint(codePoint, controlDown, mTermSession)) return;
|
||||
if (mClient.onCodePoint(codePoint, controlDown, mTermSession)) return;
|
||||
|
||||
if (controlDown) {
|
||||
if (codePoint >= 'a' && codePoint <= 'z') {
|
||||
|
@ -714,7 +714,7 @@ public final class TerminalView extends View {
|
|||
Log.i(EmulatorDebug.LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
|
||||
if (mEmulator == null) return true;
|
||||
|
||||
if (mOnKeyListener.onKeyUp(keyCode, event)) {
|
||||
if (mClient.onKeyUp(keyCode, event)) {
|
||||
invalidate();
|
||||
return true;
|
||||
} else if (event.isSystem()) {
|
||||
|
@ -782,7 +782,7 @@ public final class TerminalView extends View {
|
|||
@TargetApi(23)
|
||||
public void toggleSelectingText(MotionEvent ev) {
|
||||
mIsSelectingText = !mIsSelectingText;
|
||||
mOnKeyListener.copyModeChanged(mIsSelectingText);
|
||||
mClient.copyModeChanged(mIsSelectingText);
|
||||
|
||||
if (mIsSelectingText) {
|
||||
if (mLeftSelectionHandle == null) {
|
||||
|
|
|
@ -8,11 +8,10 @@ import com.termux.terminal.TerminalSession;
|
|||
|
||||
/**
|
||||
* Input and scale listener which may be set on a {@link TerminalView} through
|
||||
* {@link TerminalView#setOnKeyListener(TerminalKeyListener)}.
|
||||
* {@link TerminalView#setOnKeyListener(TerminalViewClient)}.
|
||||
* <p/>
|
||||
* TODO: Rename to TerminalViewClient.
|
||||
*/
|
||||
public interface TerminalKeyListener {
|
||||
public interface TerminalViewClient {
|
||||
|
||||
/**
|
||||
* Callback function on scale events according to {@link ScaleGestureDetector#getScaleFactor()}.
|
Loading…
Reference in New Issue