X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-X.h;h=4842be1c9b4c31925ce55e3bfe7074d8bb2c438b;hb=819616dacfef49aad64a7a6f7460ab26c0bfbf2b;hp=7d719ca7b1eaaf5b698c44b08e68605a129b4889;hpb=b403579aa1e9704ab35659e856dde8582cb4c3f1;p=m17n%2Fm17n-lib.git

diff --git a/src/m17n-X.h b/src/m17n-X.h
index 7d719ca..4842be1 100644
--- a/src/m17n-X.h
+++ b/src/m17n-X.h
@@ -32,15 +32,6 @@ extern "C"
 {
 #endif
 
-/* For drawing.  */
-
-extern MSymbol Mdisplay;
-extern MSymbol Mscreen;
-extern MSymbol Mdrawable;
-extern MSymbol Mwidget;
-extern MSymbol Mdepth;
-extern MSymbol Mcolormap;
-
 /* For inputting.  */
 
 extern MInputDriver minput_xim_driver;
@@ -48,69 +39,64 @@ extern MSymbol Mxim;
 
 /*** @ingroup m17nInputMethodWin */
 /***en
-    @brief Structure pointed to by the argument $ARG of the function
-    input_open_im ().
+    @brief Structure pointed to by the argument $ARG of the function minput_open_im ().
 
     The type #MInputXIMArgIM is the structure pointed to by the
     argument $ARG of the function minput_open_im () for the foreign
     input method of name #Mxim.  */
 
-/***oldja
-    @brief ´Ø¿ô minput_open_im () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ
+/***ja
+    @brief ´Ø¿ô minput_open_im () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ.
 
-
-    #MInputXIMArgIM ·¿¤Ï¡¢´Ø¿ô minput_open_im () ¤¬Ì¾Á° #Mxim ¤ò»ý
-    ¤Ä³°ÉôÆþÎϥ᥽¥Ã¥É¤òÀ¸À®¤¹¤ëºÝ¤Ë°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂΤÇ
-    ¤¢¤ë¡£  */
+    #MInputXIMArgIM ·¿¤Ï¡¢´Ø¿ô minput_open_im () ¤¬Ì¾Á° #Mxim 
+    ¤ò»ý¤Ä³°ÉôÆþÎϥ᥽¥Ã¥É¤òÀ¸À®¤¹¤ëºÝ¤Ë°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂΤǤ¢¤ë¡£  */
 
 typedef struct
 {
   /***en The meaning of the following four members are the same as
       arguments to XOpenIM ().  */
-  /***oldja °Ê²¼¤Î£´¤Ä¤Î¥á¥ó¥Ð¤Î°ÕÌ£¤Ï¡¢XOpenIM () ¤Î°ú¿ô¤Î°ÕÌ£¤ÈƱ¤¸¤Ç¤¢
-      ¤ë¡£  */
+  /***ja °Ê²¼¤Î£´¤Ä¤Î¥á¥ó¥Ð¤Î°ÕÌ£¤Ï¡¢XOpenIM () ¤Î°ú¿ô¤Î°ÕÌ£¤ÈƱ¤¸¤Ç¤¢¤ë.  */
 
   /***en Display of the client.  */
-  /***oldja ¥¯¥é¥¤¥¢¥ó¥È¤Î¥Ç¥£¥¹¥×¥ì¥¤  */
+  /***ja ¥¯¥é¥¤¥¢¥ó¥È¤Î¥Ç¥£¥¹¥×¥ì¥¤.  */
   Display *display;
 
   /***en Pointer to the X resource database.  */
-  /***oldja X ¥ê¥½¡¼¥¹¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ø¤Î¥Ý¥¤¥ó¥¿  */
+  /***ja X ¥ê¥½¡¼¥¹¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ø¤Î¥Ý¥¤¥ó¥¿.  */
   XrmDatabase db;
 
   /***en Full class name of the application.  */
-  /***oldja ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î´°Á´¤Ê¥¯¥é¥¹Ì¾  */
+  /***ja ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î´°Á´¤Ê¥¯¥é¥¹Ì¾.  */
   char *res_class;
 
   /***en Full resource name of the application.  */
-  /***oldja ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î´°Á´¤Ê¥ê¥½¡¼¥¹Ì¾  */
+  /***ja ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î´°Á´¤Ê¥ê¥½¡¼¥¹Ì¾.  */
   char *res_name;
 
   /***en Locale name under which an XIM is opened.  */
-  /***oldja XIM¤¬¥ª¡¼¥×¥ó¤µ¤ì¤¿¥í¥±¡¼¥ë̾  */
+  /***ja XIM¤¬¥ª¡¼¥×¥ó¤µ¤ì¤¿¥í¥±¡¼¥ë̾.  */
   char *locale;
 
   /***en Arguments to XSetLocaleModifiers ().  */
-  /***oldja XSetLocaleModifiers () ¤Î°ú¿ô  */
+  /***ja XSetLocaleModifiers () ¤Î°ú¿ô.  */
   char *modifier_list;
 } MInputXIMArgIM;
-  /*=*/
+
+/*=*/
 
 /*** @ingroup m17nInputMethodWin */
 /***en
-    @brief Structure pointed to by the argument $ARG of the function
-    minput_create_ic.
+    @brief Structure pointed to by the argument $ARG of the function minput_create_ic ().
 
     The type #MInputXIMArgIC is the structure pointed to by the
     argument $ARG of the function minput_create_ic () for the foreign
     input method of name #Mxim.  */
 
-/***oldja
-    @brief ´Ø¿ô minput_create_ic () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ
+/***ja
+    @brief ´Ø¿ô minput_create_ic () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ.
 
-    #MInputXIMArgIC ·¿¤Ï¡¢´Ø¿ô minput_create_ic () ¤¬Ì¾Á° #Mxim ¤ò
-    »ý¤Ä³°ÉôÆþÎϥ᥽¥Ã¥ÉÍѤ˸ƤФì¤ëºÝ¤Ë¡¢°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½
-    ¤ÂΤǤ¢¤ë¡£ */
+    #MInputXIMArgIC ·¿¤Ï¡¢´Ø¿ô minput_create_ic () ¤¬Ì¾Á° #Mxim 
+    ¤ò»ý¤Ä³°ÉôÆþÎϥ᥽¥Ã¥ÉÍѤ˸ƤФì¤ëºÝ¤Ë¡¢°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂΤǤ¢¤ë¡£ */
 
 typedef struct
 {
@@ -118,30 +104,29 @@ typedef struct
       XNInputStyle.  If this is zero, ( @c XIMPreeditNothing | @c
       XIMStatusNothing) is used, and <preedit_attrs> and
       <status_attrs> are set to @c NULL.  */
-  /***oldja @c XCreateIC ¤Î @c XNInputStyle ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£
+  /***ja @c XCreateIC ¤Î @c XNInputStyle ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£
       ¥¼¥í¤Ê¤é¤Ð¡¢ ( @c XIMPreeditNothing | @c XIMStatusNothing) ¤¬ÍÑ
-      ¤¤¤é¤ì¡¢ <preedit_attrs> ¤È <status_attrs> ¤Ï @c NULL ¤ËÀßÄꤵ¤ì
-      ¤ë¡£ */
+      ¤¤¤é¤ì¡¢ <preedit_attrs> ¤È <status_attrs> ¤Ï @c NULL 
+      ¤ËÀßÄꤵ¤ì¤ë¡£ */
 
   XIMStyle input_style;
   /***en Used as the argument of @c XCreateIC following @c XNClientWindow.  */
-  /***oldja @c XCreateIC ¤Î @c XNClientWindow ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£  */
-
+  /***ja @c XCreateIC ¤Î @c XNClientWindow ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£  */
 
   Window client_win;
   /***en Used as the argument of @c XCreateIC following @c XNFocusWindow.  */
-  /***oldja @c XCreateIC ¤Î @c XNFocusWindow ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£  */
+  /***ja @c XCreateIC ¤Î @c XNFocusWindow ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£  */
 
   Window focus_win;
   /***en If non- @c NULL, used as the argument of @c XCreateIC following
       @c XNPreeditAttributes.  */
-  /***oldja @c NULL¤Ç¤Ê¤±¤ì¤Ð¡¢ @c XCreateIC following ¤Î@c
+  /***ja @c NULL ¤Ç¤Ê¤±¤ì¤Ð¡¢ @c XCreateIC following ¤Î@c
       XNPreeditAttributes ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£  */
 
   XVaNestedList preedit_attrs;
-  /***en If non-NULL, used as the argument of @c XCreateIC following
+  /***en If non- @c NULL, used as the argument of @c XCreateIC following
       @c XNStatusAttributes.  */ 
-  /***oldja @c NULL¤Ç¤Ê¤±¤ì¤Ð¡¢ @c XCreateIC following ¤Î @c
+  /***ja @c NULL ¤Ç¤Ê¤±¤ì¤Ð¡¢ @c XCreateIC following ¤Î @c
       XNStatusAttributes ¤Ë³¤¯°ú¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£  */
 
   XVaNestedList status_attrs;