From 1132028bd20cbff0691d8f1e2cace5f0864816c7 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Tue, 13 Apr 2021 16:34:24 +0500 Subject: [PATCH] Add TermuxTerminalViewClientBase to com.termux.shared.terminal package and extend that in TermuxTerminalViewClient --- .../terminal/TermuxTerminalViewClient.java | 41 +------ .../TermuxTerminalViewClientBase.java | 105 ++++++++++++++++++ 2 files changed, 107 insertions(+), 39 deletions(-) create mode 100644 termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java index 39ca33d9..e906b01c 100644 --- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java +++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java @@ -21,6 +21,7 @@ import android.widget.Toast; import com.termux.R; import com.termux.app.TermuxActivity; import com.termux.shared.shell.ShellUtils; +import com.termux.shared.terminal.TermuxTerminalViewClientBase; import com.termux.shared.termux.TermuxConstants; import com.termux.app.activities.ReportActivity; import com.termux.app.models.ReportInfo; @@ -35,7 +36,6 @@ import com.termux.shared.termux.TermuxUtils; import com.termux.terminal.KeyHandler; import com.termux.terminal.TerminalEmulator; import com.termux.terminal.TerminalSession; -import com.termux.view.TerminalViewClient; import java.util.Arrays; import java.util.Collections; @@ -44,7 +44,7 @@ import java.util.List; import androidx.drawerlayout.widget.DrawerLayout; -public class TermuxTerminalViewClient implements TerminalViewClient { +public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase { final TermuxActivity mActivity; @@ -440,41 +440,4 @@ public class TermuxTerminalViewClient implements TerminalViewClient { session.getEmulator().paste(paste.toString()); } - - - @Override - public void logError(String tag, String message) { - Logger.logError(tag, message); - } - - @Override - public void logWarn(String tag, String message) { - Logger.logWarn(tag, message); - } - - @Override - public void logInfo(String tag, String message) { - Logger.logInfo(tag, message); - } - - @Override - public void logDebug(String tag, String message) { - Logger.logDebug(tag, message); - } - - @Override - public void logVerbose(String tag, String message) { - Logger.logVerbose(tag, message); - } - - @Override - public void logStackTraceWithMessage(String tag, String message, Exception e) { - Logger.logStackTraceWithMessage(tag, message, e); - } - - @Override - public void logStackTrace(String tag, Exception e) { - Logger.logStackTrace(tag, e); - } - } diff --git a/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java new file mode 100644 index 00000000..701582ad --- /dev/null +++ b/termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java @@ -0,0 +1,105 @@ +package com.termux.shared.terminal; + +import android.view.KeyEvent; +import android.view.MotionEvent; + +import com.termux.shared.logger.Logger; +import com.termux.terminal.TerminalSession; +import com.termux.view.TerminalViewClient; + +public class TermuxTerminalViewClientBase implements TerminalViewClient { + + public TermuxTerminalViewClientBase() { + } + + @Override + public float onScale(float scale) { + return 1.0f; + } + + @Override + public void onSingleTapUp(MotionEvent e) { + } + + public boolean shouldBackButtonBeMappedToEscape() { + return false; + } + + public boolean shouldEnforceCharBasedInput() { + return false; + } + + public boolean shouldUseCtrlSpaceWorkaround() { + return false; + } + + @Override + public void copyModeChanged(boolean copyMode) { + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session) { + return false; + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent e) { + return false; + } + + @Override + public boolean onLongPress(MotionEvent event) { + return false; + } + + @Override + public boolean readControlKey() { + return false; + } + + @Override + public boolean readAltKey() { + return false; + } + + @Override + public boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session) { + return false; + } + + @Override + public void logError(String tag, String message) { + Logger.logError(tag, message); + } + + @Override + public void logWarn(String tag, String message) { + Logger.logWarn(tag, message); + } + + @Override + public void logInfo(String tag, String message) { + Logger.logInfo(tag, message); + } + + @Override + public void logDebug(String tag, String message) { + Logger.logDebug(tag, message); + } + + @Override + public void logVerbose(String tag, String message) { + Logger.logVerbose(tag, message); + } + + @Override + public void logStackTraceWithMessage(String tag, String message, Exception e) { + Logger.logStackTraceWithMessage(tag, message, e); + } + + @Override + public void logStackTrace(String tag, Exception e) { + Logger.logStackTrace(tag, e); + } + +}