optimize rendering

Makefile

@@ -1,12 +1,12 @@
 CC = 9c
 LD = 9l
-CFLAGS = -Wall -Wextra -O2
+CFLAGS = -Wall -Wextra -O2 -g
 PROG = strans
 
 SRCS = $(wildcard *.c)
 OBJS = $(SRCS:.c=.o)
 
-all: $(PROG)
+all: $(PROG) xim bench 
 
 $(PROG): $(OBJS)
 	$(LD) -o $@ $(OBJS) -lthread -lString -lbio -lxcb -lm
@@ -15,5 +15,13 @@ $(OBJS): dat.h fn.h ipc.h
 
 clean:
 	rm -f $(OBJS) $(PROG)
+	make -C xim/ clean
+	make -C bench/ clean
 
-.PHONY: all clean
+xim:
+	make -C xim/
+
+bench:
+	make -C bench/
+
+.PHONY: all clean xim bench

bench.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+pkill strans
+pkill strans-xim
+sleep 1
+
+./strans map font &
+sleep 1
+
+# warm up glyph cache
+./bench/bench bench/bench.keys 100
+echo "cache warmed up"
+
+STRANS_PID=$(pgrep -x strans)
+perf record -g -o bench/perf.data -p "$STRANS_PID" &
+PERF_PID=$!
+sleep 1
+
+./bench/bench bench/bench.keys 100
+
+kill -INT $PERF_PID
+wait $PERF_PID 2>/dev/null
+pkill strans

bench/Makefile

@@ -0,0 +1,8 @@
+CC = cc
+CFLAGS = -Wall -O2
+
+bench: main.c
+	$(CC) $(CFLAGS) -o $@ main.c
+
+clean:
+	rm -f bench

bench/bench.keys

@@ -0,0 +1,30 @@
+^ntoukyounotenki^Ryoidesu^R
+konpyuutanopuroguramu^B^B^Bgramu^R
+nihongowobenkyoushiteimasu^R
+sakuranoshanohana^B^B^B^Bhanagasaiteiru^R
+kaigi^Ekyounokaigi^R
+ashitahaiitenkininarudeshou^R
+^sdkssudgktpdy^Rgksrmfekfqnxm^R
+vmfhrrh^Btprtmxm^Rdufrlavldml^R
+dmlrlwkekfwprtm^R
+gksrnl^B^B^Bdlfp^R
+answkd^Eanswkd^R
+qkrtlwkf^B^B^Bwkfgkf^R
+^thello world^R
+the quick brown fox jumps over the lazy dog^R
+programming is fun^R
+^vVietNam^Rxinchaobancokhoekhong^R
+toidilambaitap^B^B^Bbaitap^R
+hoctiengviet^R
+^nkaishanitsuutomeshiteimasu^R
+tanaboraguukoudesu^B^B^B^B^Bkoudesu^R
+^srhksrnrdlTkfgkwl^R
+answkddkssud^B^Bdkssud^R
+wnsdydgktpdy^R
+^vtoidenlopcuahang^R
+motngaymoiconduong^R
+^thigh performance input method^R
+^nnyuuryokuhouhou^R
+tesutonosuuretsu^R
+^sxkfldzmsdml^R
+qhfmfjxm^R

bench/main.c

