fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-07 03:05:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename TerminalKeyListener to TerminalViewClient

Browse Source
This commit is contained in:
Fredrik Fornwall
2017-04-02 14:25:34 +02:00
parent 7d3a988d2f
commit 63adb2b132
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/termux/app/TermuxActivity.java
View File

@@ -213,7 +213,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
setContentView(R.layout.drawer_layout); setContentView(R.layout.drawer_layout);
mTerminalView = (TerminalView) findViewById(R.id.terminal_view); mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
mTerminalView.setOnKeyListener(new TermuxKeyListener(this)); mTerminalView.setOnKeyListener(new TermuxViewClient(this));
mTerminalView.setTextSize(mSettings.getFontSize()); mTerminalView.setTextSize(mSettings.getFontSize());
mFullScreenHelper.setImmersive(mSettings.isFullScreen()); mFullScreenHelper.setImmersive(mSettings.isFullScreen());

6
app/src/main/java/com/termux/app/TermuxKeyListener.java → app/src/main/java/com/termux/app/TermuxViewClient.java
View File

@@ -12,18 +12,18 @@ import android.view.inputmethod.InputMethodManager;
import com.termux.terminal.KeyHandler; import com.termux.terminal.KeyHandler;
import com.termux.terminal.TerminalEmulator; import com.termux.terminal.TerminalEmulator;
import com.termux.terminal.TerminalSession; import com.termux.terminal.TerminalSession;
import com.termux.view.TerminalKeyListener; import com.termux.view.TerminalViewClient;
import java.util.List; import java.util.List;
public final class TermuxKeyListener implements TerminalKeyListener { public final class TermuxViewClient implements TerminalViewClient {
final TermuxActivity mActivity; final TermuxActivity mActivity;
/** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */ /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */
boolean mVirtualControlKeyDown, mVirtualFnKeyDown; boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
public TermuxKeyListener(TermuxActivity activity) { public TermuxViewClient(TermuxActivity activity) {
this.mActivity = activity; this.mActivity = activity;
} }

2
float/src/main/java/com/termux/window/TermuxFloatView.java
View File

@@ -87,7 +87,7 @@ public class TermuxFloatView extends LinearLayout {
public void initializeFloatingWindow() { public void initializeFloatingWindow() {
mTerminalView = (TerminalView) findViewById(R.id.terminal_view); mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
mTerminalView.setOnKeyListener(new TermuxFloatKeyListener(this)); mTerminalView.setOnKeyListener(new TermuxFloatViewClient(this));
} }
@Override @Override

6
float/src/main/java/com/termux/window/TermuxFloatKeyListener.java → float/src/main/java/com/termux/window/TermuxFloatViewClient.java
View File

@@ -10,9 +10,9 @@ import android.view.inputmethod.InputMethodManager;
import com.termux.terminal.KeyHandler; import com.termux.terminal.KeyHandler;
import com.termux.terminal.TerminalEmulator; import com.termux.terminal.TerminalEmulator;
import com.termux.terminal.TerminalSession; 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; private final TermuxFloatView view;
/** /**
@@ -20,7 +20,7 @@ public class TermuxFloatKeyListener implements TerminalKeyListener {
*/ */
boolean mVirtualControlKeyDown, mVirtualFnKeyDown; boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
public TermuxFloatKeyListener(TermuxFloatView view) { public TermuxFloatViewClient(TermuxFloatView view) {
this.view = view; this.view = view;
} }

28
terminal-view/src/main/java/com/termux/view/TerminalView.java
View File

@@ -48,7 +48,7 @@ public final class TerminalView extends View {
TerminalRenderer mRenderer; TerminalRenderer mRenderer;
TerminalKeyListener mOnKeyListener; TerminalViewClient mClient;
/** The top row of text to display. Ranges from -activeTranscriptRows to 0. */ /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */
int mTopRow; int mTopRow;
@@ -105,7 +105,7 @@ public final class TerminalView extends View {
requestFocus(); requestFocus();
if (!mEmulator.isMouseTrackingActive()) { if (!mEmulator.isMouseTrackingActive()) {
if (!e.isFromSource(InputDevice.SOURCE_MOUSE)) { if (!e.isFromSource(InputDevice.SOURCE_MOUSE)) {
mOnKeyListener.onSingleTapUp(e); mClient.onSingleTapUp(e);
return true; return true;
} }
} }
@@ -135,7 +135,7 @@ public final class TerminalView extends View {
public boolean onScale(float focusX, float focusY, float scale) { public boolean onScale(float focusX, float focusY, float scale) {
if (mEmulator == null || mIsSelectingText) return true; if (mEmulator == null || mIsSelectingText) return true;
mScaleFactor *= scale; mScaleFactor *= scale;
mScaleFactor = mOnKeyListener.onScale(mScaleFactor); mScaleFactor = mClient.onScale(mScaleFactor);
return true; return true;
} }
@@ -189,7 +189,7 @@ public final class TerminalView extends View {
@Override @Override
public void onLongPress(MotionEvent e) { public void onLongPress(MotionEvent e) {
if (mGestureRecognizer.isInProgress()) return; if (mGestureRecognizer.isInProgress()) return;
if (mOnKeyListener.onLongPress(e)) return; if (mClient.onLongPress(e)) return;
if (!mIsSelectingText) { if (!mIsSelectingText) {
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
toggleSelectingText(e); 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 * @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)}. * available with {@link View#setOnKeyListener(OnKeyListener)}.
*/ */
public void setOnKeyListener(TerminalKeyListener onKeyListener) { public void setOnKeyListener(TerminalViewClient onKeyListener) {
this.mOnKeyListener = onKeyListener; this.mClient = onKeyListener;
} }
/** /**
@@ -556,7 +556,7 @@ public final class TerminalView extends View {
if (mIsSelectingText) { if (mIsSelectingText) {
toggleSelectingText(null); toggleSelectingText(null);
return true; return true;
} else if (mOnKeyListener.shouldBackButtonBeMappedToEscape()) { } else if (mClient.shouldBackButtonBeMappedToEscape()) {
// Intercept back button to treat it as escape: // Intercept back button to treat it as escape:
switch (event.getAction()) { switch (event.getAction()) {
case KeyEvent.ACTION_DOWN: 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 + ")"); Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")");
if (mEmulator == null) return true; if (mEmulator == null) return true;
if (mOnKeyListener.onKeyDown(keyCode, event, mTermSession)) { if (mClient.onKeyDown(keyCode, event, mTermSession)) {
invalidate(); invalidate();
return true; 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); return super.onKeyDown(keyCode, event);
} else if (event.getAction() == KeyEvent.ACTION_MULTIPLE && keyCode == KeyEvent.KEYCODE_UNKNOWN) { } else if (event.getAction() == KeyEvent.ACTION_MULTIPLE && keyCode == KeyEvent.KEYCODE_UNKNOWN) {
mTermSession.write(event.getCharacters()); mTermSession.write(event.getCharacters());
@@ -642,10 +642,10 @@ public final class TerminalView extends View {
+ leftAltDownFromEvent + ")"); + leftAltDownFromEvent + ")");
} }
final boolean controlDown = controlDownFromEvent || mOnKeyListener.readControlKey(); final boolean controlDown = controlDownFromEvent || mClient.readControlKey();
final boolean altDown = leftAltDownFromEvent || mOnKeyListener.readAltKey(); final boolean altDown = leftAltDownFromEvent || mClient.readAltKey();
if (mOnKeyListener.onCodePoint(codePoint, controlDown, mTermSession)) return; if (mClient.onCodePoint(codePoint, controlDown, mTermSession)) return;
if (controlDown) { if (controlDown) {
if (codePoint >= 'a' && codePoint <= 'z') { 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 + ")"); Log.i(EmulatorDebug.LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
if (mEmulator == null) return true; if (mEmulator == null) return true;
if (mOnKeyListener.onKeyUp(keyCode, event)) { if (mClient.onKeyUp(keyCode, event)) {
invalidate(); invalidate();
return true; return true;
} else if (event.isSystem()) { } else if (event.isSystem()) {
@@ -782,7 +782,7 @@ public final class TerminalView extends View {
@TargetApi(23) @TargetApi(23)
public void toggleSelectingText(MotionEvent ev) { public void toggleSelectingText(MotionEvent ev) {
mIsSelectingText = !mIsSelectingText; mIsSelectingText = !mIsSelectingText;
mOnKeyListener.copyModeChanged(mIsSelectingText); mClient.copyModeChanged(mIsSelectingText);
if (mIsSelectingText) { if (mIsSelectingText) {
if (mLeftSelectionHandle == null) { if (mLeftSelectionHandle == null) {

5
terminal-view/src/main/java/com/termux/view/TerminalKeyListener.java → terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
View File

@@ -8,11 +8,10 @@ import com.termux.terminal.TerminalSession;
/** /**
* Input and scale listener which may be set on a {@link TerminalView} through * Input and scale listener which may be set on a {@link TerminalView} through
* {@link TerminalView#setOnKeyListener(TerminalKeyListener)}. * {@link TerminalView#setOnKeyListener(TerminalViewClient)}.
* <p/> * <p/>
* TODO: Rename to TerminalViewClient.
*/ */
public interface TerminalKeyListener { public interface TerminalViewClient {
/** /**
* Callback function on scale events according to {@link ScaleGestureDetector#getScaleFactor()}. * Callback function on scale events according to {@link ScaleGestureDetector#getScaleFactor()}.