xemacs-beta: src/mule-canna.c comparison

comparison src/mule-canna.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	6240c7796c7a
children	74fd4e045ea6

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 else
 {
 char servername[256];
 CHECK_STRING (server);
-strncpy (servername, XSTRING (server)->_data, XSTRING (server)->_size);
+strncpy (servername, XSTRING_DATA (server), XSTRING_LENGTH (server));
-servername[XSTRING (server)->_size] = '\0';
+servername[XSTRING_LENGTH (server)] = '\0';
 jrKanjiControl (0, KC_SETSERVERNAME, servername);
 }
 if (NILP (rcfile))
 {
 else
 {
 char rcname[256];
 CHECK_STRING (rcfile);
-strncpy (rcname, XSTRING (rcfile)->_data, XSTRING (rcfile)->_size);
+strncpy (rcname, XSTRING_DATA (rcfile), XSTRING_LENGTH (rcfile));
-rcname[XSTRING (rcfile)->_size] = '\0';
+rcname[XSTRING_LENGTH (rcfile)] = '\0';
 jrKanjiControl (0, KC_SETINITFILENAME, rcname);
 }
 warning = (char **) 0;
 #ifdef nec_ews_svr4
 }
 val = Fcons (val, Qnil);
 if (res == -1)
 {
 val = Fcons (make_string ((unsigned char*) jrKanjiError,
 				strlen (jrKanjiError)), val);
 /* イニシャライズで失敗した場合。 */
 return Fcons (Qnil, val);
 }
 else
 CHECK_STRING (str);
 ksv.buffer = (unsigned char *) buf;
 ksv.bytes_buffer = KEYTOSTRSIZE;
 #ifndef CANNA_MULE
-ks.echoStr = XSTRING (str)->_data;
+ks.echoStr = XSTRING_DATA (str);
-ks.length = XSTRING (str)->_size;
+ks.length = XSTRING_LENGTH (str);
 #else /* CANNA_MULE */
-m2c (XSTRING (str)->_data, XSTRING (str)->_size, cbuf);
+m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), cbuf);
 ks.echoStr = cbuf;
 ks.length = strlen (cbuf);
 #endif /* CANNA_MULE */
 ksv.ks = &ks;
 len = jrKanjiControl (0, KC_DEFINEKANJI, (char *)&ksv);
 val = storeResults (buf, ksv.val, ksv.ks);
 return val;
 }
 DEFUN ("canna-set-width", Fcanna_set_width, 1, 1, 0, /*
 Set status-line width information, which is used to display
 kanji candidates.
 */
 (num))
 {
 CHECK_INT (num);
 jrKanjiStatusWithValue ksv;
 jrKanjiStatus ks;
 CHECK_STRING (yomi);
 #ifndef CANNA_MULE
-strncpy (buf, XSTRING (yomi)->_data, XSTRING (yomi)->_size);
+strncpy (buf, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi));
-ks.length = XSTRING (yomi)->_size;
+ks.length = XSTRING_LENGTH (yomi);
 buf[ks.length] = '\0';
 #else /* CANNA_MULE */
-m2c (XSTRING (yomi)->_data, XSTRING (yomi)->_size, buf);
+m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), buf);
 ks.length = strlen (buf);
 #endif /* CANNA_MULE */
 if (NILP (roma))
 {
 else
 {
 CHECK_STRING (roma);
 #ifndef CANNA_MULE
-strncpy (buf + XSTRING (yomi)->_size + 1, XSTRING (roma)->_data,
+strncpy (buf + XSTRING_LENGTH (yomi) + 1, XSTRING_DATA (roma),
-	       XSTRING (roma)->_size);
+	       XSTRING_LENGTH (roma));
-buf[XSTRING (yomi)->_size + 1 + XSTRING (roma)->_size] = '\0';
+buf[XSTRING_LENGTH (yomi) + 1 + XSTRING_LENGTH (roma)] = '\0';
-ks.mode = (unsigned char *)(buf + XSTRING (yomi)->_size + 1);
+ks.mode = (unsigned char *)(buf + XSTRING_LENGTH (yomi) + 1);
 #else /* CANNA_MULE */
 ks.mode = (unsigned char *)(buf + ks.length + 1);
-m2c (XSTRING (roma)->_data, XSTRING (roma)->_size, ks.mode);
+m2c (XSTRING_DATA (roma), XSTRING_LENGTH (roma), ks.mode);
 #endif /* CANNA_MULE */
 }
 ks.echoStr = (unsigned char *) buf;
 ksv.buffer = (unsigned char *) buf; /* 返値用 */
 int n;
 CHECK_STRING (str);
 #ifndef CANNA_MULE
-strncpy (buf, XSTRING (str)->_data, XSTRING (str)->_size);
+strncpy (buf, XSTRING_DATA (str), XSTRING_LENGTH (str));
-buf[XSTRING (str)->_size] = '\0';
+buf[XSTRING_LENGTH (str)] = '\0';
 #else /* CANNA_MULE */
-m2c (XSTRING (str)->_data, XSTRING (str)->_size, buf);
+m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), buf);
 #endif /* CANNA_MULE */
 p = (unsigned char**) buf;
 n = jrKanjiControl (0, KC_PARSE,  (char *) &p);
 val = Qnil;
 while (n > 0)
 if (confirmContext () == 0)
 {
 return Qnil;
 }
 #ifndef CANNA_MULE
