Use wcwidth to exactly determine how much space a character took
- So far we assumed it's one character worth of screen real-estaty per
character written, but combining and wide characters can change
this.
diff --git a/lens_default.c b/lens_default.c
index 1e57587..958114f 100644
--- a/lens_default.c
+++ b/lens_default.c
@@ -21,6 +21,8 @@
* 02110-1301 USA
*/
+#define _XOPEN_SOURCE /* For wcwidth from wchar.h. */
+
#include <ctype.h>
#include <stdlib.h>
#include <assert.h>
@@ -28,14 +30,15 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include <wchar.h>
#include "bits.h"
-#include "proc.h"
-#include "lens_default.h"
-#include "value.h"
#include "expr.h"
+#include "lens_default.h"
+#include "options.h"
+#include "output.h"
#include "type.h"
-#include "common.h"
+#include "value.h"
#include "zero.h"
#define READER(NAME, TYPE) \
@@ -587,7 +590,11 @@
return print_char(stream, buf[0]);
buf[c] = 0;
- return fprintf(stream, "%s", buf) >= 0 ? 1 : -1;
+ if (fprintf(stream, "%s", buf) < 0)
+ return -1;
+
+ c = wcwidth(wc);
+ return c >= 0 ? c : 0;
}
static int