diff options
Diffstat (limited to 'src/linebuffer.c')
| -rw-r--r-- | src/linebuffer.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/linebuffer.c b/src/linebuffer.c index 6773ca1..3fa08b0 100644 --- a/src/linebuffer.c +++ b/src/linebuffer.c @@ -1,4 +1,5 @@ #include "linebuffer.h" +#include "utf8.h" #include <ctype.h> #include <stdbool.h> #include <stdio.h> @@ -6,19 +7,23 @@ #include <string.h> #define NULL_TERMINATOR_LEN 1 +#define UTF8_MAX_BYTES_PER_CHAR 4 -LineBuffer *linebuffer_create(size_t buffer_capacity) { +LineBuffer *linebuffer_create(size_t line_width) { LineBuffer *lb = malloc(sizeof(LineBuffer)); if (lb == NULL) { return NULL; } + size_t buffer_capacity = line_width * UTF8_MAX_BYTES_PER_CHAR; lb->_buffer = malloc(buffer_capacity + NULL_TERMINATOR_LEN); if (lb->_buffer == NULL) { free(lb); return NULL; } lb->_num_words = 0; + lb->_line_width = line_width; lb->_buffer_length = 0; + lb->_display_width = 0; lb->_buffer_capacity = buffer_capacity; return lb; } @@ -31,6 +36,7 @@ void linebuffer_destroy(LineBuffer *lb) { void linebuffer_clear(LineBuffer *lb) { lb->_num_words = 0; lb->_buffer_length = 0; + lb->_display_width = 0; } bool linebuffer_append_word(LineBuffer *lb, const char *word) { @@ -40,25 +46,28 @@ bool linebuffer_append_word(LineBuffer *lb, const char *word) { if (lb->_num_words > 0) { lb->_buffer[lb->_buffer_length] = ' '; lb->_buffer_length++; + lb->_display_width++; } - size_t word_length = strlen(word); - memcpy(lb->_buffer + lb->_buffer_length, word, word_length); - lb->_buffer_length += word_length; + size_t word_byte_length = strlen(word); + size_t word_display_width = utf8_display_width(word); + memcpy(lb->_buffer + lb->_buffer_length, word, word_byte_length); + lb->_buffer_length += word_byte_length; + lb->_display_width += word_display_width; lb->_num_words++; return true; } bool linebuffer_can_fit(LineBuffer *lb, const char *word) { - size_t append_len = strlen(word); + size_t word_display_width = utf8_display_width(word); + size_t required_width = word_display_width; if (lb->_num_words > 0) { - // Account for space before the word - append_len++; + required_width++; } - return append_len <= linebuffer_space_remaining(lb); + return required_width <= linebuffer_space_remaining(lb); } size_t linebuffer_space_remaining(LineBuffer *lb) { - return lb->_buffer_capacity - lb->_buffer_length; + return lb->_line_width - lb->_display_width; } int linebuffer_write(LineBuffer *lb, FILE *fp) { |