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

engine: Ctrl+Shift chords belong to the application

Browse Source 
Ctrl+Shift+V switched to Vietnamese and ate the key, in every terminal
where it pastes; Ctrl+Shift+T and N opened no tab.  Only a plain
Ctrl+letter is a strans command now; a chord with Shift, Alt, or Super
commits what is pending and passes, as Alt and Super chords already did.
Caps Lock still works: the keysym's case never mattered.
This commit is contained in:
Hojun-Cho
2026-08-17 01:27:47 +09:00
parent 97e6f2cf1a
commit 1c8d9fac07
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -17,7 +17,9 @@ Vietnamese Telex is also available as a compatibility mode.
| `Ctrl+H` | One-shot Hanja search | | `Ctrl+H` | One-shot Hanja search |
A Korean keyboard's 한/영 key toggles Korean and English, and its 한자 key A Korean keyboard's 한/영 key toggles Korean and English, and its 한자 key
is `Ctrl+H`. is `Ctrl+H`. Only a plain `Ctrl` chord is a strans key: with `Shift`, `Alt`,
or `Super` held it commits what is pending and goes to the application, so
`Ctrl+Shift+V` still pastes.
A complete Japanese reading shows its Kanji candidates with none chosen. A complete Japanese reading shows its Kanji candidates with none chosen.
`Space` chooses the first and then steps on, wrapping (`Shift+Space` steps `Space` chooses the first and then steps on, wrapping (`Shift+Space` steps

19
strans.c
View File

@@ -615,6 +615,16 @@ searchlang(Rune c)
return c == LangEMOJI || c == LangHANJA ? c : 0; return c == LangEMOJI || c == LangHANJA ? c : 0;
} }
/*
* A chord with Alt or Super, or Ctrl with Shift, is the application's
* (Ctrl+Shift+V pastes); only a plain Ctrl+letter is a strans command.
*/
static int
chord(u32int mod)
{
return (mod & ~Mshift) != 0 && mod != Mctrl;
}
static void static void
endsearch(void) endsearch(void)
{ {
@@ -722,12 +732,11 @@ searchkey(u32int ks, u32int mod, Str *com)
endsearch(); endsearch();
return 1; return 1;
} }
if(ks >= Kspec || (ks < ' ' && !(mod & Mctrl)) || if(ks >= Kspec || (ks < ' ' && !(mod & Mctrl)) || chord(mod)){
(mod & (Malt|Msuper))){
flush(com); flush(com);
return 0; return 0;
} }
if(mod & Mctrl){ if(mod == Mctrl){
c = ctrlkey(ks); c = ctrlkey(ks);
n = searchlang(c); n = searchlang(c);
if(n != 0 && n != search.lang){ if(n != 0 && n != search.lang){
@@ -821,11 +830,11 @@ transition(u32int ks, u32int mod, Str *com)
reset(); reset();
return 1; return 1;
} }
if(ks >= Kspec || (mod & (Malt|Msuper))){ if(ks >= Kspec || chord(mod)){
flush(com); flush(com);
return 0; return 0;
} }
if(mod & Mctrl){ if(mod == Mctrl){
c = ctrlkey(ks); c = ctrlkey(ks);
n = searchlang(c); n = searchlang(c);
if(n != 0){ if(n != 0){

10
tests/engine_test.c
View File

@@ -1636,16 +1636,20 @@ engine_emoji_preedit_languages(struct ct *t)
CT_CHECK(t, !keystroke(Kmodfirst+2, 0, &com)); CT_CHECK(t, !keystroke(Kmodfirst+2, 0, &com));
impre(&im, &shown); impre(&im, &shown);
checkstr(t, "modifier preserves Japanese", "か", &shown); checkstr(t, "modifier preserves Japanese", "か", &shown);
CT_CHECK(t, keystroke('E', Mctrl|Mshift, &com)); CT_CHECK(t, keystroke('E', Mctrl, &com));
checkstr(t, "committed Japanese preedit", "か", &com); checkstr(t, "committed Japanese preedit", "か", &com);
CT_CHECK(t, search.lang); CT_CHECK(t, search.lang);
CT_EQ_INT(t, LangJP, im.l->lang); CT_EQ_INT(t, LangJP, im.l->lang);
CT_CHECK(t, !keystroke('E', Mctrl|Malt, &com)); CT_CHECK(t, !keystroke('E', Mctrl|Malt, &com));
CT_EQ_INT(t, 0, search.lang); CT_EQ_INT(t, 0, search.lang);
CT_CHECK(t, keystroke('E', Mctrl|Mshift, &com)); CT_CHECK(t, keystroke('E', Mctrl, &com));
CT_CHECK(t, !keystroke('E', Mctrl|Msuper, &com)); CT_CHECK(t, !keystroke('E', Mctrl|Msuper, &com));
CT_EQ_INT(t, 0, search.lang); CT_EQ_INT(t, 0, search.lang);
CT_CHECK(t, keystroke('E', Mctrl|Mshift, &com)); CT_CHECK(t, keystroke('E', Mctrl, &com));
CT_CHECK(t, !keystroke('V', Mctrl|Mshift, &com));
CT_EQ_INT(t, 0, search.lang);
CT_EQ_INT(t, LangJP, im.l->lang);
CT_CHECK(t, keystroke('E', Mctrl, &com));
CT_EQ_INT(t, LangJP, im.l->lang); CT_EQ_INT(t, LangJP, im.l->lang);
CT_CHECK(t, keystroke('a', 0, &com)); CT_CHECK(t, keystroke('a', 0, &com));
CT_CHECK(t, !keystroke(Kmodfirst+2, 0, &com)); CT_CHECK(t, !keystroke(Kmodfirst+2, 0, &com));