Project: Upgrade config file

app/src/main/assets/eks/default.nl

@@ -1,5 +1,5 @@
 extra-key: {
-    version: 19
+    version: 20
     program: [ default ]
 
     key: [

app/src/main/assets/eks/vim.nl

@@ -1,23 +1,27 @@
 extra-key: {
-    version: 19
+    version: 20
     with-default: true
-    program: [ vim, vi, neovim ]
+    program: [ vim, vi, nvim ]
 
     key: [
         {
-            code: "dd"
+            code: "<Esc> dd"
+            display: "dd"
             with-enter: true
         },
         {
-            code: ":x"
+            code: "<Esc> :x"
+            display: ":x"
             with-enter: true
         },
         {
-            code: ":w"
+            code: "<Esc> :w"
+            display: ":w"
             with-enter: true
         },
         {
-            code: ":q"
+            code: "<Esc> :q"
+            display: ":q"
             with-enter: true
         }
     ]

app/src/main/java/io/neoterm/component/config/ConfigureComponent.kt

@@ -9,7 +9,7 @@ import java.io.File
  * @author kiva
  */
 class ConfigureComponent : NeoComponent {
-    val CONFIG_LOADER_VERSION = 19
+    val CONFIG_LOADER_VERSION = 20
 
     override fun onServiceInit() {
     }

app/src/main/java/io/neoterm/component/eks/ExtraKeysComponent.kt

@@ -46,7 +46,7 @@ class ExtraKeysComponent : NeoComponent {
         extraKeysView.loadDefaultUserKeys()
     }
 
-    fun registerShortcutKeys(extraKey: NeoExtraKey) {
+    private fun registerShortcutKeys(extraKey: NeoExtraKey) {
         extraKey.programNames.forEach {
             extraKeys[it] = extraKey
         }

app/src/main/java/io/neoterm/frontend/terminal/eks/button/IExtraButton.kt

@@ -5,7 +5,6 @@ import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.View
 import android.widget.Button
-
 import io.neoterm.R
 import io.neoterm.frontend.terminal.TerminalView
 import io.neoterm.frontend.terminal.eks.combine.CombinedSequence
@@ -53,7 +52,7 @@ abstract class IExtraButton : View.OnClickListener {
 
         fun sendKey(view: View, keyName: String) {
             var keyCode = 0
-            var chars: String? = null
+            var chars = ""
             when (keyName) {
                 KEY_ESC -> keyCode = KeyEvent.KEYCODE_ESCAPE
                 KEY_TAB -> keyCode = KeyEvent.KEYCODE_TAB
@@ -76,7 +75,7 @@ abstract class IExtraButton : View.OnClickListener {
             if (keyCode > 0) {
                 view.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, keyCode))
                 view.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, keyCode))
-            } else {
+            } else if (chars.isNotEmpty()) {
                 val terminalView = view.findViewById<TerminalView>(R.id.terminal_view)
                 val session = terminalView.currentSession
                 session?.write(chars)

app/src/test/java/io/neoterm/CombinedKeyTest.kt

@@ -1,5 +1,6 @@
 package io.neoterm
 
+import io.neoterm.frontend.terminal.eks.button.IExtraButton
 import io.neoterm.frontend.terminal.eks.combine.CombinedSequence
 import org.junit.Test
 
@@ -11,5 +12,11 @@ class CombinedKeyTest {
     fun testCombinedKey() {
         val key = CombinedSequence.solveString("<Ctrl> <Alt> <F1> q")
         println(key.keys)
+        var chars = "Unchanged"
+        val XX = key.keys[0]
+        when (IExtraButton.KEY_CTRL) {
+            XX -> chars = "Detected ctrl"
+        }
+        println(chars)
     }
 }