Merge pull request #28 from yokoro13/feature-terminalview

TerminalViewの実装

Author: yokoro13

.idea/caches/build_file_checksums.ser

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:hardwareAccelerated="true"
@@ -16,9 +17,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.i14yokoro.mldpterminal.MainActivity"
-                  android:screenOrientation="portrait"
-                  android:windowSoftInputMode="adjustResize">
+        <activity
+            android:name="com.i14yokoro.mldpterminal.MainActivity"
+            android:screenOrientation="portrait"
+            android:resizeableActivity="true"
+
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 package com.i14yokoro.mldpterminal
 
+import com.i14yokoro.mldpterminal.terminalview.TerminalView.Cursor
 
 /**
  * ANSIのエスケープシーケンスと同じ動作をする
@@ -10,124 +11,123 @@ class EscapeSequence
  */
 internal constructor(private val termBuffer: TerminalBuffer) {
 
-    private val nonBreakingSpace = Typography.nbsp
-
-    private val currentRow: Int
-        get() = termBuffer.cursorY + termBuffer.topRow
+    private val space = ' '
 
     /**
      * @param n 移動量
      */
-    fun moveRight(n: Int) {
-        moveCursorX(n)
+    fun moveRight(cursor: Cursor, n: Int) {
+        moveCursorX(cursor, n)
     }
 
     /**
      * @param n 移動量
      */
-    fun moveLeft(n: Int) {
-        moveCursorX(-n)
+    fun moveLeft(cursor: Cursor, n: Int) {
+        moveCursorX(cursor, -n)
     }
 
     /**
      * @param n 移動量
      */
-    fun moveUp(n: Int) {
-        moveCursorY(-n)
-        termBuffer.currentRow -= n
+    fun moveUp(cursor: Cursor, n: Int) {
+        termBuffer.currentRow -= if (cursor.y - n > 0) n else cursor.y
+        moveCursorY(cursor, -n)
     }
 
     /**
      * @param n 移動量
      */
-    fun moveDown(n: Int) {
-        if(termBuffer.cursorY + n >= termBuffer.screenColumnSize){
-            termBuffer.currentRow += termBuffer.cursorY + n - termBuffer.screenColumnSize
-        } else {
-            termBuffer.currentRow += n
-        }
-        if(termBuffer.currentRow >= termBuffer.totalColumns) {
-            for(i in 0 .. termBuffer.currentRow - termBuffer.totalColumns) {
+    fun moveDown(cursor: Cursor, n: Int) {
+        termBuffer.currentRow += if (cursor.y + n < termBuffer.screenRowSize) n else (termBuffer.screenRowSize - cursor.y - 1)
+        moveCursorY(cursor, n)
+
+        if(termBuffer.topRow + cursor.y >= termBuffer.totalLines) {
+            for(i in 0 .. termBuffer.topRow + cursor.y - termBuffer.totalLines) {
                 termBuffer.addRow()
             }
         }
-
-        moveCursorY(n)
     }
 
     /**
      * @param n 移動量
      */
-    fun moveUpToRowLead(n: Int) {
-        termBuffer.cursorX = 0
-        moveUp(n)
+    fun moveUpToRowLead(cursor: Cursor, n: Int) {
+        cursor.x = 0
+        moveUp(cursor, n)
     }
 
     /**
      * @param n 移動量
      */
-    fun moveDownToRowLead(n: Int) {
-        termBuffer.cursorX = 0
-        moveDown(n)
+    fun moveDownToRowLead(cursor: Cursor, n: Int) {
+        cursor.x = 0
+        moveDown(cursor, n)
     }
 
     /**
      * @param n 移動量
      */
-    fun moveCursor(n: Int) {
-        termBuffer.cursorX = 0
-        moveRight(n-1)
+    fun moveCursor(cursor: Cursor, n: Int) {
+        cursor.x = 0
+        moveRight(cursor, n-1)
     }
 
     /**
      * @param n 縦の移動量(0 < n)
      * @param m 横の移動量(0 < m)
      */
-    fun moveCursor(n: Int, m: Int) { //n,mは1~
-        termBuffer.cursorY = 0
-        termBuffer.cursorX = 0
-        moveDown(n-1)
-        moveRight(m-1)
+    fun moveCursor(cursor: Cursor, n: Int, m: Int) { //n,mは1~
+        if(n-1 > cursor.y) {
+            termBuffer.currentRow -= cursor.y
+            cursor.y = 0
+            moveDown(cursor, n-1)
+        } else {
+            termBuffer.currentRow -= cursor.y - (n-1)
+            cursor.y = n-1
+        }
+
+        cursor.x = m-1
     }
 
     /**
      * 画面消去
      */
-    private fun clearDisplay() {
-        for (x in termBuffer.cursorX until termBuffer.screenRowSize){
-            termBuffer.setText(x, currentRow, nonBreakingSpace)
+    private fun clearDisplay(cursor: Cursor) {
+        for (x in cursor.x until termBuffer.screenColumnSize){
+            termBuffer.setText(x, termBuffer.topRow + cursor.y, space)
         }
-        for (y in termBuffer.cursorY+1 until termBuffer.displayedLines) {
-            for (x in 0 until termBuffer.screenRowSize){
-                termBuffer.setText(x, y, nonBreakingSpace)
+        for (y in cursor.y+1 until termBuffer.displayedLines) {
+            for (x in 0 until termBuffer.screenColumnSize){
+                termBuffer.setText(x, y, space)
             }
         }
     }
 
     /**
      * @param n 画面消去の方法
      */
-    fun clearDisplay(n: Int) {
+    fun clearDisplay(cursor: Cursor, n: Int) {
         //一番下までスクロールして消去ぽい
         if (n == 0) { //カーソルより後ろにある画面上の文字を消す
-            clearDisplay()
+            clearDisplay(cursor)
         }
 
         if (n == 1) { //カーソルより前にある画面上の文字を消す
-            for (y in termBuffer.topRow .. currentRow) {
-                for (x in 0 until termBuffer.screenRowSize) {
-                    termBuffer.setText(x, y, nonBreakingSpace)
-                    if (y == currentRow && x == termBuffer.cursorX) {
+            for (y in termBuffer.topRow .. termBuffer.topRow + cursor.y) {
+                for (x in 0 until termBuffer.screenColumnSize) {
+                    if (y == termBuffer.topRow + cursor.y && x == cursor.x) {
                         break
                     }
+                    termBuffer.setText(x, y, space)
                 }
             }
         }
 
         if (n == 2) { //全消去
             for (y in termBuffer.topRow until termBuffer.displayedLines + termBuffer.topRow) {
-                for (x in 0 until termBuffer.screenRowSize) {
-                    termBuffer.setText(x, y, nonBreakingSpace)
+                for (x in 0 until termBuffer.screenColumnSize) {
+                    termBuffer.setText(x, y, space)
                 }
             }
         }
@@ -136,32 +136,31 @@ internal constructor(private val termBuffer: TerminalBuffer) {
     /**
      * @param n 行削除の方法
      */
-    fun clearRow(n: Int) {
+    fun clearRow(cursor: Cursor, n: Int) {
         if (n == 0) { //カーソル以降にある文字を消す
-            for (x in termBuffer.cursorX until termBuffer.screenRowSize) {
-                termBuffer.setText(x, currentRow, nonBreakingSpace)
+            for (x in cursor.x until termBuffer.screenColumnSize) {
+                termBuffer.setText(x, termBuffer.topRow + cursor.y, space)
             }
         }
 
         if (n == 1) { //カーソル以前にある文字を消す
-            for (x in 0 until termBuffer.cursorX) {
-                termBuffer.setText(x, currentRow, nonBreakingSpace)
+            for (x in 0 until cursor.x) {
+                termBuffer.setText(x, termBuffer.topRow + cursor.y, space)
             }
         }
 
         if (n == 2) { //全消去
-            for (x in 0 until termBuffer.screenRowSize) {
-                termBuffer.setText(x, currentRow, nonBreakingSpace)
+            for (x in 0 until termBuffer.screenColumnSize) {
+                termBuffer.setText(x, termBuffer.topRow + cursor.y, space)
             }
-
         }
     }
 
     /**
      * @param n 移動する量
      */
     fun scrollNext(n: Int) {
-        if (termBuffer.topRow + n > termBuffer.totalColumns) return  //一番したに空白追加？？
+        if (termBuffer.topRow + n > termBuffer.totalLines) return  //一番したに空白追加？？
         termBuffer.topRow = termBuffer.topRow + n
     }
 
@@ -194,15 +193,15 @@ internal constructor(private val termBuffer: TerminalBuffer) {
     /**
      * @param x カーソルをx移動させる
      */
-    private fun moveCursorX(x: Int) {
-        termBuffer.cursorX += x
+    private fun moveCursorX(cursor: Cursor, x: Int) {
+        cursor.x += x
     }
 
     /**
      * @param y カーソルをy移動させる
      */
-    private fun moveCursorY(y: Int) {
-        termBuffer.cursorY +=  y
+    private fun moveCursorY(cursor: Cursor, y: Int) {
+        cursor.y +=  y
     }
 
 }