@@ -0,0 +1,168 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+enum {
+	Kback	= 0xf008,
+	Kret	= 0xf00d,
+	Kesc	= 0xf01b,
+	Mctrl	= 1<<2,
+};
+
+typedef struct Key Key;
+struct Key {
+	int	k;
+	int	mod;
+};
+
+static Key *keys;
+static int nkeys;
+static int fd;
+
+static void
+die(char *msg)
+{
+	perror(msg);
+	exit(1);
+}
+
+static void
+addkey(int k, int mod)
+{
+	static int cap;
+
+	if(nkeys >= cap){
+		cap = cap ? cap * 2 : 256;
+		keys = realloc(keys, cap * sizeof(Key));
+		if(!keys)
+			die("realloc");
+	}
+	keys[nkeys].k = k;
+	keys[nkeys].mod = mod;
+	nkeys++;
+}
+
+static void
+loadkeys(char *file)
+{
+	FILE *f;
+	int c;
+
+	f = fopen(file, "r");
+	if(!f)
+		die(file);
+	while((c = fgetc(f)) != EOF){
+		if(c == '\n' || c == '\r')
+			continue;
+		if(c != '^'){
+			addkey(c, 0);
+			continue;
+		}
+		c = fgetc(f);
+		if(c == EOF)
+			break;
+		switch(c){
+		case 'B':
+			addkey(Kback, 0);
+			break;
+		case 'R':
+			addkey(Kret, 0);
+			break;
+		case 'E':
+			addkey(Kesc, 0);
+			break;
+		default:
+			addkey(c, Mctrl);
+			break;
+		}
+	}
+	fclose(f);
+}
+
+static void
+dial(void)
+{
+	struct sockaddr_un addr;
+
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if(fd < 0)
+		die("socket");
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	snprintf(addr.sun_path, sizeof(addr.sun_path),
+		"/tmp/strans.%d", getuid());
+	if(connect(fd, (struct sockaddr*)&addr, sizeof(addr)) < 0)
+		die("connect");
+}
+
+static void
+sendkey(int key, int mod)
+{
+	unsigned char req[4];
+
+	req[0] = 0;
+	req[1] = mod;
+	req[2] = key & 0xff;
+	req[3] = (key >> 8) & 0xff;
+	if(write(fd, req, 4) != 4)
+		die("write");
+}
+
+static int
+readresp(void)
+{
+	unsigned char buf[256];
+	int n;
+
+	if(read(fd, buf, 2) != 2)
+		return -1;
+	n = buf[1];
+	if(n > 0 && read(fd, buf + 2, n) != n)
+		return -1;
+	return 0;
+}
+
+static double
+now(void)
+{
+	struct timespec ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	return ts.tv_sec + ts.tv_nsec * 1e-9;
+}
+
+int
+main(int argc, char **argv)
+{
+	int i, j, niter;
+	double t0, t1, dt;
+
+	if(argc < 2){
+		fprintf(stderr, "usage: bench file [niter]\n");
+		exit(1);
+	}
+
+	loadkeys(argv[1]);
+	niter = argc > 2 ? atoi(argv[2]) : 1000;
+	dial();
+	t0 = now();
+	for(i = 0; i < niter; i++)
+		for(j = 0; j < nkeys; j++){
+			sendkey(keys[j].k, keys[j].mod);
+			if(readresp() < 0){
+				fprintf(stderr, "failed at iter %d key %d\n", i, j);
+				exit(1);
+			}
+		}
+	t1 = now();
+	dt = t1 - t0;
+	printf("%d iters x %d keys = %d keys\n", niter, nkeys, niter * nkeys);
+	printf("%.3f ms total, %.3f us/key, %.3f us/iter\n",
+		dt * 1000, dt * 1e6 / (niter * nkeys), dt * 1e6 / niter);
+	close(fd);
+	return 0;
+}

dat.h

@@ -97,6 +97,9 @@ struct Lang
 	int	lang;
 	char	*mapname;
 	char	*dictname;
+	Emit	(*trans)(Im*, Rune);
+	void	(*back)(Im*);
+	void	(*dictq)(Im*);
 	Trie	*map;
 	Hmap	*dict;
 };
@@ -113,8 +116,8 @@ struct Im
 typedef struct Drawcmd Drawcmd;
 struct Drawcmd
 {
-	Str	preedit;
-	Str	kouho[Maxkouho];
+	Str	pre;
+	Str	kouho[Maxdisp];
 	int	nkouho;
 	int	sel;
 };

fn.h

@@ -27,6 +27,10 @@ void	dictthread(void*);
 void	drawthread(void*);
 void	imthread(void*);
 Emit	transmap(Im*, Rune);
+Emit	transko(Im*, Rune);
+Emit	transvi(Im*, Rune);
+void	backko(Im*);
+void	dictsend(Im*, Str*);
 
 void	srvthread(void*);
 

font.c

@@ -99,7 +99,8 @@ void
 putfont(u32int *buf, int w, int h, int px, int py, Rune r)
 {
 	Glyph *g;
-	int i, j, x, y, a, sel, f;
+	int i, j, a, sel, f;
+	int y0, j0, j1, x0, i0, i1;
 	u32int *p;
 
 	if(r >= Nglyphs)
@@ -116,17 +117,18 @@ putfont(u32int *buf, int w, int h, int px, int py, Rune r)
 		if(g->bmp == nil)
 			return;
 	}
