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

Merge branch 'xassert-performance-regression-2'

Browse source
This commit is contained in:
Daniel Eklöf 2021-02-07 16:32:03 +01:00
commit 8f4a8cd8ce
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ime.c
View file

@ -25,11 +25,7 @@ enter(void *data, struct zwp_text_input_v3 *zwp_text_input_v3,
LOG_DBG("enter: seat=%s", seat->name); LOG_DBG("enter: seat=%s", seat->name);
/* The main grid is the *only* input-receiving surface we have */ /* The main grid is the *only* input-receiving surface we have */
/* TODO: can we receive text_input::enter() _before_ keyboard_enter()? */ xassert(seat->kbd_focus != NULL);
struct terminal UNUSED *term = seat->kbd_focus;
xassert(term != NULL);
xassert(term_surface_kind(term, surface) == TERM_SURF_GRID);
ime_enable(seat); ime_enable(seat);
} }

2
vt.c
View file

@ -238,8 +238,6 @@ action_print(struct terminal *term, uint8_t c)
L'│', L'≤', L'≥', L'π', L'≠', L'£', L'·', /* x - ~ */ L'│', L'≤', L'≥', L'π', L'≠', L'£', L'·', /* x - ~ */
}; };
xassert(wcwidth(c) == 1);
if (unlikely(term->charsets.set[term->charsets.selected] == CHARSET_GRAPHIC) && if (unlikely(term->charsets.set[term->charsets.selected] == CHARSET_GRAPHIC) &&
c >= 0x60 && c <= 0x7e) c >= 0x60 && c <= 0x7e)
{ {