mirror of
https://codeberg.org/dnkl/foot.git
synced 2026-02-05 04:06:08 -05:00
fe8ca23cfe
The previous implementation stored compose chains in a dynamically allocated array. Adding a chain was easy: resize the array and append the new chain at the end. Looking up a compose chain given a compose chain key/index was also easy: just index into the array. However, searching for a pre-existing chain given a codepoint sequence was very slow. Since the array wasn’t sorted, we typically had to scan through the entire array, just to realize that there is no pre-existing chain, and that we need to add a new one. Since this happens for *each* codepoint in a grapheme cluster, things quickly became really slow. Things were ok:ish as long as the compose chain struct was small, as that made it possible to hold all the chains in the cache. Once the number of chains reached a certain point, or when we were forced to bump maximum number of allowed codepoints in a chain, we started thrashing the cache and things got much much worse. So what can we do? We can’t sort the array, because a) that would invalidate all existing chain keys in the grid (and iterating the entire scrollback and updating compose keys is *not* an option). b) inserting a chain becomes slow as we need to first find _where_ to insert it, and then memmove() the rest of the array. This patch uses a binary search tree to store the chains instead of a simple array. The tree is sorted on a “key”, which is the XOR of all codepoints, truncated to the CELL_COMB_CHARS_HI-CELL_COMB_CHARS_LO range. The grid now stores CELL_COMB_CHARS_LO+key, instead of CELL_COMB_CHARS_LO+index. Since the key is truncated, collisions may occur. This is handled by incrementing the key by 1. Lookup is of course slower than before, O(log n) instead of O(1). Insertion is slightly slower as well: technically it’s O(log n) instead of O(1). However, we also need to take into account the re-allocating the array will occasionally force a full copy of the array when it cannot simply be growed. But finding a pre-existing chain is now *much* faster: O(log n) instead of O(n). In most cases, the first lookup will either succeed (return a true match), or fail (return NULL). However, since key collisions are possible, it may also return false matches. This means we need to verify the contents of the chain before deciding to use it instead of inserting a new chain. But remember that this comparison was being done for each and every chain in the previous implementation. With lookups being much faster, and in particular, no longer requiring us to check the chain contents for every singlec chain, we can now use a dynamically allocated ‘chars’ array in the chain. This was previously a hardcoded array of 10 chars. Using a dynamic allocated array means looking in the array is slower, since we now need two loads: one to load the pointer, and a second to load _from_ the pointer. As a result, the base size of a compose chain (i.e. an “empty” chain) has now been reduced from 48 bytes to 32. A chain with two codepoints is 40 bytes. This means we have up to 4 codepoints while still using less, or the same amount, of memory as before. Furthermore, the Unicode random test (i.e. write random “unicode” chars) is now **faster** than current master (i.e. before text-shaping support was added), **with** test-shaping enabled. With text-shaping disabled, we’re _even_ faster.
261 lines
7.3 KiB
Meson
261 lines
7.3 KiB
Meson
project('foot', 'c',
|
|
version: '1.7.2',
|
|
license: 'MIT',
|
|
meson_version: '>=0.53.0',
|
|
default_options: [
|
|
'c_std=c11',
|
|
'warning_level=1',
|
|
'werror=true',
|
|
'b_ndebug=if-release'])
|
|
|
|
is_debug_build = get_option('buildtype').startswith('debug')
|
|
|
|
cc = meson.get_compiler('c')
|
|
|
|
if cc.has_function('memfd_create')
|
|
add_project_arguments('-DMEMFD_CREATE', language: 'c')
|
|
endif
|
|
|
|
add_project_arguments(
|
|
['-D_GNU_SOURCE=200809L'] +
|
|
(is_debug_build
|
|
? ['-D_DEBUG']
|
|
: [cc.get_supported_arguments('-fno-asynchronous-unwind-tables')]) +
|
|
(get_option('ime')
|
|
? ['-DFOOT_IME_ENABLED=1']
|
|
: []) +
|
|
(get_option('b_pgo') == 'use'
|
|
? ['-DFOOT_PGO_ENABLED=1']
|
|
: []) +
|
|
cc.get_supported_arguments(
|
|
['-pedantic',
|
|
'-fstrict-aliasing',
|
|
'-Wstrict-aliasing']),
|
|
language: 'c',
|
|
)
|
|
|
|
# Compute the relative path used by compiler invocations.
|
|
source_root = meson.current_source_dir().split('/')
|
|
build_root = meson.build_root().split('/')
|
|
relative_dir_parts = []
|
|
i = 0
|
|
in_prefix = true
|
|
foreach p : build_root
|
|
if i >= source_root.length() or not in_prefix or p != source_root[i]
|
|
in_prefix = false
|
|
relative_dir_parts += '..'
|
|
endif
|
|
i += 1
|
|
endforeach
|
|
i = 0
|
|
in_prefix = true
|
|
foreach p : source_root
|
|
if i >= build_root.length() or not in_prefix or build_root[i] != p
|
|
in_prefix = false
|
|
relative_dir_parts += p
|
|
endif
|
|
i += 1
|
|
endforeach
|
|
relative_dir = join_paths(relative_dir_parts) + '/'
|
|
|
|
if cc.has_argument('-fmacro-prefix-map=/foo=')
|
|
add_project_arguments('-fmacro-prefix-map=@0@='.format(relative_dir), language: 'c')
|
|
endif
|
|
|
|
math = cc.find_library('m')
|
|
threads = [dependency('threads'), cc.find_library('stdthreads', required: false)]
|
|
libepoll = dependency('epoll-shim', required: false)
|
|
pixman = dependency('pixman-1')
|
|
wayland_protocols = dependency('wayland-protocols')
|
|
wayland_client = dependency('wayland-client')
|
|
wayland_cursor = dependency('wayland-cursor')
|
|
xkb = dependency('xkbcommon', version: '>=1.0.0')
|
|
fontconfig = dependency('fontconfig')
|
|
utf8proc = dependency('libutf8proc', required: get_option('grapheme-clustering'))
|
|
|
|
if utf8proc.found()
|
|
add_project_arguments('-DFOOT_GRAPHEME_CLUSTERING=1', language: 'c')
|
|
endif
|
|
|
|
tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist')
|
|
fcft = dependency('fcft', version: ['>=2.4.0', '<3.0.0'], fallback: 'fcft')
|
|
|
|
tic = find_program('tic', native: true, required: get_option('terminfo'))
|
|
if tic.found()
|
|
add_project_arguments('-DHAVE_TERMINFO', language: 'c')
|
|
endif
|
|
|
|
wayland_protocols_datadir = wayland_protocols.get_pkgconfig_variable('pkgdatadir')
|
|
|
|
wscanner = dependency('wayland-scanner', native: true)
|
|
wscanner_prog = find_program(
|
|
wscanner.get_pkgconfig_variable('wayland_scanner'), native: true)
|
|
|
|
wl_proto_headers = []
|
|
wl_proto_src = []
|
|
wl_proto_xml = [
|
|
wayland_protocols_datadir + '/stable/xdg-shell/xdg-shell.xml',
|
|
wayland_protocols_datadir + '/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml',
|
|
wayland_protocols_datadir + '/unstable/xdg-output/xdg-output-unstable-v1.xml',
|
|
wayland_protocols_datadir + '/unstable/primary-selection/primary-selection-unstable-v1.xml',
|
|
wayland_protocols_datadir + '/stable/presentation-time/presentation-time.xml',
|
|
wayland_protocols_datadir + '/unstable/text-input/text-input-unstable-v3.xml',
|
|
]
|
|
|
|
if wayland_protocols.version().version_compare('>=1.21')
|
|
add_project_arguments('-DHAVE_XDG_ACTIVATION', language: 'c')
|
|
wl_proto_xml += [wayland_protocols_datadir + '/staging/xdg-activation/xdg-activation-v1.xml']
|
|
endif
|
|
|
|
foreach prot : wl_proto_xml
|
|
wl_proto_headers += custom_target(
|
|
prot.underscorify() + '-client-header',
|
|
output: '@BASENAME@.h',
|
|
input: prot,
|
|
command: [wscanner_prog, 'client-header', '@INPUT@', '@OUTPUT@'])
|
|
|
|
wl_proto_src += custom_target(
|
|
prot.underscorify() + '-private-code',
|
|
output: '@BASENAME@.c',
|
|
input: prot,
|
|
command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
|
|
endforeach
|
|
|
|
generate_version_sh = files('generate-version.sh')
|
|
version = custom_target(
|
|
'generate_version',
|
|
build_always_stale: true,
|
|
output: 'version.h',
|
|
command: [generate_version_sh, meson.project_version(), '@SOURCE_ROOT@', '@OUTPUT@'])
|
|
|
|
common = static_library(
|
|
'common',
|
|
'log.c', 'log.h',
|
|
'debug.c', 'debug.h',
|
|
'xmalloc.c', 'xmalloc.h',
|
|
'xsnprintf.c', 'xsnprintf.h'
|
|
)
|
|
|
|
misc = static_library(
|
|
'misc',
|
|
'hsl.c', 'hsl.h',
|
|
'macros.h',
|
|
'misc.c', 'misc.h',
|
|
'uri.c', 'uri.h'
|
|
)
|
|
|
|
vtlib = static_library(
|
|
'vtlib',
|
|
'base64.c', 'base64.h',
|
|
'composed.c', 'composed.h',
|
|
'csi.c', 'csi.h',
|
|
'dcs.c', 'dcs.h',
|
|
'osc.c', 'osc.h',
|
|
'sixel.c', 'sixel.h',
|
|
'vt.c', 'vt.h',
|
|
wl_proto_src + wl_proto_headers,
|
|
version,
|
|
dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb, utf8proc],
|
|
link_with: [common, misc],
|
|
)
|
|
|
|
pgolib = static_library(
|
|
'pgolib',
|
|
'grid.c', 'grid.h',
|
|
'selection.c', 'selection.h',
|
|
'terminal.c', 'terminal.h',
|
|
wl_proto_src + wl_proto_headers,
|
|
dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb],
|
|
link_with: vtlib,
|
|
)
|
|
|
|
if get_option('b_pgo') == 'generate'
|
|
executable(
|
|
'pgo',
|
|
'pgo/pgo.c',
|
|
wl_proto_src + wl_proto_headers,
|
|
dependencies: [math, threads, libepoll, pixman, wayland_client, xkb, fcft, tllist],
|
|
link_with: pgolib,
|
|
)
|
|
endif
|
|
|
|
executable(
|
|
'foot',
|
|
'async.c', 'async.h',
|
|
'box-drawing.c', 'box-drawing.h',
|
|
'config.c', 'config.h',
|
|
'commands.c', 'commands.h',
|
|
'extract.c', 'extract.h',
|
|
'fdm.c', 'fdm.h',
|
|
'foot-features.h',
|
|
'ime.c', 'ime.h',
|
|
'input.c', 'input.h',
|
|
'main.c',
|
|
'notify.c', 'notify.h',
|
|
'quirks.c', 'quirks.h',
|
|
'reaper.c', 'reaper.h',
|
|
'render.c', 'render.h',
|
|
'search.c', 'search.h',
|
|
'server.c', 'server.h', 'client-protocol.h',
|
|
'shm.c', 'shm.h',
|
|
'slave.c', 'slave.h',
|
|
'spawn.c', 'spawn.h',
|
|
'tokenize.c', 'tokenize.h',
|
|
'url-mode.c', 'url-mode.h',
|
|
'user-notification.c', 'user-notification.h',
|
|
'wayland.c', 'wayland.h',
|
|
wl_proto_src + wl_proto_headers, version,
|
|
dependencies: [math, threads, libepoll, pixman, wayland_client, wayland_cursor, xkb, fontconfig,
|
|
tllist, fcft],
|
|
link_with: pgolib,
|
|
install: true)
|
|
|
|
executable(
|
|
'footclient',
|
|
'client.c', 'client-protocol.h',
|
|
'foot-features.h',
|
|
'macros.h',
|
|
'util.h',
|
|
version,
|
|
dependencies: [tllist],
|
|
link_with: common,
|
|
install: true)
|
|
|
|
if tic.found()
|
|
terminfo_install_location = get_option('terminfo-install-location')
|
|
if terminfo_install_location == ''
|
|
terminfo_install_location = join_paths(get_option('datadir'), 'terminfo')
|
|
endif
|
|
|
|
custom_target(
|
|
'terminfo',
|
|
output: 'f',
|
|
input: 'foot.info',
|
|
command: [tic, '-x', '-o', '@OUTDIR@', '-e', 'foot,foot-direct', '@INPUT@'],
|
|
install: terminfo_install_location != 'disabled',
|
|
install_dir: terminfo_install_location)
|
|
else
|
|
terminfo_install_location = 'disabled'
|
|
endif
|
|
|
|
install_data(
|
|
'LICENSE', 'README.md', 'CHANGELOG.md',
|
|
install_dir: join_paths(get_option('datadir'), 'doc', 'foot'))
|
|
install_data(
|
|
'foot.desktop', 'foot-server.desktop',
|
|
install_dir: join_paths(get_option('datadir'), 'applications'))
|
|
install_data('foot.ini', install_dir: join_paths(get_option('datadir'), 'foot'))
|
|
|
|
subdir('completions')
|
|
subdir('doc')
|
|
subdir('icons')
|
|
|
|
summary(
|
|
{
|
|
'IME': get_option('ime'),
|
|
'Grapheme clustering': utf8proc.found(),
|
|
'Terminfo': tic.found(),
|
|
'Terminfo install location': terminfo_install_location,
|
|
},
|
|
bool_yn: true
|
|
)
|