pyrite-dev/sj4
12
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix IME

Browse source
This commit is contained in:
Nishi 2026-07-02 13:31:52 +09:00
commit 04e65f3f5e
112 changed files with 8 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/sj4common/Const.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef CONST_H
#define CONST_H

1
include/sj4common/sj4cmd.h
View file

@ -27,7 +27,6 @@
*
*/
#define SJ4SERV_VERSION_NO 2
#define SJ4_CONNECT 1

1
include/sj4common/sj4err.h
View file

@ -27,7 +27,6 @@
*
*/
#define SJ4_InternalError -1
#define SJ4_NormalEnd 0

1
include/sj4common/sj_const.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_CONST
#define _SJ_CONST

1
include/sj4common/sj_euc.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_EUC
#define _SJ_EUC

1
include/sj4common/sj_hinsi.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_HINSHI
#define _SJ_HINSHI

1
include/sj4core/Dict.h
View file

@ -27,7 +27,6 @@
*
*/
#define VERSIONPOS 0
#define PASSWDPOS 16

1
include/sj4core/Struct.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef STRUCT_H
#define STRUCT_H

1
include/sj4core/sj4lowlib.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef SJ4LOWLIB_H
#define SJ4LOWLIB_H

1
include/sj4core/sj_connect.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_CONNECT
#define _SJ_CONNECT

1
include/sj4core/sj_const.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_CONST
#define _SJ_CONST

1
include/sj4core/sj_dict.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_DICT
#define _SJ_DICT

1
include/sj4core/sj_global.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef SJ_GLOBAL_H
#define SJ_GLOBAL_H

1
include/sj4core/sj_kcnv.h
View file

@ -27,7 +27,6 @@
*
*/
#include <stdio.h>
#include "sj_typedef.h"
#include "sj_rename.h"

1
include/sj4core/sj_left.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_LEFT
#define _SJ_LEFT

1
include/sj4core/sj_prty.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_PRIORITY
#define _SJ_PRIORITY

1
include/sj4core/sj_rename.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_RENAME
#define _SJ_RENAME

1
include/sj4core/sj_right.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_RIGHT
#define _SJ_RIGHT

1
include/sj4core/sj_struct.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_STRUCT
#define _SJ_STRUCT

1
include/sj4core/sj_study.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_STUDY
#define _SJ_STUDY

1
include/sj4core/sj_suuji.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_SUUJI
#define _SJ_SUUJI

1
include/sj4core/sj_table.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_TABLE
#define _SJ_TABLE

1
include/sj4core/sj_typedef.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_TYPEDEF
#define _SJ_TYPEDEF

1
include/sj4core/sj_var.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_VAR
#define _SJ_VAR

1
include/sj4core/sj_yomi.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _SJ_YOMICODE
#define _SJ_YOMICODE

1
include/sj4rkcv/kana.h
View file

@ -27,7 +27,6 @@
*
*/
#define ZKATA1 0xa5
#define ZHIRA1 0xa4
#define ZKATAF2 0xa1

1
include/sj4rkcv/kctype.h
View file

@ -27,7 +27,6 @@
*
*/
#if !defined(__sony_news) || (defined(__sony_news) && !defined(SVR4))
#ifndef __KCTYPE
#define __KCTYPE

1
include/sj4rkcv/key.h
View file

@ -27,7 +27,6 @@
*
*/
#define KEY_NORMAL 0
#define KEY_CONV 1
#define KEY_HENKAN 2

1
include/sj4rkcv/rk.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef RK_H
#define RK_H

1
include/sj4rkcv/wchar16.h
View file

@ -27,7 +27,6 @@
*
*/
#ifndef _WCHARH
#define _WCHARH

1
lib/sj4common/sj_string.c
View file

@ -27,7 +27,6 @@
*
*/
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>

1
lib/sj4core/adddic.c
View file

@ -27,7 +27,6 @@
*
*/
#include <stdlib.h>
#include <string.h>

1
lib/sj4core/addelcmn.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"

1
lib/sj4core/alloc.c
View file

@ -27,7 +27,6 @@
*
*/
#include <stdlib.h>
#include <sys/types.h>
#include "sj_rename.h"

1
lib/sj4core/charsize.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/chrtbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_const.h"
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/cl2knj.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/clstudy.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/cmpstr.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_const.h"
#include "sj_typedef.h"

1
lib/sj4core/conjunc.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_yomi.h"

1
lib/sj4core/connect.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_connect.h"

1
lib/sj4core/cvtclknj.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/cvtdict.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"

1
lib/sj4core/cvtkanji.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/deldic.c
View file

@ -27,7 +27,6 @@
*
*/
#include <string.h>
#include "sj_kcnv.h"

1
lib/sj4core/dict.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"

1
lib/sj4core/functbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/fuzoku.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_right.h"

1
lib/sj4core/fzkyomi.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_const.h"
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/getkanji.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"

1
lib/sj4core/getrank.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/global.c
View file

@ -27,7 +27,6 @@
*
*/
#include <stdio.h>
#include <sys/types.h>
#include "sj_rename.h"

1
lib/sj4core/hzstrlen.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/init.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/istrcmp.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_const.h"

1
lib/sj4core/memory.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/mk2claus.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_right.h"