-	for(j = 0; j < g->h; j++){
-		y = py + j + g->oy + Fontsz - Fontbase;
-		if(y < 0 || y >= h)
-			continue;
-		for(i = 0; i < g->w; i++){
-			x = px + i + g->ox;
-			if(x < 0 || x >= w)
-				continue;
+
+	y0 = py + g->oy + Fontsz - Fontbase;
+	j0 = y0 < 0 ? -y0 : 0;
+	j1 = y0 + g->h > h ? h - y0 : g->h;
+	x0 = px + g->ox;
+	i0 = x0 < 0 ? -x0 : 0;
+	i1 = x0 + g->w > w ? w - x0 : g->w;
+	for(j = j0; j < j1; j++){
+		for(i = i0; i < i1; i++){
 			a = g->bmp[j * g->w + i];
 			if(a > 0){
-				p = &buf[y * w + x];
+				p = &buf[(y0 + j) * w + x0 + i];
 				sel = (*p == Colsel) ? 1 : 0;
 				*p = blendtab[sel][a];
 			}

ko.c

@@ -0,0 +1,327 @@
+#include "dat.h"
+#include "fn.h"
+
+enum
+{
+	Sbase	= 0xAC00,
+	Jbase	= 0x3131,
+	Jrange	= 51,
+	Ncho	= 19,
+	Njung	= 21,
+	Njong	= 28,
+};
+
+static Rune cho[] = {
+	L'ㄱ', L'ㄲ', L'ㄴ', L'ㄷ', L'ㄸ',
+	L'ㄹ', L'ㅁ', L'ㅂ', L'ㅃ', L'ㅅ',
+	L'ㅆ', L'ㅇ', L'ㅈ', L'ㅉ', L'ㅊ',
+	L'ㅋ', L'ㅌ', L'ㅍ', L'ㅎ',
+};
+
+static Rune jung[] = {
+	L'ㅏ', L'ㅐ', L'ㅑ', L'ㅒ', L'ㅓ',
+	L'ㅔ', L'ㅕ', L'ㅖ', L'ㅗ', L'ㅘ',
+	L'ㅙ', L'ㅚ', L'ㅛ', L'ㅜ', L'ㅝ',
+	L'ㅞ', L'ㅟ', L'ㅠ', L'ㅡ', L'ㅢ',
+	L'ㅣ',
+};
+
+static Rune jong[] = {
+	0,      L'ㄱ', L'ㄲ', L'ㄳ', L'ㄴ',
+	L'ㄵ', L'ㄶ', L'ㄷ', L'ㄹ', L'ㄺ',
+	L'ㄻ', L'ㄼ', L'ㄽ', L'ㄾ', L'ㄿ',
+	L'ㅀ', L'ㅁ', L'ㅂ', L'ㅄ', L'ㅅ',
+	L'ㅆ', L'ㅇ', L'ㅈ', L'ㅊ', L'ㅋ',
+	L'ㅌ', L'ㅍ', L'ㅎ',
+};
+
+static int choidx[Jrange] = {
+	[L'ㄱ'-Jbase] = 1,  [L'ㄲ'-Jbase] = 2,  [L'ㄴ'-Jbase] = 3,
+	[L'ㄷ'-Jbase] = 4,  [L'ㄸ'-Jbase] = 5,  [L'ㄹ'-Jbase] = 6,
+	[L'ㅁ'-Jbase] = 7,  [L'ㅂ'-Jbase] = 8,  [L'ㅃ'-Jbase] = 9,
+	[L'ㅅ'-Jbase] = 10, [L'ㅆ'-Jbase] = 11, [L'ㅇ'-Jbase] = 12,
+	[L'ㅈ'-Jbase] = 13, [L'ㅉ'-Jbase] = 14, [L'ㅊ'-Jbase] = 15,
+	[L'ㅋ'-Jbase] = 16, [L'ㅌ'-Jbase] = 17, [L'ㅍ'-Jbase] = 18,
+	[L'ㅎ'-Jbase] = 19,
+};
+
+static int jungidx[Jrange] = {
+	[L'ㅏ'-Jbase] = 1,  [L'ㅐ'-Jbase] = 2,  [L'ㅑ'-Jbase] = 3,
+	[L'ㅒ'-Jbase] = 4,  [L'ㅓ'-Jbase] = 5,  [L'ㅔ'-Jbase] = 6,
+	[L'ㅕ'-Jbase] = 7,  [L'ㅖ'-Jbase] = 8,  [L'ㅗ'-Jbase] = 9,
+	[L'ㅘ'-Jbase] = 10, [L'ㅙ'-Jbase] = 11, [L'ㅚ'-Jbase] = 12,
+	[L'ㅛ'-Jbase] = 13, [L'ㅜ'-Jbase] = 14, [L'ㅝ'-Jbase] = 15,
+	[L'ㅞ'-Jbase] = 16, [L'ㅟ'-Jbase] = 17, [L'ㅠ'-Jbase] = 18,
+	[L'ㅡ'-Jbase] = 19, [L'ㅢ'-Jbase] = 20, [L'ㅣ'-Jbase] = 21,
+};
+
+static int jongidx[Jrange] = {
+	[L'ㄱ'-Jbase] = 2,  [L'ㄲ'-Jbase] = 3,  [L'ㄳ'-Jbase] = 4,
+	[L'ㄴ'-Jbase] = 5,  [L'ㄵ'-Jbase] = 6,  [L'ㄶ'-Jbase] = 7,
+	[L'ㄷ'-Jbase] = 8,  [L'ㄹ'-Jbase] = 9,  [L'ㄺ'-Jbase] = 10,
+	[L'ㄻ'-Jbase] = 11, [L'ㄼ'-Jbase] = 12, [L'ㄽ'-Jbase] = 13,
+	[L'ㄾ'-Jbase] = 14, [L'ㄿ'-Jbase] = 15, [L'ㅀ'-Jbase] = 16,
+	[L'ㅁ'-Jbase] = 17, [L'ㅂ'-Jbase] = 18, [L'ㅄ'-Jbase] = 19,
+	[L'ㅅ'-Jbase] = 20, [L'ㅆ'-Jbase] = 21, [L'ㅇ'-Jbase] = 22,
+	[L'ㅈ'-Jbase] = 23, [L'ㅊ'-Jbase] = 24, [L'ㅋ'-Jbase] = 25,
+	[L'ㅌ'-Jbase] = 26, [L'ㅍ'-Jbase] = 27, [L'ㅎ'-Jbase] = 28,
+};
+
+#define Choidx(r)	(choidx[(r) - Jbase] - 1)
+#define Jungidx(r)	(jungidx[(r) - Jbase] - 1)
+#define Jongidx(r)	(jongidx[(r) - Jbase] - 1)
+
+static Rune jamomap[128] = {
+	['r'] = L'ㄱ', ['R'] = L'ㄲ',
+	['s'] = L'ㄴ', ['S'] = L'ㄴ',
+	['e'] = L'ㄷ', ['E'] = L'ㄸ',
+	['f'] = L'ㄹ', ['F'] = L'ㄹ',
+	['a'] = L'ㅁ', ['A'] = L'ㅁ',
+	['q'] = L'ㅂ', ['Q'] = L'ㅃ',
+	['t'] = L'ㅅ', ['T'] = L'ㅆ',
+	['d'] = L'ㅇ', ['D'] = L'ㅇ',
+	['w'] = L'ㅈ', ['W'] = L'ㅉ',
+	['c'] = L'ㅊ', ['C'] = L'ㅊ',
+	['z'] = L'ㅋ', ['Z'] = L'ㅋ',
+	['x'] = L'ㅌ', ['X'] = L'ㅌ',
+	['v'] = L'ㅍ', ['V'] = L'ㅍ',
+	['g'] = L'ㅎ', ['G'] = L'ㅎ',
+	['k'] = L'ㅏ', ['K'] = L'ㅏ',
+	['o'] = L'ㅐ', ['O'] = L'ㅒ',
+	['i'] = L'ㅑ', ['I'] = L'ㅑ',
+	['j'] = L'ㅓ', ['J'] = L'ㅓ',
+	['p'] = L'ㅔ', ['P'] = L'ㅖ',
+	['u'] = L'ㅕ', ['U'] = L'ㅕ',
+	['h'] = L'ㅗ', ['H'] = L'ㅗ',
+	['y'] = L'ㅛ', ['Y'] = L'ㅛ',
+	['n'] = L'ㅜ', ['N'] = L'ㅜ',
+	['b'] = L'ㅠ', ['B'] = L'ㅠ',
+	['m'] = L'ㅡ', ['M'] = L'ㅡ',
+	['l'] = L'ㅣ', ['L'] = L'ㅣ',
+};
+
+typedef struct Cpair Cpair;
+struct Cpair
+{
+	Rune	b;
+	Rune	a;
+	Rune	r;
+};
+
+static Cpair cvow[] = {
+	{L'ㅗ', L'ㅏ', L'ㅘ'},
+	{L'ㅗ', L'ㅐ', L'ㅙ'},
+	{L'ㅗ', L'ㅣ', L'ㅚ'},
+	{L'ㅜ', L'ㅓ', L'ㅝ'},
+	{L'ㅜ', L'ㅔ', L'ㅞ'},
+	{L'ㅜ', L'ㅣ', L'ㅟ'},
+	{L'ㅡ', L'ㅣ', L'ㅢ'},
+};
+
+static Cpair cjong[] = {
+	{L'ㄱ', L'ㅅ', L'ㄳ'},
+	{L'ㄴ', L'ㅈ', L'ㄵ'},
+	{L'ㄴ', L'ㅎ', L'ㄶ'},
+	{L'ㄹ', L'ㄱ', L'ㄺ'},
+	{L'ㄹ', L'ㅁ', L'ㄻ'},
+	{L'ㄹ', L'ㅂ', L'ㄼ'},
+	{L'ㄹ', L'ㅅ', L'ㄽ'},
+	{L'ㄹ', L'ㅌ', L'ㄾ'},
+	{L'ㄹ', L'ㅍ', L'ㄿ'},
+	{L'ㄹ', L'ㅎ', L'ㅀ'},
+	{L'ㅂ', L'ㅅ', L'ㅄ'},
+};
+
+static Rune
+keytojamo(int c)
+{
+	if(c >= 0 && c < 128)
+		return jamomap[c];
+	return 0;
+}
+
+static Rune
+combine(Cpair *t, int n, Rune b, Rune a)
+{
+	int i;
+
+	for(i = 0; i < n; i++)
+		if(t[i].b == b && t[i].a == a)
+			return t[i].r;
+	return 0;
+}
+
+static int
+splitpair(Cpair *t, int n, Rune c, Rune *stay, Rune *next)
+{
+	int i;
+
+	for(i = 0; i < n; i++){
+		if(t[i].r == c){
+			*stay = t[i].b;
+			*next = t[i].a;
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static Rune
+compose(int c, int j, int jo)
+{
+	return Sbase + c*Njung*Njong + j*Njong + jo;
+}
+
+static void
+decompose(Rune s, int *c, int *j, int *jo)
+{
+	int i;
+
+	i = s - Sbase;
+	*c = i / (Njung * Njong);
+	*j = (i / Njong) % Njung;
+	*jo = i % Njong;
+}
+
+static int
+issyl(Rune r)
+{
+	return r >= Sbase && r < Sbase + Ncho*Njung*Njong;
+}
+
+Emit
+transko(Im *im, Rune c)
+{
+	Emit e;
+	Rune jm, jc, last, comb, stay, next;
+	int ci, ji, joi, ni, si, vi;
+
+	memset(&e, 0, sizeof e);
+	jm = keytojamo(c);
+	if(jm == 0){
+		if(im->pre.n > 0){
+			e.s = im->pre;
+			sclear(&im->pre);
+		}
+		sputr(&e.s, c);
+		return e;
+	}
+
+	e.eat = 1;
+	last = slastr(&im->pre);
+	if(last == 0){
+		sputr(&e.next, jm);
+		return e;
+	}
+
+	if(!issyl(last)){
+		ci = Choidx(last);
+		ji = Jungidx(jm);
+		if(ci >= 0 && ji >= 0){
+			spopr(&im->pre);
+			sputr(&e.next, compose(ci, ji, 0));
+			return e;
+		}
+		if(Jungidx(last) >= 0 && ji >= 0){
+			comb = combine(cvow, nelem(cvow), last, jm);
+			if(comb){
+				spopr(&im->pre);
+				sputr(&e.next, comb);
+				return e;
+			}
+		}
+		e.s = im->pre;
+		sputr(&e.next, jm);
+		return e;
+	}
+
+	decompose(last, &ci, &ji, &joi);
+
+	if(joi == 0){
+		ni = Jongidx(jm);
+		if(ni > 0){
+			spopr(&im->pre);
+			sputr(&e.next, compose(ci, ji, ni));
+			return e;
+		}
+		vi = Jungidx(jm);
+		if(vi >= 0){
+			comb = combine(cvow, nelem(cvow), jung[ji], jm);
+			if(comb){
+				ni = Jungidx(comb);
+				spopr(&im->pre);
+				sputr(&e.next, compose(ci, ni, 0));
+				return e;
+			}
+		}
+	}
+
+	if(joi > 0){
+		comb = combine(cjong, nelem(cjong), jong[joi], jm);
+		if(comb){
+			ni = Jongidx(comb);
+			if(ni > 0){
+				spopr(&im->pre);
+				sputr(&e.next, compose(ci, ji, ni));
+				return e;
+			}
+		}
+		vi = Jungidx(jm);
+		if(vi >= 0){
+			jc = jong[joi];
+			if(splitpair(cjong, nelem(cjong), jc, &stay, &next)){
+				si = Jongidx(stay);
+				ni = Choidx(next);
+				spopr(&im->pre);
+				sputr(&e.s, compose(ci, ji, si));
+				sputr(&e.next, compose(ni, vi, 0));
+				return e;
+			}
+			ni = Choidx(jc);
+			if(ni >= 0){
+				spopr(&im->pre);
+				sputr(&e.s, compose(ci, ji, 0));
+				sputr(&e.next, compose(ni, vi, 0));
+				return e;
+			}
+		}
+	}
+
+	e.s = im->pre;
+	sputr(&e.next, jm);
+	return e;
+}
+
+void
+backko(Im *im)
+{
+	Rune last;
+	int c, j, jo;
+	Rune stay, next;
+
+	last = slastr(&im->pre);
+	if(!issyl(last)){
+		if(splitpair(cvow, nelem(cvow), last, &stay, &next)){
+			spopr(&im->pre);
+			sputr(&im->pre, stay);
+			return;
+		}
+		spopr(&im->pre);
+		return;
+	}
+	decompose(last, &c, &j, &jo);
+	spopr(&im->pre);
+	if(jo > 0 && splitpair(cjong, nelem(cjong), jong[jo], &stay, &next)){
+		sputr(&im->pre, compose(c, j, Jongidx(stay)));
+		return;
+	}
+	if(jo > 0){
+		sputr(&im->pre, compose(c, j, 0));
+		return;
+	}
+	if(splitpair(cvow, nelem(cvow), jung[j], &stay, &next)){
+		sputr(&im->pre, compose(c, Jungidx(stay), 0));
+		return;
+	}
+	sputr(&im->pre, cho[c]);
+}

main.c

@@ -61,7 +61,7 @@ threadmain(int argc, char **argv)
 		usage();
 
 	fontdir = argv[2];
-	drawc = chancreate(sizeof(Drawcmd), 0);
+	drawc = chancreate(sizeof(Drawcmd), 4);
 	keyc = chancreate(sizeof(Keyreq), 0);
 	dictreqc = chancreate(sizeof(Dictreq), 4);
 	dictresc = chancreate(sizeof(Dictres), 0);

strans.c

@@ -2,14 +2,21 @@
 #include "fn.h"
 
 static Im im;
+static void dictqmap(Im*);
+
+static void
+backmap(Im *im)
+{
+	spopr(&im->pre);
+}
 
 Lang langs[] = {
-	{LangEN,  "english", nil, nil, nil},
-	{LangJP,  "hira",   "kanji",  nil, nil},
-	{LangJPK, "kata",   "kanji",  nil, nil},
-	{LangKO,  "hangul", nil, nil, nil},
-	{LangEMOJI, "emoji", "emoji", nil, nil},
-	{LangVI, "telex", nil, nil, nil},
+	{LangEN,    "english", nil,      transmap, backmap, dictqmap, nil, nil},
+	{LangJP,    "hira",    "kanji",  transmap, backmap, dictqmap, nil, nil},
+	{LangJPK,   "kata",    "kanji",  transmap, backmap, dictqmap, nil, nil},
+	{LangKO,    "hangul",  nil,      transko,  backko,  dictqmap, nil, nil},
+	{LangEMOJI, "emoji",   "emoji",  transmap, backmap, dictqmap, nil, nil},
+	{LangVI,    "telex",   nil,      transvi,  backmap, dictqmap, nil, nil},
 };
 int nlang = nelem(langs);
 
@@ -17,7 +24,7 @@ static void
 clearkouho(void)
 {
 	im.nkouho = 0;
-	im.sel = 0;
+	im.sel = -1;
 }
 
 static void
@@ -36,15 +43,18 @@ static void
 show(void)
 {
 	Drawcmd dc;
-	int i;
+	int i, first, n;
 
-	sclear(&dc.preedit);
-	if(!mapget(im.l->map, &im.pre, &dc.preedit))
-		dc.preedit = im.pre;
-	dc.nkouho = im.nkouho;
-	dc.sel = im.sel;
-	for(i = 0; i < dc.nkouho; i++)
-		dc.kouho[i] = im.kouho[i];
+	sclear(&dc.pre);
+	if(!mapget(im.l->map, &im.pre, &dc.pre))
+		dc.pre = im.pre;
+	first = im.sel >= Maxdisp ? im.sel - Maxdisp + 1 : 0;
+	n = im.nkouho - first;
+	if(n > Maxdisp) n = Maxdisp;
+	dc.nkouho = n;
+	dc.sel = im.sel >= 0 ? im.sel - first : -1;
+	for(i = 0; i < n; i++)
+		dc.kouho[i] = im.kouho[first + i];
 	chansend(drawc, &dc);
 }
 
@@ -56,25 +66,32 @@ reset(void)
 	show();
 }
 
-static void
-dictq(void)
+void
+dictsend(Im *im, Str *key)
 {
-	Str dict;
 	Dictreq req;
 
-	if(!mapget(im.l->map, &im.pre, &dict)){
+	req.key = *key;
+	req.lang = im->l->lang;
+	req.pre = im->pre;
+	channbsend(dictreqc, &req);
+}
+
+static void
+dictqmap(Im *im)
+{
+	Str dict;
+
+	if(!mapget(im->l->map, &im->pre, &dict)){
 		clearkouho();
 		show();
 		return;
 	}
-	req.key = dict;
-	req.lang = im.l->lang;
-	req.pre = im.pre;
-	channbsend(dictreqc, &req);
+	dictsend(im, &dict);
 }
 
 static int
-checklang(int c)
+setlang(int c)
 {
 	Lang *l;
 
@@ -88,10 +105,10 @@ checklang(int c)
 static void
 commit(Str *com)
 {
-	Str kana;
+	Str val;
 
-	if(mapget(im.l->map, &im.pre, &kana))
-		sappend(com, &kana);
+	if(mapget(im.l->map, &im.pre, &val))
+		sappend(com, &val);
 	else
 		sappend(com, &im.pre);
 	sclear(&im.pre);
@@ -103,7 +120,7 @@ dotrans(Rune c, Str *com)
 	Emit e;
 	Dictreq req;
 
-	e = transmap(&im, c);
+	e = im.l->trans(&im, c);
 	if(e.s.n > 0)
 		sappend(com, &e.s);
 	sclear(&im.pre);
@@ -186,7 +203,7 @@ keystroke(u32int ks, u32int mod, Str *com)
 			return 0;
 		if(ks == Kdown && im.sel < im.nkouho - 1)
 			im.sel++;
-		if(ks == Kup && im.sel > 0)
+		if(ks == Kup && im.sel >= 0)
 			im.sel--;
 		show();
 		return 1;
@@ -216,12 +233,12 @@ keystroke(u32int ks, u32int mod, Str *com)
 	if(ks == Kback){
 		if(im.pre.n == 0)
 			return 0;
-		spopr(&im.pre);
+		im.l->back(&im);
 		if(im.pre.n == 0){
 			reset();
 			return 1;
 		}
-		dictq();
+		im.l->dictq(&im);
 		return 1;
 	}
 	if(ks == Kesc){
@@ -239,10 +256,15 @@ keystroke(u32int ks, u32int mod, Str *com)
 		reset();
 		if(ks >= 'a' && ks <= 'z')
 			ks -= 'a' - 1;
-		if(checklang(ks))
+		if(setlang(ks))
 			return 1;
 		return 0;
 	}
+	if(ks == '0' && im.nkouho > 0){
+		commit(com);
+		reset();
+		return 1;
+	}
 	if(ks > 0x7f || ks == ' '){
 		commit(com);
 		sputr(com, ks);

vi.c

@@ -0,0 +1,148 @@
+#include "dat.h"
+#include "fn.h"
+
+static struct {
+	Rune	base;
+	Rune	tone[5];	/* s f r x j */
+} vitone[] = {
+	{L'a', {L'á', L'à', L'ả', L'ã', L'ạ'}},
+	{L'â', {L'ấ', L'ầ', L'ẩ', L'ẫ', L'ậ'}},
+	{L'ă', {L'ắ', L'ằ', L'ẳ', L'ẵ', L'ặ'}},
+	{L'e', {L'é', L'è', L'ẻ', L'ẽ', L'ẹ'}},
+	{L'ê', {L'ế', L'ề', L'ể', L'ễ', L'ệ'}},
+	{L'i', {L'í', L'ì', L'ỉ', L'ĩ', L'ị'}},
+	{L'o', {L'ó', L'ò', L'ỏ', L'õ', L'ọ'}},
+	{L'ô', {L'ố', L'ồ', L'ổ', L'ỗ', L'ộ'}},
+	{L'ơ', {L'ớ', L'ờ', L'ở', L'ỡ', L'ợ'}},
+	{L'u', {L'ú', L'ù', L'ủ', L'ũ', L'ụ'}},
+	{L'ư', {L'ứ', L'ừ', L'ử', L'ữ', L'ự'}},
+	{L'y', {L'ý', L'ỳ', L'ỷ', L'ỹ', L'ỵ'}},
+	{L'A', {L'Á', L'À', L'Ả', L'Ã', L'Ạ'}},
+	{L'Â', {L'Ấ', L'Ầ', L'Ẩ', L'Ẫ', L'Ậ'}},
+	{L'Ă', {L'Ắ', L'Ằ', L'Ẳ', L'Ẵ', L'Ặ'}},
+	{L'E', {L'É', L'È', L'Ẻ', L'Ẽ', L'Ẹ'}},
+	{L'Ê', {L'Ế', L'Ề', L'Ể', L'Ễ', L'Ệ'}},
+	{L'I', {L'Í', L'Ì', L'Ỉ', L'Ĩ', L'Ị'}},
+	{L'O', {L'Ó', L'Ò', L'Ỏ', L'Õ', L'Ọ'}},
+	{L'Ô', {L'Ố', L'Ồ', L'Ổ', L'Ỗ', L'Ộ'}},
+	{L'Ơ', {L'Ớ', L'Ờ', L'Ở', L'Ỡ', L'Ợ'}},
+	{L'U', {L'Ú', L'Ù', L'Ủ', L'Ũ', L'Ụ'}},
+	{L'Ư', {L'Ứ', L'Ừ', L'Ử', L'Ữ', L'Ự'}},
+	{L'Y', {L'Ý', L'Ỳ', L'Ỷ', L'Ỹ', L'Ỵ'}},
+};
+
+static int tonetab[128] = {
+	['s'] = 1, ['f'] = 2, ['r'] = 3, ['x'] = 4, ['j'] = 5,
+};
+
+#define Istone(c)	((c) < 128 && tonetab[(c)] > 0)
+#define Toneidx(c)	(tonetab[(c)] - 1)
+
+static int
+isvowel(Rune c)
+{
+	int i;
+
+	for(i = 0; i < nelem(vitone); i++)
+		if(vitone[i].base == c)
+			return 1;
+	return 0;
+}
+
+static Rune
+removetone(Rune c)
+{
+	int i, j;
+
+	for(i = 0; i < nelem(vitone); i++){
+		if(vitone[i].base == c)
+			return c;
+		for(j = 0; j < 5; j++)
+			if(vitone[i].tone[j] == c)
+				return vitone[i].base;
+	}
+	return c;
+}
+
+static Rune
+applytone(Rune c, int tidx)
+{
+	int i;
+	Rune base;
+
+	base = removetone(c);
+	for(i = 0; i < nelem(vitone); i++)
+		if(vitone[i].base == base)
+			return vitone[i].tone[tidx];
+	return c;
+}
+
+Emit
+transvi(Im *im, Rune c)
+{
+	Emit e;
+	Str mapped, pre;
+	int i, tidx, vi, last, penult;
+	Rune v, b1, b2;
+
+	if(!Istone(c) && c != 'z')
+		return transmap(im, c);
+
+	memset(&e, 0, sizeof e);
+	if(im->pre.n == 0){
+		sputr(&e.s, c);
+		return e;
+	}
+	if(im->pre.r[im->pre.n - 1] == '\\'){
+		pre = im->pre;
+		pre.n--;
+		if(!mapget(im->l->map, &pre, &mapped))
+			mapped = pre;
+		sputr(&mapped, c);
+		e.eat = 1;
+		e.s = mapped;
+		return e;
+	}
+	if(!mapget(im->l->map, &im->pre, &mapped))
+		mapped = im->pre;
+	last = -1;
+	penult = -1;
+	for(i = 0; i < mapped.n; i++){
+		v = removetone(mapped.r[i]);
+		if(isvowel(v)){
+			penult = last;
+			last = i;
+		}
+	}
+	vi = -1;
+	if(last >= 0){
+		if(last < mapped.n - 1 || penult < 0)
+			vi = last;
+		else{
+			b1 = removetone(mapped.r[penult]);
+			b2 = removetone(mapped.r[last]);
+			if((b1 == 'o' || b1 == 'O') && (b2 == 'a' || b2 == 'A' || b2 == 'e' || b2 == 'E'))
+				vi = last;
+			else if((b1 == 'u' || b1 == 'U') && (b2 == 'y' || b2 == 'Y'))
+				vi = last;
+			else
+				vi = penult;
+		}
+	}
+	if(vi < 0){
+		e.eat = 1;
+		e.s = mapped;
+		sputr(&e.s, c);
+		return e;
+	}
+
+	if(c == 'z')
+		mapped.r[vi] = removetone(mapped.r[vi]);
+	else{
+		tidx = Toneidx(c);
+		mapped.r[vi] = applytone(mapped.r[vi], tidx);
+	}
+	e.eat = 1;
+	e.next = mapped;
+	return e;
+}

win.c

@@ -71,9 +71,11 @@ drawkouho(Drawcmd *dc, int first, int n, int w, int h)
 	Str *s;
 
 	memset(img, (uchar)Colbg, w * h * sizeof(u32int));
-	drawstr(img, 0, 0, dc->preedit.r, dc->preedit.n, w, h);
-	sely = Fontsz + (dc->sel - first) * Fontsz;
-	memset(img + sely * w, (uchar)Colsel, Fontsz * w * sizeof(u32int));
+	drawstr(img, 0, 0, dc->pre.r, dc->pre.n, w, h);
+	if(dc->sel >= 0){
+		sely = Fontsz + dc->sel * Fontsz;
+		memset(img + sely * w, (uchar)Colsel, Fontsz * w * sizeof(u32int));
+	}
 	for(i = 0, y = Fontsz; i < n; i++, y += Fontsz){
 		s = &dc->kouho[first+i];
 		putfont(img, w, h, 0, y, '1' + i + Asciitofull);
@@ -99,17 +101,16 @@ winhide(void)
 static void
 winshow(Drawcmd *dc)
 {
-	int px, py, w, h, i, n, first, maxw;
+	int px, py, w, h, i, n, maxw;
 	u32int vals[4];
 	xcb_query_pointer_reply_t *ptr;
 	xcb_query_pointer_cookie_t cookie;
 
 	cookie = xcb_query_pointer(conn, scr->root);
-	first = dc->sel >= Maxdisp ? dc->sel - Maxdisp + 1 : 0;
-	n = min(dc->nkouho - first, Maxdisp);
-	maxw = dc->preedit.n;
+	n = dc->nkouho;
+	maxw = dc->pre.n;
 	for(i = 0; i < n; i++)
-		maxw = max(maxw, dc->kouho[first+i].n);
+		maxw = max(maxw, dc->kouho[i].n);
 	ptr = xcb_query_pointer_reply(conn, cookie, nil);
 	if(ptr == nil)
 		die("xcb_query_pointer");
@@ -125,7 +126,7 @@ winshow(Drawcmd *dc)
 		XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
 		vals);
 	xcb_map_window(conn, win);
-	drawkouho(dc, first, n, w, h);
+	drawkouho(dc, 0, n, w, h);
 	putimage(w, h);
 }
 
@@ -137,7 +138,9 @@ drawthread(void*)
 	threadsetname("draw");
 	wininit();
 	while(chanrecv(drawc, &dc) > 0){
-		if(dc.nkouho == 0 && dc.preedit.n == 0)
+		while(channbrecv(drawc, &dc) > 0)
+			;
+		if(dc.nkouho == 0 && dc.pre.n == 0)
 			winhide();
 		else
 			winshow(&dc);