xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

acme: fix unicode handling for editout (from sources)

Browse source
This commit is contained in:
cinap_lenrek 2013-01-25 16:45:04 +01:00
parent 180e04ee41
commit 98dd0aebef
1 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
sys/src/cmd/acme/xfid.c
View file

@ -260,7 +260,7 @@ xfidread(Xfid *x)
int n, q;
uint off;
char *b;
char buf[128];
char buf[256];
Window *w;
q = FILE(x->f->qid);
@ -369,11 +369,42 @@ xfidread(Xfid *x)
winunlock(w);
}
static Rune*
fullrunewrite(Xfid *x, int *inr)
{
int q, cnt, c, nb, nr;
Rune *r;
q = x->f->nrpart;
cnt = x->count;
if(q > 0){
memmove(x->data+q, x->data, cnt); /* there's room; see fsysproc */
memmove(x->data, x->f->rpart, q);
cnt += q;
x->f->nrpart = 0;
}
r = runemalloc(cnt);
cvttorunes(x->data, cnt-UTFmax, r, &nb, &nr, nil);
/* approach end of buffer */
while(fullrune(x->data+nb, cnt-nb)){
c = nb;
nb += chartorune(&r[nr], x->data+c);
if(r[nr])
nr++;
}
if(nb < cnt){
memmove(x->f->rpart, x->data+nb, cnt-nb);
x->f->nrpart = cnt-nb;
}
*inr = nr;
return r;
}
void
xfidwrite(Xfid *x)
{
Fcall fc;
int c, cnt, qid, q, nb, nr, eval;
int c, qid, nb, nr, eval;
char buf[64], *err;
Window *w;
Rune *r;
@ -429,7 +460,7 @@ xfidwrite(Xfid *x)
case Qeditout:
case QWeditout:
r = bytetorune(x->data, &nr);
r = fullrunewrite(x, &nr);
if(w)
err = edittext(w, w->wrselrange.q1, r, nr);
else
@ -504,27 +535,7 @@ xfidwrite(Xfid *x)
goto BodyTag;
BodyTag:
q = x->f->nrpart;
cnt = x->count;
if(q > 0){
memmove(x->data+q, x->data, cnt); /* there's room; see fsysproc */
memmove(x->data, x->f->rpart, q);
cnt += q;
x->f->nrpart = 0;
}
r = runemalloc(cnt);
cvttorunes(x->data, cnt-UTFmax, r, &nb, &nr, nil);
/* approach end of buffer */
while(fullrune(x->data+nb, cnt-nb)){
c = nb;
nb += chartorune(&r[nr], x->data+c);
if(r[nr])
nr++;
}
if(nb < cnt){
memmove(x->f->rpart, x->data+nb, cnt-nb);
x->f->nrpart = cnt-nb;
}
r = fullrunewrite(x, &nr);
if(nr > 0){
wincommit(w, t);
if(qid == QWwrsel){