mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-01 07:15:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: don't generate pre-compose table when -Dunicode-precompose=false

Browse source
This commit is contained in:
Daniel Eklöf 2020-05-02 18:43:13 +02:00
parent d8ebed0ee0
commit 804642580e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
meson.build
View file

@ -95,12 +95,16 @@ foreach prot : [
command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@']) command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
endforeach endforeach
generate_unicode_precompose_sh = files('scripts/generate-unicode-precompose.sh') if get_option('unicode-max-combining-chars') > 0 and get_option('unicode-precompose')
unicode_data = custom_target( generate_unicode_precompose_sh = files('scripts/generate-unicode-precompose.sh')
'unicode-data', unicode_data = custom_target(
input: 'UnicodeData.txt', 'unicode-data',
output: 'unicode-compose-table.h', input: 'UnicodeData.txt',
command: [generate_unicode_precompose_sh, '@INPUT@', '@OUTPUT@']) output: 'unicode-compose-table.h',
command: [generate_unicode_precompose_sh, '@INPUT@', '@OUTPUT@'])
else
unicode_data = []
endif
generate_version_sh = files('generate-version.sh') generate_version_sh = files('generate-version.sh')
version = custom_target( version = custom_target(

2
vt.c
View file

@ -527,6 +527,7 @@ action_utf8_4_entry(struct terminal *term, uint8_t c)
term->vt.utf8.data[term->vt.utf8.idx++] = c; term->vt.utf8.data[term->vt.utf8.idx++] = c;
} }
#if FOOT_UNICODE_PRECOMPOSE
static wchar_t static wchar_t
precompose(wchar_t base, wchar_t comb) precompose(wchar_t base, wchar_t comb)
{ {
@ -554,6 +555,7 @@ precompose(wchar_t base, wchar_t comb)
return (wchar_t)-1; return (wchar_t)-1;
} }
#endif
static void static void
action_utf8_print(struct terminal *term, uint8_t c) action_utf8_print(struct terminal *term, uint8_t c)