diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-05-09 10:04:55 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-05-09 10:04:55 +0000 |
| commit | c090a0664f6c47a178bebfa77ba78bc63c396958 (patch) | |
| tree | fe651a31f2e70ceb8f7e1b045c8e2141a3ec4a1a | |
| parent | term: print: line-wrap multi-column characters instead of cutting them in half (diff) | |
Revert "term: print: line-wrap multi-column characters instead of cutting them in half"
This reverts commit 8448296bb3c0fa96f5af5cb7ec563bb0c7e99093.
Applications need to be multi-column character aware anyway, and they
should deal with this.
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | terminal.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a52f68f3..7c2e7c68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,7 +71,7 @@ * `OSC 12 ?` to return the cursor color, not the cursor's text color. * `OSC 12;#000000` to configure the cursor to use inverted foreground/background colors. -* Double-width characters line wrapping at end of line. + ### Security @@ -2284,11 +2284,9 @@ term_disable_app_sync_updates(struct terminal *term) } static inline void -print_linewrap(struct terminal *term, int width) +print_linewrap(struct terminal *term) { - if (likely(!(term->grid->cursor.lcf || - term->grid->cursor.point.col + width > term->cols))) - { + if (likely(!term->grid->cursor.lcf)) { /* Not and end of line */ return; } @@ -2331,7 +2329,7 @@ term_print(struct terminal *term, wchar_t wc, int width) if (unlikely(width <= 0)) return; - print_linewrap(term, width); + print_linewrap(term); print_insert(term, width); sixel_delete_at_cursor(term); |
