mirror of
https://github.com/qingjian-team/qingjian.git
synced 2026-11-14 00:15:05 +00:00
yenharvey
5fcba715b5
候选窗只在候选与译词的点击区域收鼠标，其余照旧穿透，按下不抢焦点；点中的目标交给 Router 按数字键 / 译词键同一套上屏。 Server 写不了文档，上屏的字挂在焦点会话上，DLL 下一拍轮询随 Update.commit 取走写进去，赶在轮询前来的键把它接在结果前面。 协议升到 8（本周期第一次升，Linux 插件一起改）；更老的 DLL 读不到 commit，不收它们的点击。 Closes #199 Closes #233
68 lines
2.3 KiB
Rust
68 lines
2.3 KiB
Rust
//! 鼠标点候选窗口：上屏的字挂到焦点会话上，下一拍轮询（或抢先来的键）带给 DLL；老协议的 DLL 不收点击。
|
|
|
|
use qingjian_render::HitTarget;
|
|
|
|
use crate::support::*;
|
|
|
|
fn poll(router: &mut Router, session: SessionId) -> (Frame, Option<String>) {
|
|
match router.handle(ClientMessage::Poll { session }) {
|
|
Some(ServerMessage::Update { frame, commit, .. }) => (frame, commit),
|
|
other => panic!("expected Update, got {other:?}"),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn clicking_a_candidate_commits_it_on_the_next_poll() {
|
|
let mut router = router();
|
|
let (_, _, frame) = type_letters(&mut router, "nihao");
|
|
let slot = slot_of(&frame, "你好");
|
|
router.handle_click(HitTarget::Candidate(slot as usize - 1));
|
|
let (after, commit) = poll(&mut router, SESSION);
|
|
assert_eq!(commit.as_deref(), Some("你好"));
|
|
assert!(after.is_empty());
|
|
// 交出去一次就没了
|
|
assert_eq!(poll(&mut router, SESSION).1, None);
|
|
}
|
|
|
|
#[test]
|
|
fn clicking_a_translation_commits_that_sense() {
|
|
let mut router = router();
|
|
let (_, _, frame) = type_letters(&mut router, "nihao");
|
|
let slot = slot_of(&frame, "你好");
|
|
router.handle_click(HitTarget::Translation {
|
|
candidate: slot as usize - 1,
|
|
sense: 0,
|
|
});
|
|
assert_eq!(poll(&mut router, SESSION).1.as_deref(), Some("hello"));
|
|
}
|
|
|
|
#[test]
|
|
fn a_key_before_the_poll_carries_the_clicked_text() {
|
|
let mut router = router();
|
|
let (_, _, frame) = type_letters(&mut router, "nihao");
|
|
let slot = slot_of(&frame, "你好");
|
|
router.handle_click(HitTarget::Candidate(slot as usize - 1));
|
|
let (_, commit, frame) = press(&mut router, letter('w'));
|
|
assert_eq!(commit.as_deref(), Some("你好"));
|
|
assert_eq!(preedit(&frame), "w");
|
|
assert_eq!(poll(&mut router, SESSION).1, None);
|
|
}
|
|
|
|
#[test]
|
|
fn old_dlls_do_not_take_clicks() {
|
|
let mut router = router();
|
|
let old = SessionId(2);
|
|
router.handle(ClientMessage::OpenSession {
|
|
session: old,
|
|
app: None,
|
|
protocol: PROTOCOL_VERSION - 1,
|
|
});
|
|
for c in "nihao".chars() {
|
|
press_in(&mut router, old, letter(c));
|
|
}
|
|
router.handle_click(HitTarget::Candidate(0));
|
|
let (frame, commit) = poll(&mut router, old);
|
|
assert_eq!(commit, None);
|
|
assert_eq!(preedit(&frame), "ni'hao");
|
|
}
|