comparison src/mule-canna.c @ 2276:de0e5e7132db

[xemacs-hg @ 2004-09-15 15:04:15 by james] Use the latest Canna wide character interface.
author james
date Wed, 15 Sep 2004 15:04:19 +0000
parents 34abfb24e891
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
2275:445bd1969ed0 2276:de0e5e7132db
157 #include "buffer.h" 157 #include "buffer.h"
158 #include "file-coding.h" 158 #include "file-coding.h"
159 159
160 #ifdef CANNA2 160 #ifdef CANNA2
161 #define IROHA_BC 161 #define IROHA_BC
162 #define CANNA_NEW_WCHAR_AWARE
162 #include "canna/jrkanji.h" 163 #include "canna/jrkanji.h"
163 #include "canna/RK.h" 164 #include "canna/RK.h"
164 #else /* !CANNA2 */ 165 #else /* !CANNA2 */
165 #include "iroha/jrkanji.h" 166 #include "iroha/jrkanji.h"
166 #include "iroha/RK.h" 167 #include "iroha/RK.h"
168 extern int (*jrBeepFunc) (void);
167 #endif /* !CANNA2 */ 169 #endif /* !CANNA2 */
168 extern char *jrKanjiError; 170 extern char *jrKanjiError;
169 171
170 /* #### is this global really necessary? */ 172 /* #### is this global really necessary? */
171 #define KEYTOSTRSIZE 2048 173 #define KEYTOSTRSIZE 2048
337 339
338 return Qnil; 340 return Qnil;
339 } 341 }
340 342
341 /* For whatever reason, calling Fding directly from libCanna loses */ 343 /* For whatever reason, calling Fding directly from libCanna loses */
342 static void 344 static int
343 call_Fding (void) 345 call_Fding (void)
344 { 346 {
345 Fding (Qnil, Qnil, Qnil); 347 Fding (Qnil, Qnil, Qnil);
348 return 0;
346 } 349 }
347 350
348 DEFUN ("canna-initialize", Fcanna_initialize, 0, 3, 0, /* 351 DEFUN ("canna-initialize", Fcanna_initialize, 0, 3, 0, /*
349 Initialize ``canna'', which is a kana-to-kanji converter for XEmacs. 352 Initialize ``canna'', which is a kana-to-kanji converter for XEmacs.
350 The first arg specifies if inserting space character between BUNSETSU when 353 The first arg specifies if inserting space character between BUNSETSU when
433 /* イニシャライズで失敗した場合。 (on initialization failure) */ 436 /* イニシャライズで失敗した場合。 (on initialization failure) */
434 return Fcons (Qnil, val); 437 return Fcons (Qnil, val);
435 } 438 }
436 else 439 else
437 { 440 {
438 extern void (*jrBeepFunc) (void);
439
440 jrBeepFunc = call_Fding; 441 jrBeepFunc = call_Fding;
441 442
442 #ifdef KC_SETAPPNAME 443 #ifdef KC_SETAPPNAME
443 #ifndef CANNA_MULE 444 #ifndef CANNA_MULE
444 wcKanjiControl (0, KC_SETAPPNAME, "nemacs"); 445 wcKanjiControl (0, KC_SETAPPNAME, "nemacs");