diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-02-07 15:32:03 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-07 15:32:03 +0000 |
| commit | 8f4a8cd8ce65dacf3e7374ac88f70f576324b46b (patch) | |
| tree | 95890c93bf1ccbb9880c7d0143aa03237ac7f4b9 | |
| parent | main: include uname.sysname when logging host architecture (diff) | |
| parent | vt: remove xassert(), that cannot be optimized out, from action_print() (diff) | |
Merge branch 'xassert-performance-regression-2'
| -rw-r--r-- | ime.c | 6 | ||||
| -rw-r--r-- | vt.c | 2 |
2 files changed, 1 insertions, 7 deletions
@@ -25,11 +25,7 @@ enter(void *data, struct zwp_text_input_v3 *zwp_text_input_v3, LOG_DBG("enter: seat=%s", seat->name); /* The main grid is the *only* input-receiving surface we have */ - /* TODO: can we receive text_input::enter() _before_ keyboard_enter()? */ - struct terminal UNUSED *term = seat->kbd_focus; - xassert(term != NULL); - xassert(term_surface_kind(term, surface) == TERM_SURF_GRID); - + xassert(seat->kbd_focus != NULL); ime_enable(seat); } @@ -238,8 +238,6 @@ action_print(struct terminal *term, uint8_t c) L'│', L'≤', L'≥', L'π', L'≠', L'£', L'·', /* x - ~ */ }; - xassert(wcwidth(c) == 1); - if (unlikely(term->charsets.set[term->charsets.selected] == CHARSET_GRAPHIC) && c >= 0x60 && c <= 0x7e) { |
