feat(keybind): 支持按键绑定在特定tag下

Author: boomker

flypy_xhfast.custom.yaml

@@ -69,6 +69,7 @@ patch:
     select_first_character: "9"       # `9/minus` 以词定字(首字)
     select_last_character: "0"        # `0/equal` 以词定字(尾字)
     bindings/+:
+      # - {when: has_menu, accept: ";", send: 2}                # 引号; 用于第2候选
       # - {when: has_menu, accept: "'", send: 3}                # 引号' 用于第3候选
       - {when: paging,    accept: comma, send: Page_Up}         # 逗号, 返回上一页
       - {when: has_menu,  accept: ']', send: Page_Down}         # 括号] 下一页
@@ -82,7 +83,9 @@ patch:
       - {when: composing, accept: Control+i, send: Control+Left}
       - {when: composing, accept: Control+o, send: Control+Right}
       - {when: composing, accept: Control+w, send: Control+BackSpace}
-      - {match: "^cC.*$", accept: "'",  send_sequence: '{Page_Down}'}
+      # 以下按键绑定规则(含`tag` / `match`)需 flypy_keybinder 支持
+      - {tag: "calculator", accept: "'", send_sequence: '{Page_Down}'}
+      # - {match: "^cC.*$", accept: "'",  send_sequence: '{Page_Down}'}
 
   recognizer/+:
     patterns/+:

flypy_xhfast.schema.yaml

@@ -30,6 +30,8 @@ switches:
 # 输入引擎
 engine:
   processors:
+    - key_binder
+    - lua_processor@*flypy_keybinder
     - lua_processor@*select_char
     - lua_processor@*symbol_menu
     - lua_processor@*easy_en*processor
@@ -43,8 +45,6 @@ engine:
     - lua_processor@*fuzzy_word_expand*processor
     - ascii_composer
     - recognizer
-    - key_binder
-    - lua_processor@*flypy_keybinder
     - speller
     - selector
     - navigator
@@ -199,7 +199,7 @@ custom_phrase:                      # 自定义短语, 包含固顶字
   enable_completion: false
 
 # 键位帮助
-flypy_key_map:                     # 小鹤双拼键位帮助
+flypy_key_map:                      # 小鹤双拼键位帮助
   prefix: "/ok"
   dictionary: ""
   tag: flypy_key_map

lua/calculator.lua

@@ -1,5 +1,4 @@
 -- author: ChaosAlphard, boomker
-
 require("lib/string")
 local T = {}
 
@@ -299,7 +298,7 @@ function T.func(input, seg, env)
     local segment = composition:back()
 
     local trigger_tbl = env.prefix:match("|") and string.split(env.prefix, "|") or { env.prefix }
-    if startsWith(input, trigger_tbl) or seg:has_tag("calculator") then
+    if seg:has_tag("calculator") then
         segment.prompt = "〔" .. env.tips .. "〕"
         if input:match("?h$") or input:match("^/h$") then goto HELP end
         -- 提取算式
@@ -335,6 +334,8 @@ function T.func(input, seg, env)
         end
     end
     if startsWith(input, trigger_tbl) or seg:has_tag("calculator") then
+        -- local cseg = Segment(seg.start, seg._end)
+        -- cseg.tags = Set({ "calc_help" })
         yield(Candidate("calc", seg.start, seg._end, "'/h'、'?h' 查看支持的函数", ""))
     end
 end

lua/flypy_keybinder.lua

@@ -6,6 +6,7 @@ local P = {}
 
 ---@class Binding
 ---element
+---@field tag string
 ---@field match string
 ---@field accept KeyEvent
 ---@field send_sequence KeySequence
@@ -14,14 +15,21 @@ local P = {}
 ---@param value ConfigMap
 ---@return Binding | nil
 local function parse(value)
+    local tag = value:get_value("tag")
     local match = value:get_value("match")
     local accept = value:get_value("accept")
     local send_sequence = value:get_value("send_sequence")
-    if not match or not accept or not send_sequence then return nil end
-    local key_event = KeyEvent(accept:get_string())
-    local sequence = KeySequence(send_sequence:get_string())
-    local binding = { match = match:get_string(), accept = key_event, send_sequence = sequence }
-    return binding
+    if (not match) and (not tag) then return nil end
+    local tag_match = tag and tag:get_string()
+    local match_pattern = match and match:get_string()
+    local key_event = accept and KeyEvent(accept:get_string())
+    local sequence = send_sequence and KeySequence(send_sequence:get_string())
+    if match_pattern and key_event and sequence then
+        return { match = match_pattern, accept = key_event, send_sequence = sequence }
+    elseif tag_match and key_event and sequence then
+        return { tag = tag_match, accept = key_event, send_sequence = sequence }
+    end
+    return nil
 end
 
 ---@param env KeyBinderEnv
@@ -53,10 +61,15 @@ function P.func(key_event, env)
     if not input_code then return 2 end
 
     if not (context.composition or context.composition:back()) then return 2 end
-    -- if not env.engine.context.composition:back():has_tag("abc") then return 2 end
+    local segment = context.composition:back()
+    if (not segment) then return 2 end
+    local tags = segment.tags
+
     for _, binding in ipairs(env.bindings) do
         -- 只有当按键和当前输入的模式都匹配的时候，才起作用
-        if key_event:eq(binding.accept) and rime_api.regex_match(input_code, binding.match) then
+        local match_tag = (not tags:empty()) and binding.tag and tags[binding.tag]
+        local match_input = binding.match and rime_api.regex_match(input_code, binding.match)
+        if key_event:eq(binding.accept) and (match_input or match_tag) then
             env.redirecting = true
             for _, key in ipairs(binding.send_sequence:toKeyEvent()) do
                 env.engine:process_key(key)

lua/select_char.lua

@@ -26,12 +26,16 @@ end
 function P.func(key, env)
     local engine = env.engine
     local context = engine.context
-    local input_code = context.input
     local composition = context.composition
     if composition:empty() then return 2 end
-    if input_code:match("^cC$") then return 2 end
     local segment = composition:back()
-    if (not segment) or (not segment:has_tag("abc")) then return 2 end
+    if (not segment) then return 2 end
+    local tags = segment.tags
+    for tag, _ in pairs(tags) do
+        if (tag ~= "abc") and (tag ~= "paging") then
+            return 2
+        end
+    end
 
     if (key:repr() == env.first_key) then
         local cand = context:get_selected_candidate()