[uim-commit] r1343 - trunk/fep

[yamamoto at freedesktop.org]

Author: yamamoto
Date: 2005-08-28 01:27:33 -0700 (Sun, 28 Aug 2005)
New Revision: 1343

Modified:
   trunk/fep/draw.c
   trunk/fep/helper.c
   trunk/fep/uim-fep.c
Log:
* fep/uim-fep.c (main_loop) : Fix the bug. I forgot to call end_callbacks.


Modified: trunk/fep/draw.c
===================================================================
--- trunk/fep/draw.c	2005-08-28 07:23:23 UTC (rev 1342)
+++ trunk/fep/draw.c	2005-08-28 08:27:33 UTC (rev 1343)
@@ -373,7 +373,7 @@
   debug2(("statusline_str = \"%s\"\n", statusline_str));
   debug2(("candidate_str = \"%s\"\n", candidate_str));
   debug2(("candidate_col = %d\n", candidate_col));
-  debug2(("prev_mode_str = %d\n", prev_mode_str));
+  debug2(("prev_mode_str = %s\n", prev_mode_str));
   debug2(("mode_str = %s\n", mode_str));
   debug2(("index_str = \"%s\"\n", index_str));
   debug2(("index_col = %d\n", index_col));

Modified: trunk/fep/helper.c
===================================================================
--- trunk/fep/helper.c	2005-08-28 07:23:23 UTC (rev 1342)
+++ trunk/fep/helper.c	2005-08-28 08:27:33 UTC (rev 1343)
@@ -44,6 +44,7 @@
 #include <stdlib.h>
 #endif
 #include "uim-fep.h"
+#include "callbacks.h"
 #include "helper.h"
 #include "str.h"
 #include <uim/uim-helper.h>

Modified: trunk/fep/uim-fep.c
===================================================================
--- trunk/fep/uim-fep.c	2005-08-28 07:23:23 UTC (rev 1342)
+++ trunk/fep/uim-fep.c	2005-08-28 08:27:33 UTC (rev 1343)
@@ -781,10 +781,14 @@
         buf[end + 1] = '\0';
         mode = atoi(&buf[start]);
         if (mode != uim_get_current_mode(g_context)) {
+          int need_draw;
           debug2(("mode change %d\n", mode));
           uim_set_mode(g_context, mode);
-          callbacks_set_mode(uim_get_current_mode(g_context));
-          draw_statusline_restore();
+          /* callbacks_set_mode(uim_get_current_mode(g_context)); */
+          need_draw = end_callbacks();
+          if (need_draw) {
+            draw_statusline_restore();
+          }
         }
       }
     }