multibyte update

[pkg/abook.git] / abook_rl.c

diff --git a/abook_rl.c b/abook_rl.c
index f6877f10625b1ebd75c37692f0d0e019c8fd7d40..00410f49a3485e9dfca6fe3559bf970ef56ba168 100644 (file)
--- a/abook_rl.c
+++ b/abook_rl.c
@@ -12,6 +12,9 @@
 #include "abook.h"
 #include "abook_rl.h"
 
+#define KEYPAD_HACK 1 /* enable keypad hack */
+#define CBREAK_HACK 1 /* enable cbreak hack */
+
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
@@ -28,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;
@@ -42,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,
@@ -118,9 +138,19 @@ abook_readline(WINDOW *w, int y, int x, char *s, int limit, bool use_completion)
        if(s && *s)
                add_history(s);
        
+#ifdef KEYPAD_HACK
+       keypad(w, FALSE);
+#endif
+#ifdef CBREAK_HACK
        nocbreak();
+#endif
        ret = readline(NULL);
+#ifdef CBREAK_HACK
        cbreak();
+#endif
+#ifdef KEYPAD_HACK
+       keypad(w, TRUE);
+#endif
 
        if(rl_cancelled && ret) {
                free(ret);