1
lib/sj4core/mkbunset.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_hinsi.h"

1
lib/sj4core/mkjiritu.c
View file

@ -27,7 +27,6 @@
*
*/
#include <string.h>
#include "sj_kcnv.h"

1
lib/sj4core/mkkouho.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"

1
lib/sj4core/mknumber.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_yomi.h"
#include "sj_suuji.h"

1
lib/sj4core/mvmemd.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/mvmemi.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/peepdic.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_yomi.h"

1
lib/sj4core/ph2knj.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_yomi.h"

1
lib/sj4core/ph_khtbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/priority.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_right.h"

1
lib/sj4core/prtytbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/s2ctbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_yomi.h"

1
lib/sj4core/sdepend.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "Dict.h"
#include "sj4err.h"

1
lib/sj4core/selclrec.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/selsuuji.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_const.h"

1
lib/sj4core/setconj.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_right.h"
#include "sj_hinsi.h"

1
lib/sj4core/setjrec.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"

1
lib/sj4core/setkouho.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"

1
lib/sj4core/setubi.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_hinsi.h"

1
lib/sj4core/sj2code.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_yomi.h"

1
lib/sj4core/skiphblk.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_dict.h"

1
lib/sj4core/skipkstr.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/srchdict.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/srchhead.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_yomi.h"

1
lib/sj4core/srchidx.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/srchnum.c
View file

@ -27,7 +27,6 @@
*
*/
#include <string.h>
#include "sj_kcnv.h"
#include "sj_yomi.h"

1
lib/sj4core/sstrcmp.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/sstrlen.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/sstrncmp.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_const.h"

1
lib/sj4core/stbtbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_yomi.h"

1
lib/sj4core/stttbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/study.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_kanakan.h"

1
lib/sj4core/suujitbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_const.h"
#include "sj_rename.h"
#include "sj_typedef.h"

1
lib/sj4core/terminat.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_right.h"

1
lib/sj4core/termtbl.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_const.h"

1
lib/sj4core/wakachi.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_kcnv.h"
#include "sj_right.h"
#include "sj_hinsi.h"

12
lib/sj4ime/ime.c
View file

@ -16,7 +16,7 @@ struct sj4ime {
Sj4Kouho kouho;
unsigned int last;
u_char romabuf[SJ4BUFSZ];
u_char romabuf[7];
u_char kanabuf[SJ4BUFSZ];
u_char convbuf[SJ4BUFSZ];
};
@ -139,7 +139,7 @@ void sj4_ime_key(Sj4Ime* ime, int key) {
key = toupper(key);
if(ime->romabuf[strlen(ime->romabuf) - 1] == 'N' && !(key == 'A' || key == 'I' || key == 'U' || key == 'E' || key == 'O' || key == 'N')) {
if(ime->romabuf[strlen(ime->romabuf) - 1] == 'N' && !(key == 'A' || key == 'I' || key == 'U' || key == 'E' || key == 'O' || key == 'Y' || key == 'N')) {
ime->romabuf[strlen(ime->romabuf) + 1] = 0;
ime->romabuf[strlen(ime->romabuf)] = 'N';
}
@ -158,9 +158,9 @@ void sj4_ime_key(Sj4Ime* ime, int key) {
n = strlen(kanatbl[i].roma) - strlen(kanatbl[i].roma2);
memmove(ime->romabuf - (n < 0 ? n : 0), ime->romabuf + (n > 0 ? n : 0), SJ4BUFSZ - n);
memmove(ime->romabuf - (n < 0 ? n : 0), ime->romabuf + (n > 0 ? n : 0), sizeof(ime->romabuf) - n);
if(n > 0) {
for(j = SJ4BUFSZ - n; j < SJ4BUFSZ; j++) ime->romabuf[j] = 0;
for(j = sizeof(ime->romabuf) - n; j < sizeof(ime->romabuf); j++) ime->romabuf[j] = 0;
} else {
for(j = 0; j < -n; j++) ime->romabuf[j] = 0;
}
@ -172,6 +172,10 @@ void sj4_ime_key(Sj4Ime* ime, int key) {
goto reduce;
}
}
if(strlen(ime->romabuf) >= 4) {
ime->romabuf[0] = 0;
}
}
}

1
lib/sj4rkcv/rk_conv.c
View file

@ -27,7 +27,6 @@
*
*/
#ifndef lint
static char rcsid[] = "$Header: /export/work/contrib/sj4/sj4rkcv/RCS/rk_conv.c,v 1.14 1994/06/03 07:42:16 notanaka Exp $";
#endif

1
lib/sj4rkcv/sj4_rkcv.c
View file

@ -27,7 +27,6 @@
*
*/
#include <stdlib.h>
#include <string.h>

1
lib/sj4rkcv/wc16_str.c
View file

@ -27,7 +27,6 @@
*
*/
#include <stdio.h>
#include <locale.h>
#include "wchar16.h"

1
src/sj4mkdic/char.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj_euc.h"
#include "sj4_dict_const.h"

1
src/sj4mkdic/cnvhinsi.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj4mkdic.h"
static struct gram_code {

1
src/sj4mkdic/file.c
View file

@ -27,7 +27,6 @@
*
*/
#include "sj4mkdic.h"
typedef struct filelist {

Some files were not shown because too many files have changed in this diff Show more