Hojun-Cho/strans
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

engine: a takeover keeps the text it took for the context it took it from

Browse Source 
Two applications' focus events cross — ibus-daemon documents the case —
so the first key of the new one can arrive before the old one says it
lost focus.  The engine dropped whatever that context was composing; it
now keeps it and hands it back with the reset or release that follows,
which every frontend already commits.  Normal ordering is unchanged.
This commit is contained in:
Hojun-Cho
2026-08-17 12:07:19 +09:00
parent 34c0c501aa
commit a0e83f98c6
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/engine_test.c
View File

@@ -234,6 +234,7 @@ engine_active_owner_lifecycle(struct ct *t)
checkstr(t, "takeover resets old preedit", "ん", &res.preedit);
CT_EQ_PTR(t, &b, activeowner);
res = ownerrequest(&a, Keyreset, 0, 0);
checkstr(t, "the taken owner gets its reading back", "か", &res.commit);
CT_EQ_INT(t, 0, res.preedit.n);
impre(&im, &shown);
checkstr(t, "stale reset preserves owner", "ん", &shown);

3
tests/server_test.c
View File

@@ -284,7 +284,8 @@ server_connection_ownership(struct ct *t)
req = nextrequest(t, &f.pump, Keyreset);
CT_EQ_PTR(t, aowner, req.owner);
allowrequest(&f.pump);
CT_CHECK(t, readreply(t, &a, 1, "", preedit));
/* The reset hands back what the takeover took from this client. */
CT_CHECK(t, readreply(t, &a, 1, "か", preedit));
CT_EQ_STR(t, "", preedit);
CT_EQ_PTR(t, bowner, testengineowner());
if(!sendkey(t, &b, 1, 0, 0))

7
tests/xim_adapter_test.c
View File

@@ -1059,9 +1059,12 @@ xim_adapter_callback_owner_loss(struct ct *t)
checkpreowner();
notrace(t, &f);
/* Late XIM lifecycle messages remain idempotent after owner cleanup. */
/* The release hands back the reading the takeover took. */
release(&state);
nexttrace(t, &f, Keyrelease, &state);
CT_EQ_INT(t, 5, nwirecalls);
CT_EQ_INT(t, Wcommit, wirecalls[4].op);
/* Late XIM lifecycle messages remain idempotent after owner cleanup. */
release(&state);
notrace(t, &f);
memset(&hdr, 0, sizeof hdr);
@@ -1071,7 +1074,7 @@ xim_adapter_callback_owner_loss(struct ct *t)
hdr.major_opcode = XCB_XIM_DESTROY_IC;
callback(nil, nil, ic, &hdr, nil, nil, nil);
notrace(t, &f);
CT_EQ_INT(t, 4, nwirecalls);
CT_EQ_INT(t, 5, nwirecalls);
memset(&req, 0, sizeof req);
req.owner = &foreign;