aboutsummaryrefslogtreecommitdiff
path: root/vt.c (follow)
Commit message (Collapse)AuthorAgeLines
...
* meson: don't generate pre-compose table when -Dunicode-precompose=falseDaniel Eklöf2020-05-02-0/+2
|
* unicode-combine: remove utf8proc dependencyDaniel Eklöf2020-05-02-17/+40
| | | | | | | | | | | | We only used utf8proc to try to pre-compose a glyph from a base and combining character. We can do this ourselves by using a pre-compiled table of valid pre-compositions. This table isn't _that_ big, and binary searching it is fast. That is, for a very small amount of code, and not too much extra RO data, we can get rid of the utf8proc dependency.
* unicode-combining: don't limit ourselves to the (western) diacritics blocksDaniel Eklöf2020-05-02-13/+19
|
* unicode-combine: only compose if we don't have any other combining charactersDaniel Eklöf2020-05-01-16/+24
| | | | | | | | | If the client sent the sequence SAB, where SA does NOT have a composed representation, but SB does, the old code would compose SB and throw away A. This patch fixes this by only allowing a compose if there aren't any pre-existing combining characters.
* vt: utf8: track combining characters that we failed to composeDaniel Eklöf2020-05-01-15/+37
| | | | | | | | | | | | | | | When we detect a combining character, we first try to compose it with the base character (like before). When this fails, we instead add the combining character to the base cell's combining characters array. The reason for using a composed character when possible is twofold: one, the rendered glyph will look better since it will be a single glyph instead of two separate glyphs (possibly from different fonts(!)). And two, for performance. A composed glyph is a single glyph to render, while a decomposed glyph sequence means the renderer has to render multiple glyphs for a single cell.
* util.h: new header file defining commonly used macrosDaniel Eklöf2020-05-01-3/+1
|
* vt: lazily reset utf8 in action_utf8_*_entryDaniel Eklöf2020-04-27-4/+3
| | | | | | | | action_clear() is in the super hot code path. Avoid resetting utf8 state there, as utf8 input is relatively uncommon. Instead, reset it when we explicitly enter any of the utf8 collecting states, as this is exactly the point where we need it.
* vt: action_utf8_print: idx is cleared in action_clear()Daniel Eklöf2020-04-27-3/+0
|
* vt: utf8-*-entry: idx is cleared in action_clear()Daniel Eklöf2020-04-27-3/+3
|
* term: remove unneeded utf8.left memberDaniel Eklöf2020-04-27-15/+0
|
* utf8: add support for unicode combining charactersDaniel Eklöf2020-04-27-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature lets foot combine e.g. "a\u0301" to "á". We first check if the current character (that we're about to print) is a combining character, by checking if it's in one of the following ranges: * Combining Diacritical Marks (0300–036F), since version 1.0, with modifications in subsequent versions down to 4.1 * Combining Diacritical Marks Extended (1AB0–1AFF), version 7.0 * Combining Diacritical Marks Supplement (1DC0–1DFF), versions 4.1 to 5.2 * Combining Diacritical Marks for Symbols (20D0–20FF), since version 1.0, with modifications in subsequent versions down to 5.1 * Combining Half Marks (FE20–FE2F), versions 1.0, with modifications in subsequent versions down to 8.0 If it is, we check if the last cell appears to contain a valid symbol, and if so, we attempt to compose (combine) the last cell with the current character, using utf8proc. If the result is a combined character, we replace the content in the previous cell with the new, combined character. Thus, if you select and copy the printed character, you would get e.g. "\u00e1" instead of "a\u0301". This feature can be disabled. By default, it is enabled if the utf8proc library is found, but can be explicitly disabled, or enabled, with 'meson -Dunicode-combining=disabled|enabled'.
* grid: move 'cursor' state from terminal to gridDaniel Eklöf2020-04-16-8/+8
| | | | | This way, the 'normal' and 'alt' grids have their own cursor state, and we don't need to switch between them.
* mbstate: fix compile warning on systems where mbstate_t isn't an integralDaniel Eklöf2020-04-13-1/+1
| | | | | An empty initializer still ensures the entire object is zero-initialized.
* alt-screen: use a custom 'saved' cursor when switching to alt screenDaniel Eklöf2020-03-16-1/+1
| | | | | | | | | | | | | This fixes an issue where we failed to restore the cursor correctly when exiting from the alternate screen, if the client had sent escapes to save the cursor position while inside the alternate screen. This was because we used the *same* storage for saving the cursor position through escapes, as for saving it when entering the alternate screen. Fix by using a custom variable dedicated to normal <--> alt screen switching.
* vt: tag cells that were form-feed:ed, to allow correct text reflowDaniel Eklöf2020-02-10-2/+2
| | | | | | | | | To handle text reflow correctly when a line has a printable character in the last column, but was still line breaked, we need to track the fact that the slave inserted a line break here. Otherwise, when the window width is increased, we'll end up pulling up the next line, when we really should have inserted a line break.
* vt: ensure we never step outside our parameter and sub-parameter arraysDaniel Eklöf2020-02-01-6/+70
| | | | | | | | | | | | | | | | | | | | We only support 16 parameters, and for each parameter, 16 sub-parameters. If we ever hit that limit (or rather, if the client writes 17 (sub) parameters), log this and stop incrementing the parameter index variable. For performance reason, we implement the following behavior: * We never increment the parameter index past the supported number. This ensures all code *accessing* the parameter list can do so without verifying the validity of the index. * The *first* time we see too many parameters, and the first time we see too many sub parameters, log this. Then *never* log again. Even if we see too many parameters in a completely different escape. This is so that we don't have to keep a "have warned" boolean in the terminal struct, but can use a simple function local static variable.
* vt: collect (intermediate): log a warning if user supplied more than two intermediatesDaniel Eklöf2020-02-01-1/+1
|
* vt: collect (intermediate): log _which_ character we collectedDaniel Eklöf2020-02-01-1/+1
|
* vt: bug: state machine: csi entry: handle 0x3a/0x3b correctlyDaniel Eklöf2020-01-25-1/+1
| | | | | | | | | | | 0x3a/0x3b are ':' and ';'. These should not only switch to the 'csi param' state, but also be parsed as a parameter. This fixes an issue where a multi-parameter escape with the first parameter omitted was parsed incorrectly - as if the first parameter wasn't there. I.e. "\e[;123r" was parsed as "\e[123r"
* vt: bug: fix check for error from mbrtowc()Daniel Eklöf2020-01-23-1/+4
| | | | | | | mbrtowc() returns an unsigned. Need to cast to signed before checking if less than zero. This fixes an issue where invalid utf-8 sequences where treated as valid.
* term: factor out character printing to new function term_print()Daniel Eklöf2020-01-20-90/+4
|
* dcs: initial handling of DCS in generalDaniel Eklöf2020-01-12-0/+4
| | | | | | | | | | | | | | | | | | | | | | Add data structure to term->vt. This structure tracks the free-form data that is passed-through, and the handler to call at the end. Intermediates and parameters are collected by the normal VT parser. Then, when we enter the passthrough state, we call dcs_hook(). This function checks the intermediate(s) and parameters, and selects the appropriate unhook handler (and optionally does some execution already). In passthrough mode, we simply append strings to an internal buffer. This might have to be changed in the future, if we need to support a DCS that needs to execute as we go. In unhook (i.e. when the DCS is terminated), we execute the unhook handler. As a proof-of-concept, handlers for BSU/ESU (Begin/End Synchronized Update) has been added (but are left unimplemented).
* Revert "vt: refactor"Daniel Eklöf2019-12-20-208/+201
| | | | This reverts commit a575204bc77c711047740d2328d26043e8c976cb.
* vt: refactorDaniel Eklöf2019-12-20-201/+208
|
* vt: visually compact the switch tablesDaniel Eklöf2019-12-20-271/+271
|
* vt: remove enum action; add separate functions for each action insteadDaniel Eklöf2019-12-20-524/+491
|
* vt: remove debug assertDaniel Eklöf2019-12-20-1/+0
|
* vt: use a pointer that we increment, instead of indexingDaniel Eklöf2019-12-20-21/+21
|
* vt: use break, not continueDaniel Eklöf2019-12-20-17/+17
|
* vt: no need to assign to term->vt.state for *every* input byteDaniel Eklöf2019-12-20-18/+20
|
* vt: remove dead codeDaniel Eklöf2019-12-20-495/+0
|
* vt: don't special case UTF-8 collect stateDaniel Eklöf2019-12-20-24/+55
|
* vt: convert SOS/PM/APC string from table lookup to switchDaniel Eklöf2019-12-20-2/+30
|
* vt: convert DCS from table lookup to switchDaniel Eklöf2019-12-20-7/+195
|
* vt: convert CSI ignore from table lookup to switchDaniel Eklöf2019-12-20-2/+34
|
* vt: convert CSI intermediate from table lookup to switchDaniel Eklöf2019-12-20-2/+35
|
* vt: convert CSI param from table lookup to switchDaniel Eklöf2019-12-20-2/+39
|
* vt: add missing 'entry' actions to 'anywhere' sectionsDaniel Eklöf2019-12-20-2/+2
|
* vt: convert CSI entry from table lookup to switchDaniel Eklöf2019-12-20-4/+39
|
* vt: re-align switchesDaniel Eklöf2019-12-20-67/+68
|
* vt: replace GROUND, ESCAPE and ESCAPE_INTERMEDIATE tables with switchesDaniel Eklöf2019-12-20-5/+115
|
* vt: use a switch instead of a top-level state lookup tableDaniel Eklöf2019-12-20-1/+26
| | | | | Remove the top-level state lookup table, which mapped from a state enum to a state transition table, and replace it with a switch.
* vt: add commented out cases for 8-bit C1 control charactersDaniel Eklöf2019-12-14-0/+35
| | | | | | | | | | XTerm seems to ignore these when in UTF-8 mode. Since we _only_ support UTF-8, we don't need to recognize these control characters at all. However, it may be good to have them here for reference. So add them, but commented out, along with their corresponding 7-bit versions (which we _do_ recognize and implement).
* vt: don't try to move cursor outside the terminalDaniel Eklöf2019-11-29-7/+11
| | | | | | | | | When we insert an auto-newline, we must make sure we don't try to move outside the terminal window. This can for example happen when a scrolling region have been configured, and the cursor is **outside** the scrolling region (i.e. it's in the bottom margin).
* vt: fix memory corruption: wcwidth() may return -1Daniel Eklöf2019-11-29-12/+14
| | | | | When it did, we called print_insert() with that, which in turn resulted in a too large size value passed to memmove.
* csi/vt: don't bad client data as errorsDaniel Eklöf2019-11-29-1/+1
| | | | This gets rid of spam when cat:ing binary data.
* vt: only define esc_as_string() when debug logging has been enabledDaniel Eklöf2019-11-29-0/+2
|
* vt: disable logging BELLDaniel Eklöf2019-11-29-2/+2
|
* csi/ocs/vt: log unhandled/unrecognized sequences as debug messagesDaniel Eklöf2019-11-29-1/+1
| | | | | | | | Having them as error messages was nice when we where still missing lots of sequences. Now we don't anymore, and these just spam stdout as well as syslog when e.g. cat:ing binary data.
* vt: there are actually many state transitions that are no-opsDaniel Eklöf2019-11-29-1/+0
| | | | | | In most states, most 8-bit values are no-ops. This is already handled; action() recognizes ACTION_NONE as a no-op. Thus, all we need to do is remove the assertion.
* Revert "vt: replace pre_print() with term_autowrap()"Daniel Eklöf2019-11-17-2/+14
| | | | This reverts commit fd8a3992745b9ec51b6e6c1dfc39faf01369b680.
* vt: replace pre_print() with term_autowrap()Daniel Eklöf2019-11-17-14/+2
|
* csi: fix bad implementation of CBT (back tab)Daniel Eklöf2019-11-17-0/+1
| | | | | | | * It takes a parameter, that indicates the number of tab stops to move through * Use the tab stops defined in the tab stops list, not hard coded mod 8 columns.
* vt: bug (tab regression): don't get stuck on the same tab stopDaniel Eklöf2019-11-17-2/+2
| | | | | | | | | | | There were actually two bugs here: * When checking for a tab stop, make sure the new tab stop is at a different column. Otherwise you can't tab away from a tab stop. * When there aren't any tab stops configured, or when we're already beyond the last tab stop, then tab to the last column (at least I think that's what we're supposed to do).
* term: save/restore charsets on save/restore cursor+attributesDaniel Eklöf2019-11-17-6/+2
|
* term: move charset variables into an anonymous structDaniel Eklöf2019-11-17-7/+13
|
* term: move lcf flag into 'cursor' structDaniel Eklöf2019-11-17-2/+2
|
* term: add struct cursorDaniel Eklöf2019-11-17-21/+21
|
* term: rename: print_needs_wrap -> lcf (Last Column Flag)Daniel Eklöf2019-11-17-2/+2
|
* vt: execute: \t: use tab stops from tab stop listDaniel Eklöf2019-11-16-3/+8
| | | | | Instead of assuming hardcoded 8-width tab stops, use the tab stops from the tab stop list.
* vt: implement ESC H - set tab stop at current columnDaniel Eklöf2019-11-16-0/+11
|
* vt: remove commented out codeDaniel Eklöf2019-11-16-37/+0
|
* vt: DECALN: render at bottom of terminal, not in viewDaniel Eklöf2019-11-14-1/+1
|
* vt: implement VT - Vertical TabDaniel Eklöf2019-11-05-0/+5
| | | | Despite its name, it always moves down exactly one line.
* vt: always use hex (not octal)Daniel Eklöf2019-11-05-2/+2
|
* vt: log hex version of printed character tooDaniel Eklöf2019-11-05-1/+1
|
* vt: always disable state_names[] arrayDaniel Eklöf2019-11-05-1/+1
| | | | It isn't used anywhere, even with LOG_ENABLE_DBG
* vt: esc dispatch: implement DECALNDaniel Eklöf2019-11-05-65/+118
| | | | | | | In esc dispatch: * Switch on private first, then final * Recognize ESC #8 (DECALN), and implement it
* scan-build: fix a couple of minor warnings from a scan-build runDaniel Eklöf2019-11-05-1/+1
|
* Rename: vt_to_slave() -> term_to_slave()Daniel Eklöf2019-11-02-20/+0
|
* vt: don't log ignored execute commandsDaniel Eklöf2019-09-28-1/+0
| | | | cat:ing a binary file would otherwise result in us spamming syslog.
* vt: implement 'insert mode'Daniel Eklöf2019-08-30-18/+27
|
* vt: remove unneeded includeDaniel Eklöf2019-08-30-1/+0
|
* vt: tidy lazy initialization of escape parametersDaniel Eklöf2019-08-27-6/+6
|
* vt: no need to reset OSC string in CLEAR actionDaniel Eklöf2019-08-27-1/+0
| | | | ... as this is done when a new OSC string is started
* vt: store alt charset characters as wcharsDaniel Eklöf2019-08-27-9/+6
|
* vt: bug: fix lazy initialization of sub parameter value (off-by-one)Daniel Eklöf2019-08-24-2/+1
|
* vt: clear CSI parameters lazilyDaniel Eklöf2019-08-24-3/+11
| | | | | | | | | The CLEAR action is so common, that explicitly clearing the entire params array, which is kind of big, is too slow. Clear it lazily instead. Meaning, we only set 'idx' (count) to 0 in CLEAR. Then whenever we parse a parameter, clear the value and sub parameters.
* vt: remove support for urxvt 'extended' line drawing character setDaniel Eklöf2019-08-16-12/+7
|
* vt: there is no default charset for \e0 and \eBDaniel Eklöf2019-08-16-2/+4
|
* cell: pack more efficiently and store glyph as a wcharDaniel Eklöf2019-08-02-26/+23
| | | | | | | | | | | The 'attributes' struct is now 8 bytes and naturally packed (used to be 9 bytes, artificially packed). 'cell' struct is now 12 bytes, naturally packed (used to be 13 bytes, artificially packed). Furthermore, the glyph is stored as a wchar instead of a char*. This makes it easier (faster) to do glyph lookup when rendering.
* term: implement resetDaniel Eklöf2019-08-01-1/+1
|
* font: initial support for double-width *and* color emoji glyphsDaniel Eklöf2019-07-31-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts are now loaded with FT_LOAD_COLOR and we recognize and support the FT_PIXEL_MODE_BGRA pixel mode. This is mapped to a CAIRO_FORMAT_ARGB32 surface, that is blitted as-is (instead of used as a mask like we do for gray and mono glyphs). Furthermore, since many emojis are double-width, we add initial support for double-width glyphs. These are assumed to always be utf8. When PRINT:ing an utf8 character, we check its width, and add empty "spacer" cells after the cell with the multi-column glyph. When rendering, we render the columns in each row backwards. This ensures the spacer cells get cleared *before* we render the glyph (so that we don't end up erasing part of the glyph). Finally, emoji fonts are usually bitmap fonts with *large* glyphs. These aren't automatically scaled down. I.e. even if we request a glyph of 13 pixels, we might end up getting a 100px glyph. To handle this, fontconfig must be configured to scale bitmap fonts. When it is, we can look at the 'scalable' and 'pixelsizefixup' properties, and use these to scale the rendered glyph.
* vt: disable flash on bell, it's too annoying in e.g. zshDaniel Eklöf2019-07-30-1/+1
|
* vt: BELL is now logged at info level, and flashes the screenDaniel Eklöf2019-07-30-1/+2
|
* vt: remove almost all abort() callsDaniel Eklöf2019-07-30-9/+6
| | | | | | Replace with generic error log messages that simply says the ESC/CSI/OSC sequence is unhandled. This can mean either invalid or unimplemented, depending on the context.
* vt: remove duplicate initialization warnings (clang)Daniel Eklöf2019-07-30-3/+0
|
* render: add a 'clean' bit to each cell; only render cells that aren't cleanDaniel Eklöf2019-07-30-8/+2
| | | | | | | | | | | This patch takes a bit from the foreground color value in a cell (todo: split up foreground/background into bitfields with a separate field for 'foreground/background' has been set), and only re-renders cells that aren't marked as clean. Note: we use a 'clean' bit rather than a 'dirty' bit to make it easy to erase cells - we can (keep doing) do that by simply memsetting a cell range to 0.
* term: make sure to update 'current row' when restoring saved cursorDaniel Eklöf2019-07-23-1/+1
|
* dcs: we have no parent terminal to pass through toDaniel Eklöf2019-07-21-13/+1
|
* vt: define state_names[] table when debug logging has been enabledDaniel Eklöf2019-07-19-1/+1
|
* vt: handle up to two private charactersDaniel Eklöf2019-07-19-8/+15
|
* dcs: sort of implement DCS passthroughDaniel Eklöf2019-07-19-4/+16
| | | | | | | We now store the passthrough characters in a buffer, and call dcs_passthrough() on unhook. However, dcs_passthrough() doesn't do anything.
* osc: allocate data buffer dynamicallyDaniel Eklöf2019-07-19-3/+6
|
* vt: implement SS2/SS3 and STDaniel Eklöf2019-07-18-3/+17
|
* vt: execute: ignore unrecognized C0 commandsDaniel Eklöf2019-07-18-2/+1
|
* vt: execute: handle \0 (NUL), by ignoring itDaniel Eklöf2019-07-18-0/+3
|
* vt/csi: recognize the reset sequence sent by 'reset'Daniel Eklöf2019-07-17-0/+4
| | | | However, we don't (yet) actually reset the terminal
* vt: add vt_to_slave()Daniel Eklöf2019-07-15-0/+21
|
* vt: there are NULL entries in the alternate charsetDaniel Eklöf2019-07-15-1/+3
|