(mface__realize): Handle the case of font->size < 0.

[m17n/m17n-lib.git] / src / input.c

diff --git a/src/input.c b/src/input.c
index a016c79..a5f02ca 100644 (file)
--- a/src/input.c
+++ b/src/input.c
@@ -1,5 +1,5 @@
 /* input.c -- input method module.
-   Copyright (C) 2003, 2004
+   Copyright (C) 2003, 2004, 2005
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H15PRO112
 
@@ -852,8 +852,6 @@ shift_state (MInputContext *ic, MSymbol state_name)
       ic->preedit_changed = ic->candidates_changed = 1;
       MPLIST_DO (p, ic_info->markers)
        MPLIST_VAL (p) = 0;
-      MPLIST_DO (p, ic_info->vars)
-       MPLIST_VAL (p) = 0;
       ic->cursor_pos = 0;
       memmove (ic_info->keys, ic_info->keys + ic_info->state_key_head,
               sizeof (int) * (ic_info->used - ic_info->state_key_head));
@@ -1335,12 +1333,20 @@ take_action_list (MInputContext *ic, MPlist *action_list)
            actions2 = NULL;
          else
            actions2 = MPLIST_PLIST (args);
+         MDEBUG_PRINT2 ("(%d,%d)", val1, val2);
          if (name == Mequal ? val1 == val2
              : name == Mless ? val1 < val2
              : val1 > val2)
-           ret = take_action_list (ic, actions1);
-         else if (actions2)
-           ret = take_action_list (ic, actions2);
+           {
+             MDEBUG_PRINT ("ok");
+             ret = take_action_list (ic, actions1);
+           }
+         else
+           {
+             MDEBUG_PRINT ("no");
+             if (actions2)
+               ret = take_action_list (ic, actions2);
+           }
          if (ret < 0)
            return ret;
        }
@@ -2423,17 +2429,14 @@ MInputDriver minput_default_driver;
     The variable #minput_driver is a pointer to the input method
     driver that is used by internal input methods.  The macro
     M17N_INIT () initializes it to a pointer to #minput_default_driver
-    (if <m17n<EM></EM>.h> is included) or to #minput_gui_driver (if
-    <m17n-gui<EM></EM>.h> is included).  */ 
+    if <m17n<EM></EM>.h> is included.  */ 
 /***ja
     @brief ÆâÉôÆþÎϥ᥽¥Ã¥ÉÍѥɥ饤¥Ð.
 
-    ÊÑ¿ô #minput_driver
-    ¤ÏÆâÉôÆþÎϥ᥽¥Ã¥É¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤Æ¤¤¤ëÆþÎϥ᥽¥Ã¥É¥É¥é¥¤¥Ð¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£
-    ¥Þ¥¯¥í M17N_INIT () ¤Ï¤³¤Î¥Ý¥¤¥ó¥¿¤ò
-    #minput_default_driver (<m17n<EM></EM>.h> ¤¬ include 
-    ¤µ¤ì¤Æ¤¤¤ë»þ) ¤Þ¤¿¤Ï #minput_gui_driver ( <m17n-gui<EM></EM>.h> ¤¬
-    include ¤µ¤ì¤Æ¤¤¤ë»þ) ¤Ë½é´ü²½¤¹¤ë¡£  */ 
+    ÊÑ¿ô #minput_driver ¤ÏÆâÉôÆþÎϥ᥽¥Ã¥É¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤Æ¤¤¤ëÆþÎÏ¥á
+    ¥½¥Ã¥É¥É¥é¥¤¥Ð¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£¥Þ¥¯¥í M17N_INIT () ¤Ï¤³¤Î¥Ý¥¤¥ó
+    ¥¿¤ò#minput_default_driver (<m17n<EM></EM>.h> ¤¬ include ¤µ¤ì¤Æ¤¤¤ë
+    »þ) ¤Ë½é´ü²½¤¹¤ë¡£  */ 
 
 MInputDriver *minput_driver;