X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook_rl.c;fp=abook_rl.c;h=00410f49a3485e9dfca6fe3559bf970ef56ba168;hb=b1b41dce461ab21ae9a2bd26d7a00a381a5f81f8;hp=f9ebba6529f32c7e4a3675e4aa4c75e0df1bec38;hpb=6e541862e5e10bbc7e71dcafa4ff60f19272c66f;p=pkg%2Fabook.git

diff --git a/abook_rl.c b/abook_rl.c
index f9ebba6..00410f4 100644
--- a/abook_rl.c
+++ b/abook_rl.c
@@ -33,6 +33,7 @@
 
 #ifdef HANDLE_MULTIBYTE
 #	include <wchar.h>
+#	include <mbswidth.h>
 #endif
 
 #define RL_READLINE_NAME	"Abook"
@@ -53,27 +54,7 @@ rl_refresh()
 static int
 rline_calc_point()
 {
-	char *p;
-	int ret = 0;
-	
-	mbtowc(NULL, NULL, 0);
-	for(p = rl_line_buffer;(p - rl_line_buffer) < rl_point;) {
-		int a, l;
-		wchar_t wc;
-		
-		if((a = mbtowc(&wc, p, MB_CUR_MAX)) == 0)
-			break;
-		else if (a == -1)
-			return rl_point; /* fall back */
-		else
-			p += a;
-
-		l = wcwidth(wc);
-		if(l > 0)
-			ret += l;
-	}
-
-	return ret;
+	return (int)mbsnwidth(rl_line_buffer, rl_point, 0);
 }
 #endif