Mercurial > kinput2.yaz
comparison lib/wnnlib.c @ 11:983aff0dcf18
imported patch 14_kinput2-v3.1-beta3-freewnn.diff
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Mon, 08 Mar 2010 20:37:40 +0900 |
parents | 92745d501b9a |
children |
comparison
equal
deleted
inserted
replaced
1:31f1de16683a | 11:983aff0dcf18 |
---|---|
280 /* | 280 /* |
281 * $B%U%!%s%/%7%g%s(B | 281 * $B%U%!%s%/%7%g%s(B |
282 * | 282 * |
283 * struct wnn_buf jcOpen(char *servername, char *envname, | 283 * struct wnn_buf jcOpen(char *servername, char *envname, |
284 * char *rcfilename, int override, | 284 * char *rcfilename, int override, |
285 * void (*errmsgfunc)(), int (*confirmfunc)(), | 285 * int (*errmsgfunc)(), int (*confirmfunc)(), |
286 * int timeout) | 286 * int timeout) |
287 * jl_open $B$"$k$$$O(B jl_open_lang $B$KBP1~$7$?(B wnnlib $B$N%$%s%?%U%'!<(B | 287 * jl_open $B$"$k$$$O(B jl_open_lang $B$KBP1~$7$?(B wnnlib $B$N%$%s%?%U%'!<(B |
288 * $B%9$G!"$3$N4X?t$NCf$G<B:]$K(B jl_open $B$"$k$$$O(B jl_open_lang $B$r8F(B | 288 * $B%9$G!"$3$N4X?t$NCf$G<B:]$K(B jl_open $B$"$k$$$O(B jl_open_lang $B$r8F(B |
289 * $B$S=P$9!#(Boverride $B$,(B True $B$N>l9g!"4{$K4D6-$,%5!<%PB&$K$"$C$F$b!"(B | 289 * $B$S=P$9!#(Boverride $B$,(B True $B$N>l9g!"4{$K4D6-$,%5!<%PB&$K$"$C$F$b!"(B |
290 * $B4D6-$r:F=i4|2=$9$k!#(B | 290 * $B4D6-$r:F=i4|2=$9$k!#(B |
579 #include <stdio.h> | 579 #include <stdio.h> |
580 #endif | 580 #endif |
581 #include "wnnlib.h" | 581 #include "wnnlib.h" |
582 #include "WStr.h" | 582 #include "WStr.h" |
583 #include <string.h> | 583 #include <string.h> |
584 #include <stdlib.h> | |
584 #include <pwd.h> | 585 #include <pwd.h> |
585 #include <X11/Xos.h> | 586 #include <X11/Xos.h> |
586 | 587 |
587 #ifndef LIBDIR | 588 #ifndef LIBDIR |
588 #define LIBDIR "/usr/local/lib/wnn" | 589 #define LIBDIR "/usr/local/lib/wnn" |
1365 return -1; | 1366 return -1; |
1366 } | 1367 } |
1367 | 1368 |
1368 /* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */ | 1369 /* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */ |
1369 clp = buf->clauseInfo + cl; | 1370 clp = buf->clauseInfo + cl; |
1370 len = jl_kanji_len(buf->wnn, cl); | 1371 len = jl_kanji_len(buf->wnn, cl, -1); |
1371 diff = len - ((clp + 1)->dispp - clp->dispp); | 1372 diff = len - ((clp + 1)->dispp - clp->dispp); |
1372 newlen = (buf->displayEnd - buf->displayBuf) + diff; | 1373 newlen = (buf->displayEnd - buf->displayBuf) + diff; |
1373 if (newlen > buf->bufferSize) { | 1374 if (newlen > buf->bufferSize) { |
1374 if (resizeBuffer(buf, newlen) < 0) | 1375 if (resizeBuffer(buf, newlen) < 0) |
1375 return -1; | 1376 return -1; |
3447 jcOpen(server, envname, override, rcfile, errmsg, confirm, timeout) | 3448 jcOpen(server, envname, override, rcfile, errmsg, confirm, timeout) |
3448 char *server; | 3449 char *server; |
3449 char *envname; | 3450 char *envname; |
3450 int override; | 3451 int override; |
3451 char *rcfile; | 3452 char *rcfile; |
3452 void (*errmsg)(); | 3453 int (*errmsg)(char *); |
3453 int (*confirm)(); | 3454 int (*confirm)(char *); |
3454 int timeout; | 3455 int timeout; |
3455 { | 3456 { |
3456 return jcOpen2(server, envname, override, rcfile, rcfile, errmsg, confirm, timeout); | 3457 return jcOpen2(server, envname, override, rcfile, rcfile, errmsg, confirm, timeout); |
3457 } | 3458 } |
3458 | 3459 |
3461 char *server; | 3462 char *server; |
3462 char *envname; | 3463 char *envname; |
3463 int override; | 3464 int override; |
3464 char *rcfile4; /* wnnenvrc for Wnn4 */ | 3465 char *rcfile4; /* wnnenvrc for Wnn4 */ |
3465 char *rcfile6; /* wnnenvrc for Wnn6 */ | 3466 char *rcfile6; /* wnnenvrc for Wnn6 */ |
3466 void (*errmsg)(); | 3467 int (*errmsg)(char *); |
3467 int (*confirm)(); | 3468 int (*confirm)(char *); |
3468 int timeout; | 3469 int timeout; |
3469 { | 3470 { |
3470 struct wnn_buf *wnnbuf; | 3471 struct wnn_buf *wnnbuf; |
3471 struct wnn_env *wnnenv; | 3472 struct wnn_env *wnnenv; |
3472 char *rcfile; | 3473 char *rcfile; |