ConsoleKeyboardView split

green-green-avk · Jan 11, 2022 · f26c026 · f26c026
1 parent 195c3bf
commit f26c026
Show file tree

Hide file tree

Showing 8 changed files with 737 additions and 28 deletions.
diff --git a/app/src/main/java/green_green_avk/anotherterm/AnsiConsoleActivity.java b/app/src/main/java/green_green_avk/anotherterm/AnsiConsoleActivity.java
@@ -57,8 +57,8 @@
 import green_green_avk.anotherterm.backends.BackendModule;
 import green_green_avk.anotherterm.backends.BackendUiInteractionActivityCtx;
 import green_green_avk.anotherterm.backends.BackendsList;
+import green_green_avk.anotherterm.ui.AnsiConsoleKeyboardView;
 import green_green_avk.anotherterm.ui.ChoreographerCompat;
-import green_green_avk.anotherterm.ui.ConsoleKeyboardView;
 import green_green_avk.anotherterm.ui.ConsoleScreenView;
 import green_green_avk.anotherterm.ui.FontProvider;
 import green_green_avk.anotherterm.ui.MouseButtonsWorkAround;
@@ -75,7 +75,7 @@ public final class AnsiConsoleActivity extends ConsoleActivity
     private int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
     private boolean autoFitTerminal = false;
     private ConsoleScreenView mCsv = null;
-    private ConsoleKeyboardView mCkv = null;
+    private AnsiConsoleKeyboardView mCkv = null;
     private ScreenMouseView mSmv = null;
     private View mBell = null;
     private Animation mBellAnim = null;
@@ -226,7 +226,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) {
                 getResources().getDisplayMetrics().density, false);
 
         mCkv.setMode(((App) getApplication()).settings.terminal_key_default_ime ?
-                ConsoleKeyboardView.MODE_IME : ConsoleKeyboardView.MODE_VISIBLE);
+                AnsiConsoleKeyboardView.MODE_IME : AnsiConsoleKeyboardView.MODE_VISIBLE);
 
         setSessionTitle(mSession.input.currScrBuf.windowTitle);
 
@@ -614,8 +614,8 @@ public void onMouseMode(final View v) {
     }
 
     public void onSwitchIme(final View v) {
-        mCkv.setMode(mCkv.getMode() == ConsoleKeyboardView.MODE_VISIBLE ?
-                ConsoleKeyboardView.MODE_IME : ConsoleKeyboardView.MODE_VISIBLE);
+        mCkv.setMode(mCkv.getMode() == AnsiConsoleKeyboardView.MODE_VISIBLE ?
+                AnsiConsoleKeyboardView.MODE_IME : AnsiConsoleKeyboardView.MODE_VISIBLE);
     }
 
     public void onSelectMode(final View v) {

diff --git a/app/src/main/java/green_green_avk/anotherterm/AnsiSession.java b/app/src/main/java/green_green_avk/anotherterm/AnsiSession.java
@@ -7,14 +7,14 @@
 import java.util.Map;
 
 import green_green_avk.anotherterm.backends.EventBasedBackendModuleWrapper;
-import green_green_avk.anotherterm.ui.ConsoleKeyboardView;
+import green_green_avk.anotherterm.ui.AnsiConsoleKeyboardView;
 import green_green_avk.anotherterm.ui.ConsoleScreenView;
 
 public final class AnsiSession extends Session {
 
     public static final class UiState {
         public final ConsoleScreenView.State csv = new ConsoleScreenView.State();
-        public final ConsoleKeyboardView.State ckv = new ConsoleKeyboardView.State();
+        public final AnsiConsoleKeyboardView.State ckv = new AnsiConsoleKeyboardView.State();
         public float fontSizeDp = 0F; // Invariant for resolution switching
         public int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
         public boolean keepScreenOn = false;

diff --git a/app/src/main/java/green_green_avk/anotherterm/GraphicsConsoleActivity.java b/app/src/main/java/green_green_avk/anotherterm/GraphicsConsoleActivity.java
@@ -23,9 +23,9 @@
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.NoSuchElementException;
 
-import green_green_avk.anotherterm.ui.ConsoleKeyboardView;
 import green_green_avk.anotherterm.ui.FontProvider;
 import green_green_avk.anotherterm.ui.GraphicsCompositorView;
+import green_green_avk.anotherterm.ui.GraphicsConsoleKeyboardView;
 import green_green_avk.anotherterm.ui.MouseButtonsWorkAround;
 import green_green_avk.anotherterm.ui.ScreenMouseView;
 import green_green_avk.anotherterm.ui.UiUtils;
@@ -35,7 +35,7 @@ public final class GraphicsConsoleActivity extends ConsoleActivity {
     private GraphicsSession mSession = null;
 
     private GraphicsCompositorView mGcv = null;
-    private ConsoleKeyboardView mCkv = null;
+    private GraphicsConsoleKeyboardView mCkv = null;
     private ScreenMouseView mSmv = null;
     private View mBell = null;
     private Animation mBellAnim = null;
@@ -99,7 +99,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) {
         final FontProvider fp = new ConsoleFontProvider();
         mCkv.setFont(fp); // Old Android devices have no glyphs for some special symbols
 
-        mCkv.setMode(ConsoleKeyboardView.MODE_HW_ONLY);
+        mCkv.setMode(GraphicsConsoleKeyboardView.MODE_HW_ONLY);
 
         setSessionTitle(mSession.compositor.title);
 
@@ -209,14 +209,14 @@ public void onMouseMode(final View v) {
     public void onSwitchIme(final View view) {
         final int mode;
         switch (mCkv.getMode()) {
-            case ConsoleKeyboardView.MODE_VISIBLE:
-                mode = ConsoleKeyboardView.MODE_IME;
+            case GraphicsConsoleKeyboardView.MODE_VISIBLE:
+                mode = GraphicsConsoleKeyboardView.MODE_IME;
                 break;
-            case ConsoleKeyboardView.MODE_IME:
-                mode = ConsoleKeyboardView.MODE_HW_ONLY;
+            case GraphicsConsoleKeyboardView.MODE_IME:
+                mode = GraphicsConsoleKeyboardView.MODE_HW_ONLY;
                 break;
             default:
-                mode = ConsoleKeyboardView.MODE_VISIBLE;
+                mode = GraphicsConsoleKeyboardView.MODE_VISIBLE;
         }
         mCkv.setMode(mode);
     }

diff --git a/app/src/main/java/green_green_avk/anotherterm/GraphicsSession.java b/app/src/main/java/green_green_avk/anotherterm/GraphicsSession.java
@@ -2,21 +2,21 @@
 
 import androidx.annotation.NonNull;
 
-import green_green_avk.anotherterm.ui.ConsoleKeyboardView;
+import green_green_avk.anotherterm.ui.GraphicsConsoleKeyboardView;
 
 public final class GraphicsSession extends Session {
 
     public static final class UiState {
         //        public final ConsoleScreenView.State csv = new ConsoleScreenView.State();
-        public final ConsoleKeyboardView.State ckv = new ConsoleKeyboardView.State();
+        public final GraphicsConsoleKeyboardView.State ckv = new GraphicsConsoleKeyboardView.State();
 //        public int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
 //        public boolean keepScreenOn = false;
     }
 
     @NonNull
     public final GraphicsCompositor compositor;
 
-    public final AnsiSession.UiState uiState = new AnsiSession.UiState();
+    public final GraphicsSession.UiState uiState = new GraphicsSession.UiState();
 
     public GraphicsSession(@NonNull final GraphicsCompositor compositor) {
         this.compositor = compositor;