Merge branch 'AquiTCD-feature/keybind-customization'

tamo · tamo · commit 521369b8df45 · 2026-04-30T15:11:04.000+09:00
diff --git a/app/src/androidTest/java/jp/deadend/noname/skk/SKKSettingsActivityUITest.kt b/app/src/androidTest/java/jp/deadend/noname/skk/SKKSettingsActivityUITest.kt
@@ -201,17 +201,62 @@ class SKKSettingsActivityUITest {
     fun testHardKeyFragment() {
         assert(skkPrefs.kanaKey == KeyEvent.KEYCODE_J shl 4 or /* CTRL_PRESSED */ 4)
         onView(withText("ハードウェアキーボードの設定")).perform(click())
+
+        // かなキー (CTRL+J -> TAB)
         onView(withText("かなキー"))
             .check(matches(hasSibling(withText("CTRL+J"))))
             .perform(click())
             .check(matches(hasSibling(withText("Push any key..."))))
-        repeat(3) { // ときどき key up しか発行されないことがある?
+        repeat(3) {
             Thread.sleep(1000)
             onView(withText("かなキー")).perform(pressKey(KeyEvent.KEYCODE_TAB))
         }
-        onView(withText("かなキー"))
-            .check(matches(hasSibling(withText("TAB"))))
+        onView(withText("かなキー")).check(matches(hasSibling(withText("TAB"))))
         assert(skkPrefs.kanaKey == KeyEvent.KEYCODE_TAB shl 4)
+
+        // カタカナキー (Q -> T)
+        onView(withText("カタカナキー"))
+            .check(matches(hasSibling(withText("Q"))))
+            .perform(click())
+        repeat(3) {
+            Thread.sleep(1000)
+            onView(withText("カタカナキー")).perform(pressKey(KeyEvent.KEYCODE_T))
+        }
+        onView(withText("カタカナキー")).check(matches(hasSibling(withText("T"))))
+        assert(skkPrefs.katakanaKey == KeyEvent.KEYCODE_T shl 4)
+
+        // ASCIIキー (L -> A)
+        onView(withText("ASCIIキー"))
+            .check(matches(hasSibling(withText("L"))))
+            .perform(click())
+        repeat(3) {
+            Thread.sleep(1000)
+            onView(withText("ASCIIキー")).perform(pressKey(KeyEvent.KEYCODE_A))
+        }
+        onView(withText("ASCIIキー")).check(matches(hasSibling(withText("A"))))
+        assert(skkPrefs.asciiKey == KeyEvent.KEYCODE_A shl 4)
+
+        // 全角英数キー (SHIFT+L -> SHIFT+Z)
+        onView(withText("全角英数キー"))
+            .check(matches(hasSibling(withText("SHIFT+L"))))
+            .perform(click())
+        repeat(3) {
+            Thread.sleep(1000)
+            onView(withText("全角英数キー")).perform(pressKey(KeyEvent.KEYCODE_Z, KeyEvent.META_SHIFT_LEFT_ON))
+        }
+        onView(withText("全角英数キー")).check(matches(hasSibling(withText("SHIFT+Z"))))
+        assert(skkPrefs.zenkakuKey == (KeyEvent.KEYCODE_Z shl 4 or 1))
+
+        // Abbrevキー (SLASH -> PERIOD)
+        onView(withText("Abbrevキー"))
+            .check(matches(hasSibling(withText("SLASH"))))
+            .perform(click())
+        repeat(3) {
+            Thread.sleep(1000)
+            onView(withText("Abbrevキー")).perform(pressKey(KeyEvent.KEYCODE_PERIOD))
+        }
+        onView(withText("Abbrevキー")).check(matches(hasSibling(withText("PERIOD"))))
+        assert(skkPrefs.abbrevKey == (KeyEvent.KEYCODE_PERIOD shl 4))
     }
 
     @Test
diff --git a/app/src/main/java/jp/deadend/noname/skk/SKKPrefs.kt b/app/src/main/java/jp/deadend/noname/skk/SKKPrefs.kt
@@ -70,6 +70,22 @@ class SKKPrefs(context: Context) {
         get() = prefs.getInt(res.getString(R.string.pref_cancel_key), 564) // 564はCtrl+g
         set(value) = prefs.edit { putInt(res.getString(R.string.pref_cancel_key), value) }
 
+    var katakanaKey: Int
+        get() = prefs.getInt(res.getString(R.string.pref_katakana_key), 720) // 720はq (KEYCODE_Q=45, shl 4)
+        set(value) = prefs.edit { putInt(res.getString(R.string.pref_katakana_key), value) }
+
+    var asciiKey: Int
+        get() = prefs.getInt(res.getString(R.string.pref_ascii_key), 640) // 640はl (KEYCODE_L=40, shl 4)
+        set(value) = prefs.edit { putInt(res.getString(R.string.pref_ascii_key), value) }
+
+    var zenkakuKey: Int
+        get() = prefs.getInt(res.getString(R.string.pref_zenkaku_key), 641) // 641はShift+L (40 shl 4 | 1)
+        set(value) = prefs.edit { putInt(res.getString(R.string.pref_zenkaku_key), value) }
+
+    var abbrevKey: Int
+        get() = prefs.getInt(res.getString(R.string.pref_abbrev_key), 1216) // 1216はSlash (KEYCODE_SLASH=76, shl 4)
+        set(value) = prefs.edit { putInt(res.getString(R.string.pref_abbrev_key), value) }
+
     var useCandidatesView: Boolean
         get() = prefs.getBoolean(res.getString(R.string.pref_use_candidates_view), true)
         set(value) = prefs.edit {
diff --git a/app/src/main/java/jp/deadend/noname/skk/SKKService.kt b/app/src/main/java/jp/deadend/noname/skk/SKKService.kt
@@ -681,7 +681,7 @@ class SKKService : InputMethodService() {
 
                 // テンキーにする
                 "flick-num" -> {
-                    mEngine.changeInputMode('l'.code)
+                    mEngine.handleASCIIKey()
                     mFlickJPInputView?.let {
                         setInputView(it) // Godan ユーザにも FlickJP のテンキーを強制
                         it.keyboard = it.mNumKeyboard
@@ -690,15 +690,15 @@ class SKKService : InputMethodService() {
 
                 // 英字にする
                 "qwerty" -> {
-                    mEngine.changeInputMode('l'.code)
+                    mEngine.handleASCIIKey()
                     if (mInputView?.equals(mQwertyInputView) == true) {
                         mQwertyInputView!!.keyboard = mQwertyInputView!!.mLatinKeyboard
                     }
                 }
 
                 // 英数記号にする
                 "symbols" -> {
-                    mEngine.changeInputMode('l'.code)
+                    mEngine.handleASCIIKey()
                     if (mInputView?.equals(mQwertyInputView) == true) {
                         mQwertyInputView!!.keyboard = mQwertyInputView!!.mSymbolsKeyboard
                     }
@@ -920,6 +920,11 @@ class SKKService : InputMethodService() {
             return true
         }
 
+        if (encodedKey == skkPrefs.katakanaKey) {
+            mEngine.handleKatakanaKey()
+            return true
+        }
+
         if (engineState === SKKASCIIState && !mEngine.isRegistering) {
             val result = super.onKeyDown(keyCode, event)
             updateSuggestionsASCII()
@@ -930,6 +935,20 @@ class SKKService : InputMethodService() {
             if (handleCancel()) return true
         }
 
+        if (encodedKey == skkPrefs.asciiKey) {
+            mEngine.handleASCIIKey()
+            return true
+        }
+
+        if (encodedKey == skkPrefs.zenkakuKey) {
+            mEngine.handleZenkakuKey()
+            return true
+        }
+
+        if (encodedKey == skkPrefs.abbrevKey) {
+            if (mEngine.tryStartAbbrev()) return true
+        }
+
         if (encodedKey == 724) { // Ctrl-Q
             processKey(17) // 基本的には半角カナだがAbbrevでは全角への変換となる
             return true
diff --git a/app/src/main/java/jp/deadend/noname/skk/SKKSettingsActivity.kt b/app/src/main/java/jp/deadend/noname/skk/SKKSettingsActivity.kt
@@ -74,19 +74,19 @@ class SKKSettingsActivity : AppCompatActivity() {
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             setPreferencesFromResource(R.xml.prefs_hard_key, rootKey)
 
-            findPreference<Preference>(getString(R.string.pref_kana_key))?.apply {
-                setSummary(getKeyName(skkPrefs.kanaKey))
-                setOnPreferenceClickListener {
-                    setSummary("Push any key...")
-                    (requireActivity() as SKKSettingsActivity).keyPref = this
-                    true
-                }
-            }
+            registerKeyPref(R.string.pref_kana_key, skkPrefs.kanaKey)
+            registerKeyPref(R.string.pref_cancel_key, skkPrefs.cancelKey)
+            registerKeyPref(R.string.pref_katakana_key, skkPrefs.katakanaKey)
+            registerKeyPref(R.string.pref_ascii_key, skkPrefs.asciiKey)
+            registerKeyPref(R.string.pref_zenkaku_key, skkPrefs.zenkakuKey)
+            registerKeyPref(R.string.pref_abbrev_key, skkPrefs.abbrevKey)
+        }
 
-            findPreference<Preference>(getString(R.string.pref_cancel_key))?.apply {
-                setSummary(getKeyName(skkPrefs.cancelKey))
+        private fun registerKeyPref(prefKeyResId: Int, currentValue: Int) {
+            findPreference<Preference>(getString(prefKeyResId))?.apply {
+                summary = getKeyName(currentValue)
                 setOnPreferenceClickListener {
-                    setSummary("Push any key...")
+                    summary = "Push any key..."
                     (requireActivity() as SKKSettingsActivity).keyPref = this
                     true
                 }
diff --git a/app/src/main/java/jp/deadend/noname/skk/engine/RomajiConverter.kt b/app/src/main/java/jp/deadend/noname/skk/engine/RomajiConverter.kt
@@ -172,4 +172,4 @@ object RomajiConverter {
     }
 
     fun isIntermediateRomaji(composing: String): Boolean = (composing in mIntermediateRomajiSet)
-}
+}
diff --git a/app/src/main/java/jp/deadend/noname/skk/engine/SKKEngine.kt b/app/src/main/java/jp/deadend/noname/skk/engine/SKKEngine.kt
@@ -138,6 +138,52 @@ class SKKEngine(
     fun processKey(keyCode: Int) = state.processKey(this, keyCode)
 
     fun handleKanaKey() = state.handleKanaKey(this)
+ 
+    fun handleKatakanaKey() {
+        when (state) {
+            SKKHiraganaState -> changeState(SKKKatakanaState)
+            SKKKatakanaState -> changeState(SKKHiraganaState)
+            SKKKanjiState -> {
+                // ▽モードでカタカナ変換（従来の q 動作を引き継ぐ）
+                if (mKanjiKey.isNotEmpty()) {
+                    val str = if (kanaState == SKKHiraganaState) {
+                        hiragana2katakana(mKanjiKey.toString())
+                    } else {
+                        mKanjiKey.toString()
+                    }
+                    if (str != null) commitTextSKK(str)
+                    mKanjiKey.setLength(0)
+                }
+                changeState(kanaState)
+            }
+
+            else -> {}
+        }
+    }
+
+    fun handleASCIIKey() {
+        if (mComposing.length != 1 || mComposing[0] != 'z') {
+            // ▽モード(KanjiState)では l で Abbrev モードに遷移（SKK 原本の動作）
+            if (state === SKKKanjiState) {
+                changeState(SKKAbbrevState)
+            } else {
+                changeState(SKKASCIIState, true)
+            }
+        }
+        // 「→」を入力するための z+l 例外はそのまま維持
+    }
+
+    fun handleZenkakuKey() {
+        changeState(SKKZenkakuState)
+    }
+
+    fun tryStartAbbrev(): Boolean {
+        if (mComposing.isEmpty()) {
+            changeState(SKKAbbrevState)
+            return true
+        }
+        return false
+    }
 
     fun handleBackKey(): Boolean {
         if (!mRegistrationStack.isEmpty()) {
@@ -1151,36 +1197,13 @@ class SKKEngine(
 
     internal fun changeInputMode(keyCode: Int): Boolean {
         // 入力モード変更操作．変更したらtrue
+        // 他のケースは SKKService.onKeyDown に集約済み。
+        // 現在は Ctrl-Q (全角カナ/半角カナ切り替え) のみここで行う。
         when (keyCode) {
-            'q'.code -> {
-                changeState(if (kanaState === SKKHiraganaState) SKKKatakanaState else SKKHiraganaState)
-                return true
-            }
-
             17 /* Ctrl-Q */ -> {
                 changeState(SKKHanKanaState)
                 return true
             }
-
-            'l'.code -> {
-                if (mComposing.length != 1 || mComposing[0] != 'z') {
-                    if (state === SKKKanjiState) {
-                        changeState(SKKAbbrevState)
-                    } else {
-                        changeState(SKKASCIIState, true)
-                    }
-                    return true
-                }
-            } // 「→」を入力するための例外
-            'L'.code -> {
-                changeState(SKKZenkakuState)
-                return true
-            }
-
-            '/'.code -> if (mComposing.isEmpty()) {
-                changeState(SKKAbbrevState)
-                return true
-            }
         }
 
         return false
diff --git a/app/src/main/java/jp/deadend/noname/skk/engine/SKKKanjiState.kt b/app/src/main/java/jp/deadend/noname/skk/engine/SKKKanjiState.kt
@@ -40,27 +40,6 @@ object SKKKanjiState : SKKState {
             }
 
             when (codeLower) {
-                'l'.code -> changeInputMode(keyCode)
-
-                '/'.code -> changeInputMode(keyCode)
-                // abbrevはtransientなのでchangeInputModeで自動確定されない
-                // ▽の状態で英数(abbrev)と仮名(kanji)を行き来するには kanaKey(-1010) と / を使うことにする
-                // 一般的なキーコードが分かれば対応するが、emacsではabbrevから普通の▽(kanji)に行けないと思う
-
-                'q'.code -> {
-                    // カタカナ変換
-                    if (mKanjiKey.isNotEmpty()) {
-                        val str = if (kanaState == SKKHiraganaState) {
-                            hiragana2katakana(mKanjiKey.toString())
-                        } else {
-                            mKanjiKey.toString() // すでにひらがななのでそのまま
-                        }
-                        if (str != null) commitTextSKK(str)
-                        mKanjiKey.setLength(0)
-                    }
-                    changeState(kanaState)
-                }
-
                 17 /* Ctrl-Q */ -> {
                     if (mKanjiKey.isNotEmpty()) {
                         val zenkakuKatakana = hiragana2katakana(mKanjiKey.toString())
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -67,6 +67,10 @@
     <string name="pref_kana_key" translatable="false">PrefKeyKanaKey</string>
     <string name="pref_toggle_kana_key" translatable="false">PrefKeyToggleKanaKey</string>
     <string name="pref_cancel_key" translatable="false">PrefKeyCancelKey</string>
+    <string name="pref_katakana_key" translatable="false">PrefKeyKatakanaKey</string>
+    <string name="pref_ascii_key" translatable="false">PrefKeyASCIIKey</string>
+    <string name="pref_zenkaku_key" translatable="false">PrefKeyZenkakuKey</string>
+    <string name="pref_abbrev_key" translatable="false">PrefKeyAbbrevKey</string>
     <string name="pref_candidates_size" translatable="false">PrefKeyCandidatesSize</string>
     <string name="pref_candidates_reserve_lines" translatable="false">PrefKeyCandidatesReserveLines</string>
     <string name="pref_candidates_normal_lines" translatable="false">PrefKeyCandidatesNormalLines</string>
diff --git a/app/src/main/res/xml/prefs_hard_key.xml b/app/src/main/res/xml/prefs_hard_key.xml
@@ -27,6 +27,22 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_cancel_key"
             app:title="キャンセルキー" />
+        <androidx.preference.Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_katakana_key"
+            app:title="カタカナキー" />
+        <androidx.preference.Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_ascii_key"
+            app:title="直接入力キー" />
+        <androidx.preference.Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_zenkaku_key"
+            app:title="全角英数キー" />
+        <androidx.preference.Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_abbrev_key"
+            app:title="Abbrevキー" />
         <androidx.preference.CheckBoxPreference
             app:defaultValue="true"
             app:iconSpaceReserved="false"
diff --git a/app/src/test/java/jp/deadend/noname/skk/RomajiConverterTest.kt b/app/src/test/java/jp/deadend/noname/skk/RomajiConverterTest.kt
@@ -314,4 +314,5 @@ class RomajiConverterTest {
         tearDown()
         assertEquals(null, RomajiConverter.checkSpecialConsonants('q', 'q'.code))
     }
-}
+}
+

Original file line number	Diff line number	Diff line change
`@@ -172,4 +172,4 @@ object RomajiConverter {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`fun isIntermediateRomaji(composing: String): Boolean = (composing in mIntermediateRomajiSet)`
`175`		`-}`
	`175`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -314,4 +314,5 @@ class RomajiConverterTest {`
`314`	`314`	`tearDown()`
`315`	`315`	`assertEquals(null, RomajiConverter.checkSpecialConsonants('q', 'q'.code))`
`316`	`316`	`}`
`317`		`-}`
	`317`	`+}`
	`318`	`+`