Ticket #257: 00-84-utf8-complete.patch

src/complete.c

@@ -797 +797 @@
             *p = 0;
         }
         memcpy (in->buffer + start, text, len - start + end);
-        in->point += len;
+        in->point += mbstrnlen(text - start + end, len);
         update_input (in, 1);
         end += len;
     }
@@ -912 +912 @@
     if (in->completions && in->point != end)
         free_completions (in);
     if (!in->completions){
-        end = in->point;
+        end = columns_to_bytes(in->buffer, in->point);
         for (start = end ? end - 1 : 0; start > -1; start--)
             if (strchr (" \t;|<>", in->buffer [start]))
                 break;

src/util.c

@@ -139 +139 @@
         return strlen (str);
 }
 
+size_t
+mbstrnlen (const char *str, size_t maxlen)
+{
+#ifdef UTF8
+    if (1) {
+        size_t width = 0;
+
+        for (; *str && maxlen; str++, maxlen--) {
+            wchar_t c;
+            size_t len;
+
+            len = mbrtowc (&c, str, maxlen > MB_CUR_MAX ? MB_CUR_MAX : maxlen, NULL);
+            
+            if (len == (size_t)(-1) || len == (size_t)(-2)) break;
+            
+            if (len > 0) {
+                int wcsize = wcwidth(c);
+                width += wcsize >= 0 ? wcsize : 1;
+                str += len-1;
+            }
+        }
+
+        return width;
+    } else
+#endif
+        return strnlen (str, maxlen);
+}
+
 int
 columns_to_bytes (const char *str, int col)
 {

src/util.h

@@ -95 +95 @@
 
 void fix_utf8(char *str);
 size_t mbstrlen (const char *);
+size_t mbstrnlen (const char *, size_t);
 int columns_to_bytes (const char *, int);
 wchar_t *mbstr_to_wchar (const char *);
 char *wchar_to_mbstr (const wchar_t *);