mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-15 22:05:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use my_wcwidth()+my_wcswidth() instead of system’s wcwdith()+wcswidth()

Browse source 
But not that these functions map to the system’s versions if foot was
configured with ‘-Dsystem-wcwidth’.
This commit is contained in:
Daniel Eklöf 2022-01-05 22:14:30 +01:00
parent c758949145
commit 97ade97d38
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
vt.c
View file

@ -19,6 +19,7 @@
#include "osc.h"
#include "util.h"
#include "xmalloc.h"
#include "my-wcwidth.h"
#define UNHANDLED() LOG_DBG("unhandled: %s", esc_as_string(term, final))
@ -619,7 +620,7 @@ chain_key(uint32_t old_key, uint32_t new_wc)
static void
action_utf8_print(struct terminal *term, wchar_t wc)
{
int width = wcwidth(wc);
int width = my_wcwidth(wc);
const bool grapheme_clustering = term->conf->tweak.grapheme_shaping;
#if !defined(FOOT_GRAPHEME_CLUSTERING)
@ -672,7 +673,7 @@ action_utf8_print(struct terminal *term, wchar_t wc)
}
#endif
int base_width = wcwidth(base);
int base_width = my_wcwidth(base);
if (base_width > 0) {
term->grid->cursor.point.col = col;
term->grid->cursor.lcf = false;
@ -686,7 +687,7 @@ action_utf8_print(struct terminal *term, wchar_t wc)
term->fonts[0], base, wc, &base_from_primary,
&comb_from_primary, &pre_from_primary);
int precomposed_width = wcwidth(precomposed);
int precomposed_width = my_wcwidth(precomposed);
/*
* Only use the pre-composed character if: