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

refactor preedit window layout

Browse Source 
'안'
1 안녕
2 안녕하세요
...
8 안녕하세요릭
This commit is contained in:
Hojun-Cho 2025-12-24 23:43:53 +09:00
parent 6b3c1cea8e
commit 84264e97d4
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dat.h
View File

@ -94,6 +94,7 @@ struct Im
typedef struct Drawcmd Drawcmd; typedef struct Drawcmd Drawcmd;
struct Drawcmd struct Drawcmd
{ {
Str preedit;
Str kouho[Maxkouho]; Str kouho[Maxkouho];
int nkouho; int nkouho;
int sel; int sel;

2
dict.c
View File

@ -13,8 +13,6 @@ dictlkup(Dictreq *req, Dictres *res)
res->nkouho = 0; res->nkouho = 0;
if(req->key.n == 0) if(req->key.n == 0)
return; return;
res->kouho[0] = req->key;
res->nkouho = 1;
l = getlang(req->lang); l = getlang(req->lang);
dict = l ? l->dict : nil; dict = l ? l->dict : nil;
if(dict == nil) if(dict == nil)

2
strans.c
View File

@ -35,6 +35,8 @@ show(void)
Drawcmd dc; Drawcmd dc;
int i; int i;
sclear(&dc.preedit);
mapget(im.l->map, &im.line, &dc.preedit);
dc.nkouho = im.nkouho; dc.nkouho = im.nkouho;
dc.sel = im.sel; dc.sel = im.sel;
for(i = 0; i < dc.nkouho; i++) for(i = 0; i < dc.nkouho; i++)

11
win.c
View File

@ -70,10 +70,11 @@ drawkouho(Drawcmd *dc, int first, int n, int w, int h)
int sely, y, i; int sely, y, i;
Str *s; Str *s;
sely = 2 + (dc->sel - first) * Fontsz;
memset(img, (uchar)Colbg, w * h * sizeof(u32int)); 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)); memset(img + sely * w, (uchar)Colsel, Fontsz * w * sizeof(u32int));
for(y = 2, i = 0; i < n; i++, y += Fontsz){ for(i = 0, y = Fontsz; i < n; i++, y += Fontsz){
s = &dc->kouho[first+i]; s = &dc->kouho[first+i];
putfont(img, w, h, 0, y, '1' + i + Asciitofull); putfont(img, w, h, 0, y, '1' + i + Asciitofull);
drawstr(img, 2*Fontsz, y, s->r, s->n, w, h); drawstr(img, 2*Fontsz, y, s->r, s->n, w, h);
@ -106,7 +107,7 @@ winshow(Drawcmd *dc)
cookie = xcb_query_pointer(conn, scr->root); cookie = xcb_query_pointer(conn, scr->root);
first = dc->sel >= Maxdisp ? dc->sel - Maxdisp + 1 : 0; first = dc->sel >= Maxdisp ? dc->sel - Maxdisp + 1 : 0;
n = min(dc->nkouho - first, Maxdisp); n = min(dc->nkouho - first, Maxdisp);
maxw = 0; maxw = dc->preedit.n;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
maxw = max(maxw, dc->kouho[first+i].n); maxw = max(maxw, dc->kouho[first+i].n);
ptr = xcb_query_pointer_reply(conn, cookie, nil); ptr = xcb_query_pointer_reply(conn, cookie, nil);
@ -115,7 +116,7 @@ winshow(Drawcmd *dc)
px = ptr->root_x + 10; px = ptr->root_x + 10;
py = ptr->root_y + 10; py = ptr->root_y + 10;
free(ptr); free(ptr);
vals[3] = h = n * Fontsz + 4; vals[3] = h = (n + 1) * Fontsz;
vals[2] = w = (maxw + 3) * Fontsz; vals[2] = w = (maxw + 3) * Fontsz;
vals[1] = py = max(0, min(py, scr->height_in_pixels - h)); vals[1] = py = max(0, min(py, scr->height_in_pixels - h));
vals[0] = px = max(0, min(px, scr->width_in_pixels - w)); vals[0] = px = max(0, min(px, scr->width_in_pixels - w));
@ -136,7 +137,7 @@ drawthread(void*)
threadsetname("draw"); threadsetname("draw");
wininit(); wininit();
while(chanrecv(drawc, &dc) > 0){ while(chanrecv(drawc, &dc) > 0){
if(dc.nkouho == 0) if(dc.nkouho == 0 && dc.preedit.n == 0)
winhide(); winhide();
else else
winshow(&dc); winshow(&dc);