-strncpy (yomibuf, XSTRING (yomi)->_data, XSTRING (yomi)->_size);
+strncpy (yomibuf, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi));
-yomibuf[XSTRING (yomi)->_size] = '\0';
+yomibuf[XSTRING_LENGTH (yomi)] = '\0';
-nbun = RkBgnBun (IRCP_context, XSTRING (yomi)->_data, XSTRING (yomi)->_size,
+nbun = RkBgnBun (IRCP_context, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi),
 		   (RK_XFER << RK_XFERBITS) | RK_KFER);
 #else /* CANNA_MULE */
-m2c (XSTRING (yomi)->_data, XSTRING (yomi)->_size, yomibuf);
+m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), yomibuf);
 nbun = RkBgnBun (IRCP_context, (char *) yomibuf, strlen (yomibuf),
 		   (RK_XFER << RK_XFERBITS) | RK_KFER);
 #endif /* CANNA_MULE */
 return kanjiYomiList (IRCP_context, nbun);
 {
 int nbun, len;
 CHECK_INT (bunsetsu);
 CHECK_INT (bunlen);
 nbun = XINT (bunsetsu);
 if (confirmContext () == 0)
 {
 return Qnil;
 }
 void
 syms_of_mule_canna (void)
 {
 DEFVAR_LISP ("CANNA", &VCANNA);		/* hir@nec, 1992.5.21 */
 VCANNA = Qt;					/* hir@nec, 1992.5.21 */
 DEFSUBR (Fcanna_key_proc);
 DEFSUBR (Fcanna_initialize);
 DEFSUBR (Fcanna_finalize);
 DEFSUBR (Fcanna_touroku_string);
 DEFSUBR (Fcanna_set_width);
 static void
 c2mu (char *cp, int l, char *mp)
 {
 char	ch, *ep = cp+l;
 while ((cp < ep) && (ch = *cp))
 {
 if ((unsigned char) ch == ISO_CODE_SS2)
 	{
 	  *mp++ = LEADING_BYTE_KATAKANA_JISX0201;
 /* MULE internal string to EUC multibyte string */
 static void
 m2c (unsigned char *mp, int l, unsigned char *cp)
 {
-unsigned char	ch, *ep = mp + l;;
+unsigned char	ch, *ep = mp + l;
 while ((mp < ep) && (ch = *mp++))
 {
 switch (ch)
 	{
 	case LEADING_BYTE_KATAKANA_JISX0201:
 	  break;
 	default:
 	  *cp++ = ch;
 	  break;
 	}
 }
 *cp = 0;
 }
 #undef make_string
 /* make_string after converting EUC string to MULE internal string */
 static Lisp_Object
 mule_make_string (unsigned char *p, int l)
 {
 unsigned char cbuf[4096];
 c2mu (p,l,cbuf);
 return (make_string (cbuf,strlen (cbuf)));
 }
 /* return the MULE internal string length of EUC string */
 /* Modified by sb to return a character count not byte count. */
 static int
 mule_strlen (unsigned char *p, int l)
 {
 unsigned char ch, *cp = p;
 int len = 0;
 while ((cp < p + l) && (ch = *cp))
 {
 if ((unsigned char) ch == ISO_CODE_SS2)
 	{
 	  len++;
 	  cp += 2;
 	}
 else
 	{
 	  len++;
 	  cp++;
 	}
 }
 return (len);
 }
 static void
 count_char (unsigned char *p, int len, int pos, int rev, int *clen, int *cpos,
 	    int *crev)
 {
 unsigned char *q = p;
 *clen = *cpos = *crev = 0;
 if (len == 0) return;
 while (q < p + pos)
 {
 (*clen)++;
 while (q < p + pos + rev)
 {
 (*clen)++;
 (*crev)++;
 if (*q++ & 0x80) q++;
 }
 while (q < p + len)
 {
 (*clen)++;
 if (*q++ & 0x80) q++;
 }

Mercurial > hg > xemacs-beta

comparison src/mule-canna.c @ 380:8626e4521993 r21-2-5