Make the Shift tap a persistent English-mode toggle
A Shift tap with nothing composed now switches English mode on until the next tap, instead of forcing only the next word: space, Enter and other keys no longer drop back to automatic detection. In English mode every key goes straight to the app, so there is no composition or underline. A Shift tap while typing still flips the buffer like Tab. Windows shows "英文" / "中英自動" when toggling. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -142,8 +142,8 @@ class AutoZhuyinTextService(TextService):
|
||||
return False
|
||||
self.engine.handle(SHIFT_TAP)
|
||||
self._update(None)
|
||||
if self.engine.english_armed:
|
||||
self.showMessage("英文", 1)
|
||||
if not self.engine.keys:
|
||||
self.showMessage("英文" if self.engine.english_mode else "中英自動", 1)
|
||||
return True
|
||||
|
||||
# --- replies ---
|
||||
|
||||
@@ -34,9 +34,9 @@ class CompositionEngine:
|
||||
self.now = now
|
||||
self.keys = []
|
||||
self.forced_mode = None
|
||||
# True when forced_mode corrects the classifier (learned on commit); False when the
|
||||
# user forced English before typing (Shift tap on an empty buffer).
|
||||
self._forced_is_correction = False
|
||||
# English mode, toggled by a Shift tap when nothing is being typed: keys go straight
|
||||
# to the app (no composition, no underline) until Shift is tapped again.
|
||||
self.english_mode = False
|
||||
self.fixed = {} # zhuyin segment start -> {(syl_start, syl_end): text}
|
||||
self.candidates = []
|
||||
self.candidate_index = 0
|
||||
@@ -150,26 +150,16 @@ class CompositionEngine:
|
||||
|
||||
# --- key handling ---
|
||||
|
||||
@property
|
||||
def english_armed(self):
|
||||
"""True while the user has forced English for the next word (Shift tap). In this
|
||||
mode keys go straight to the app with no composition (no underline)."""
|
||||
return not self.keys and self.forced_mode == LITERAL and not self._forced_is_correction
|
||||
|
||||
def _end_direct_english(self):
|
||||
if self.english_armed:
|
||||
self.forced_mode = None
|
||||
self._previous_mode = LITERAL
|
||||
self._previous_time = self.now()
|
||||
|
||||
def _flip(self):
|
||||
"""Forces the whole buffer into the other mode (a correction that is learned)."""
|
||||
self.forced_mode = LITERAL if self.mode == ZHUYIN else ZHUYIN
|
||||
self._forced_is_correction = True
|
||||
|
||||
def wants(self, key):
|
||||
"""Whether handle(key) would consume the key, without changing state."""
|
||||
if self.candidates or key == SHIFT_TAP or self.english_armed:
|
||||
if self.candidates or key == SHIFT_TAP:
|
||||
return True
|
||||
if self.english_mode and not self.keys:
|
||||
return False # English mode: everything goes to the app as typed
|
||||
if key in SPECIAL_KEYS:
|
||||
return bool(self.keys)
|
||||
if self.keys:
|
||||
@@ -190,34 +180,29 @@ class CompositionEngine:
|
||||
self.keys.pop()
|
||||
self.fixed = {k: v for k, v in self.fixed.items() if k < len(self.keys)}
|
||||
if not self.keys:
|
||||
# A Shift-tap "next word is English" stays armed; a correction is dropped.
|
||||
if self._forced_is_correction:
|
||||
self.forced_mode = None
|
||||
self._forced_is_correction = False
|
||||
self.forced_mode = None
|
||||
self.fixed = {}
|
||||
return CONSUMED
|
||||
if key == ENTER:
|
||||
if not self.keys:
|
||||
self._end_direct_english()
|
||||
return PASS
|
||||
return True, self._commit()
|
||||
if key == ESCAPE:
|
||||
if not self.keys:
|
||||
self._end_direct_english()
|
||||
return PASS
|
||||
self.reset()
|
||||
return CONSUMED
|
||||
if key == TAB:
|
||||
if not self.keys:
|
||||
self._end_direct_english()
|
||||
return PASS
|
||||
self._flip()
|
||||
return CONSUMED
|
||||
if key == SHIFT_TAP:
|
||||
if not self.keys:
|
||||
# Next word is English, typed as-is. Tap again to cancel.
|
||||
self.forced_mode = None if self.forced_mode == LITERAL else LITERAL
|
||||
self._forced_is_correction = False
|
||||
# Toggle English mode; it stays on until the next Shift tap.
|
||||
self.english_mode = not self.english_mode
|
||||
self._previous_mode = LITERAL if self.english_mode else None
|
||||
self._previous_time = self.now()
|
||||
else:
|
||||
self._flip()
|
||||
return CONSUMED
|
||||
@@ -243,15 +228,8 @@ class CompositionEngine:
|
||||
|
||||
def _handle_character(self, c):
|
||||
self.cursor = None # typing always continues at the end
|
||||
if self.english_armed:
|
||||
# Forced English: insert directly. Space ends the word; other symbols end it too.
|
||||
if c == " ":
|
||||
self._end_direct_english()
|
||||
return True, " "
|
||||
if c.isascii() and (c.isalnum() or c in "'.,-/;"):
|
||||
return True, c
|
||||
self._end_direct_english()
|
||||
return PASS
|
||||
if self.english_mode and not self.keys:
|
||||
return PASS # English mode: every key goes to the app as typed
|
||||
if c == " ":
|
||||
if not self.keys:
|
||||
return PASS
|
||||
@@ -329,7 +307,7 @@ class CompositionEngine:
|
||||
def _commit(self, segs=None):
|
||||
segs = segs if segs is not None else self.segments
|
||||
text = "".join(self._render(s, True) for s in segs)
|
||||
if self.forced_mode and self._forced_is_correction:
|
||||
if self.forced_mode:
|
||||
self.classifier.learned.record("".join(self.keys), self.forced_mode)
|
||||
self._previous_mode = segs[-1][2] if segs else None
|
||||
self._previous_time = self.now()
|
||||
@@ -343,6 +321,5 @@ class CompositionEngine:
|
||||
self.keys = []
|
||||
self.cursor = None
|
||||
self.forced_mode = None
|
||||
self._forced_is_correction = False
|
||||
self.fixed = {}
|
||||
self.candidates = []
|
||||
|
||||
@@ -29,9 +29,9 @@
|
||||
← → 在組字區移動游標,選要改哪個字
|
||||
↓ 開啟游標前那個字或詞的候選字,按數字鍵 1–9 選字
|
||||
Esc 取消組字
|
||||
單按 Shift 下一個字強制英文(保持小寫、直接送出、沒有底線),
|
||||
按空白或 Enter 後恢復自動判斷;
|
||||
打到一半時按,同 Tab 整段翻轉。會出現「英文」小提示
|
||||
單按 Shift 切換英文模式(按鍵直接送出、保持小寫、沒有底線),
|
||||
再單按一次回到中英自動判斷,會出現「英文」/「中英自動」小提示;
|
||||
打到一半時按,同 Tab 整段翻轉
|
||||
Shift+字母 打大寫字母(也會強制英文)
|
||||
< > ? ! : 中文語境下自動變成全形 ,。?!:
|
||||
|
||||
|
||||
+15
-31
@@ -194,11 +194,15 @@ class MixedSegmentTests(unittest.TestCase):
|
||||
|
||||
|
||||
class ShiftTapTests(unittest.TestCase):
|
||||
def test_forces_next_word_english_lowercase(self):
|
||||
def test_toggles_english_mode(self):
|
||||
e = make_engine()
|
||||
self.assertEqual(type_keys("⇧ru ", e), "ru ")
|
||||
self.assertFalse(e.english_armed)
|
||||
self.assertEqual(type_keys("su3cl3\n", e), "你好")
|
||||
self.assertEqual(type_keys("⇧ru su ", e), "ru su ")
|
||||
self.assertTrue(e.english_mode)
|
||||
self.assertEqual(e.marked_text, "")
|
||||
self.assertEqual(e.handle(ENTER), (False, None))
|
||||
self.assertTrue(e.english_mode)
|
||||
self.assertEqual(type_keys("⇧su3cl3\n", e), "你好")
|
||||
self.assertFalse(e.english_mode)
|
||||
|
||||
def test_tap_twice_cancels(self):
|
||||
self.assertEqual(type_keys("⇧⇧su3cl3\n", make_engine()), "你好")
|
||||
@@ -208,20 +212,20 @@ class ShiftTapTests(unittest.TestCase):
|
||||
type_keys("so", e)
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.mode, ZHUYIN)
|
||||
self.assertFalse(e.english_mode)
|
||||
type_keys("\n", e)
|
||||
self.assertEqual(e.classifier.learned.weights["so"], 1)
|
||||
|
||||
def test_forcing_before_typing_not_learned(self):
|
||||
def test_english_mode_not_learned(self):
|
||||
e = make_engine()
|
||||
type_keys("⇧hello ", e)
|
||||
self.assertNotIn("hello", e.classifier.learned.weights)
|
||||
self.assertEqual(e.classifier.learned.weights, {})
|
||||
|
||||
def test_arming_survives_backspace(self):
|
||||
def test_backspace_goes_to_app(self):
|
||||
e = make_engine()
|
||||
type_keys("⇧r", e)
|
||||
e.handle(BACKSPACE)
|
||||
self.assertTrue(e.english_armed)
|
||||
self.assertEqual(type_keys("ru ", e), "ru ")
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.handle(BACKSPACE), (False, None))
|
||||
self.assertTrue(e.english_mode)
|
||||
|
||||
def test_detector(self):
|
||||
d = ShiftTapDetector()
|
||||
@@ -267,25 +271,5 @@ class CursorTests(unittest.TestCase):
|
||||
self.assertTrue(e.showing_candidates)
|
||||
|
||||
|
||||
class DirectEnglishTests(unittest.TestCase):
|
||||
def test_forced_english_has_no_composition(self):
|
||||
e = make_engine()
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.handle("r"), (True, "r"))
|
||||
self.assertEqual(e.marked_text, "")
|
||||
self.assertEqual(e.handle("'"), (True, "'"))
|
||||
self.assertEqual(e.handle(BACKSPACE), (False, None))
|
||||
self.assertTrue(e.english_armed)
|
||||
self.assertEqual(e.handle(" "), (True, " "))
|
||||
self.assertFalse(e.english_armed)
|
||||
|
||||
def test_enter_ends_forced_english(self):
|
||||
e = make_engine()
|
||||
e.handle(SHIFT_TAP)
|
||||
e.handle("a")
|
||||
self.assertEqual(e.handle(ENTER), (False, None))
|
||||
self.assertFalse(e.english_armed)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
@@ -144,14 +144,15 @@ class ShiftTapWrapperTests(unittest.TestCase):
|
||||
def test_tap_forces_english_lowercase(self):
|
||||
reply = tap_shift(self.svc)
|
||||
self.assertEqual(reply.get("showMessage"), "英文")
|
||||
self.assertEqual(type_text(self.svc, "ru "), "ru ")
|
||||
self.assertEqual(type_text(self.svc, "ru su "), "ru su ")
|
||||
self.assertEqual(tap_shift(self.svc).get("showMessage"), "中英自動")
|
||||
|
||||
def test_shift_with_letter_is_not_a_tap(self):
|
||||
self.svc.filterKeyDown(FakeKeyEvent("⇧", shift=True))
|
||||
press(self.svc, "H", shift=True)
|
||||
up = FakeKeyEvent("⇧")
|
||||
self.assertFalse(self.svc.filterKeyUp(up))
|
||||
self.assertFalse(self.svc.engine.english_armed)
|
||||
self.assertFalse(self.svc.engine.english_mode)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user