multibyte update

[pkg/abook.git] / abook_rl.c

diff --git a/abook_rl.c b/abook_rl.c
index 22c66ce497527d764776ddee531ec95444722776..00410f49a3485e9dfca6fe3559bf970ef56ba168 100644 (file)
--- a/abook_rl.c
+++ b/abook_rl.c
@@ -31,6 +31,11 @@
 #       include <history.h>
 #endif
 
+#ifdef HANDLE_MULTIBYTE
+#      include <wchar.h>
+#      include <mbswidth.h>
+#endif
+
 #define RL_READLINE_NAME       "Abook"
 
 static int rl_x, rl_y;
@@ -45,10 +50,22 @@ rl_refresh()
        wrefresh(rl_win);
 }
 
+#ifdef HANDLE_MULTIBYTE
+static int
+rline_calc_point()
+{
+       return (int)mbsnwidth(rl_line_buffer, rl_point, 0);
+}
+#endif
+
 static void
 rline_update()
 {      
+#ifdef HANDLE_MULTIBYTE
+       int real_point = rline_calc_point() + rl_x;
+#else
        int real_point = rl_point + rl_x;
+#endif
        
        if(real_point > (COLS - 1))
                mvwaddnstr(rl_win, rl_y, rl_x,