aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'config-clone'Daniel Eklöf2021-06-23-120/+246
|\
| * config: add new function config_clone()Daniel Eklöf2021-06-23-106/+214
| |
| * tokenize: strdup() each individual argvDaniel Eklöf2021-06-20-38/+56
|/ | | | | Instead of referencing the un-tokenized “raw” command string, strdup() each argv. This way, the input string can be ‘const’.
* config: remove duplicated error logs for invalid colorsDaniel Eklöf2021-06-20-18/+6
|
* Merge branch 'csd-button-fg-color'Daniel Eklöf2021-06-20-10/+43
|\
| * config: add csd.button-color optionDaniel Eklöf2021-06-20-10/+43
|/ | | | | | | | This option controls the foreground color of the minimize/maximize/close buttons. I.e. the color used to draw the minimize/maximize/close glyphs. It defaults to default background color.
* uri: hostname_is_localhost(): don’t crash if hostname == NULLDaniel Eklöf2021-06-19-3/+5
|
* term: fix regression after merging #599Daniel Eklöf2021-06-18-3/+3
| | | | | Don’t increment ‘j’ twice in each loop iteration, and fix typo in loop condition (check ‘j’, not ‘i’).
* Merge branch 'title-update'Daniel Eklöf2021-06-18-24/+78
|\ | | | | | | Closes #591
| * render: don’t create/destroy the title update timer each timeDaniel Eklöf2021-06-18-37/+45
| | | | | | | | | | Create it once when instantiating the terminal. Add a boolean to track whether the timer is running or not.
| * render: use a timer instead of relying on the frame callback for title update throttlingDaniel Eklöf2021-06-18-18/+64
|/ | | | | | | | | | | | | | | | | | | | | Using the frame callback works most of the time, but e.g. Sway doesn’t call it while the window is hidden, and thus prevents us from updating the title in e.g. stacked views. This patch uses a timer FD instead. We store a timestamp from when the title was last updated. When the application wants to update the title, we first check if we already have a timer running, and if so, does nothing. If no timer is running, check the timestamp. If enough time has passed, update the title immediately. If not, instantiate a timer and wait for it to trigger. Set the minimum time between two updates to ~8ms (twice per frame, for a 60Hz output, and ~once per frame on a 120Hz output). Closes #591
* Merge branch 'reduce-tllist-usage'Daniel Eklöf2021-06-18-276/+380
|\
| * config: work around clang-11.0 issueDaniel Eklöf2021-06-18-62/+62
| | | | | | | | | | | | Clang-11.0 doesn’t seem to understand that our ‘static const’ key modifiers are compile-time constant. Clang-11.1 doesn’t appear to have this issue.
| * config: don’t use tllist where it isn’t necessaryDaniel Eklöf2021-06-18-276/+380
|/ | | | | | | | | | | | | | | | tllists are great when dealing with dynamically changing lists. They are also very easy to use when building lists/arrays where the final size is unknown. However, this ease of use comes at a price: code size. tll-macros expand to a lot of code. Since things in the config are static, once the config has been loaded, using tllists for configuration data structures doesn’t make much sense. This patch replaces nearly all tllists used by the configuration, with dynamically allocated arrays.
* Merge branch 'footclient-dont-copy-conf-unless-necessary'Daniel Eklöf2021-06-18-28/+50
|\
| * server: don’t clone the config unless we’re going to modify itDaniel Eklöf2021-06-17-28/+50
| |
* | Merge branch 'underline-positioning'Daniel Eklöf2021-06-18-9/+42
|\ \ | |/ |/| | | Closes #490
| * config: add underline-offset optionDaniel Eklöf2021-06-17-9/+42
|/ | | | | | | | This option allows the user to configure a custom underline offset. That is, use the user provided offset instead of the font provided one. Closes #490
* search: don’t crash when we don’t have any XKB compose stateDaniel Eklöf2021-06-16-2/+5
|
* Merge branch 'optimize-erase-cell-range'Daniel Eklöf2021-06-15-0/+6
|\
| * term: erase_cell_range: early break out from URI loopDaniel Eklöf2021-06-15-0/+6
|/ | | | | | | URI ranges are sorted. This means we don’t have to check any more ranges once we’ve seen one that starts *after* the erase range. Closes #594
* term: no need to set attrs.clean=0 right after copying the VT attrs structDaniel Eklöf2021-06-15-3/+0
| | | | | | | | | When printing a character to a cell, we copy the current VT state’s attributes to the cell. And then clear the ‘clean’ bit. But the ‘clean’ bit is part of the VT state, and is *always* zero. Thus there’s no need to explicitly clear it right after copying the VT state.
* Revert "gitignore: compile_commands.json + .ccls-cache"Daniel Eklöf2021-06-15-2/+0
| | | | This reverts commit 1dabc10494ac6626398c99507b791a21b923a616.
* Merge branch 'doc-cc1-to-c1'Daniel Eklöf2021-06-14-1/+1
|\
| * [foot-ctlseqs] 8-bit control characters are C1nick black2021-06-14-1/+1
|/
* gitignore: compile_commands.json + .ccls-cacheDaniel Eklöf2021-06-13-0/+2
|
* Merge branch 'xtversion'Daniel Eklöf2021-06-13-4/+30
|\ | | | | | | Closes #359
| * doc: ctlseq: add XTVERSIONDaniel Eklöf2021-06-13-0/+5
| |
| * csi: implement XTVERSION (CSI > 0q)Daniel Eklöf2021-06-13-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | This is a fairly new XTerm extension. The reply is on the format: DCS > | text ST XTerm replies with ‘text’ = “XTerm(366)”. Foot replies with ‘text’ = “foot(1.6.4)” Closes #359
| * generate-version: add a define for “extra” version informationDaniel Eklöf2021-06-13-4/+6
| | | | | | | | | | This will be set to “rrr-gNNNNNNN” when building from git, and the empty string otherwise.
* | doc: foot-ctlseqs: mention that SS2/SS3 only affect the next characterCraig Barnes2021-06-12-2/+2
| |
* | doc: foot-ctlseqs: rename SS0/SS1 to SO/SICraig Barnes2021-06-12-2/+2
|/ | | | | | | | | | | There's no mention of SS0 or SS1 functions in ECMA-48 or ECMA-35. 0x0E/0x0F are SO/SI (Shift In/Out) in "7-bit environments" or LS0/LS1 (Locking Shift 0/1) in "8-bit environments". The former is the one that applies to foot, since it generally follows "7-bit" conventions due to its use of UTF-8. See also: ECMA-35 §7.2 and §9.2.
* Replace tab indents with spaces in config.hCraig Barnes2021-06-12-2/+2
|
* Merge branch 'config-cli-override'Daniel Eklöf2021-06-12-87/+182
|\ | | | | | | Closes #554
| * Override options from command lineRyan Farley2021-06-12-87/+182
|/ | | | | | | | | Allow any configuration option to be overridden with -o/--override 'section.key=value' arguments, as suggested in #554 update completitions for override slight refactoring to ease footclient support
* Merge branch 'no-conf-found-is-not-an-error'Daniel Eklöf2021-06-11-1/+4
|\
| * config: demote “no configuration found, using defaults” to a mere warningDaniel Eklöf2021-06-10-1/+4
| | | | | | | | | | And don’t notify the user in the terminal window, only log it on stderr.
| * config: change “no configuration found, using defaults” from error to warningDaniel Eklöf2021-06-10-1/+1
|/
* Merge branch 'free-box-drawings-data'Daniel Eklöf2021-06-09-13/+19
|\ | | | | | | Closes #586
| * term: free the data associated with the pixman image when destroying box-drawing glyphsDaniel Eklöf2021-06-09-13/+19
|/ | | | Closes #586
* Merge branch 'clipboard-mime-types'Daniel Eklöf2021-06-09-6/+21
|\ | | | | | | Closes #583
| * selection: add support for TEXT/STRING/UTF8_STRING mime-types in incoming offersDaniel Eklöf2021-06-09-6/+21
|/ | | | | | | | | We were already offering these mime types for our own clipboard data, but ignored them in incoming offers. Fixes paste issues from Geany. Closes #583
* Merge branch 'charset-shift-fixes'Craig Barnes2021-06-09-14/+47
|\
| * terminal: add 'charset_designator' enum to make code more self-documentingCraig Barnes2021-06-09-18/+19
| | | | | | | | | | | | This commit also renames the term_set_single_shift_ascii_printer() function to term_single_shift(), since the former is overly verbose and not really even accurate.
| * changelog: add issue links for previous 2 entriesCraig Barnes2021-06-09-2/+3
| |
| * vt: fix SS2/SS3 escape sequences to act correctly as single shiftsCraig Barnes2021-06-08-4/+22
| | | | | | | | | | | | These sequences are supposed to affect the next printable ASCII character and then reset to the previous character set, but before this commit they were behaving like locking shifts.
| * vt: add support for LS2 and LS3 locking shiftsCraig Barnes2021-06-08-0/+13
| |
* | Merge branch 'overlapping-sixels'Daniel Eklöf2021-06-09-17/+225
|\ \ | | | | | | | | | Closes #562
| * | sixel: add support for overlapping sixelsDaniel Eklöf2021-06-09-17/+225
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing a sixel on top of an already existing sixel currently has the following limitations in foot: * The parts of the first sixel that is covered by the new sixel are removed, completely. Even if the new sixel has transparent areas. I.e. writing a transparent sixel on top of another sixel *replaces* the first sixel with the new sixel, instead of layering them on top of each other. * The second sixel erases the first sixel cell-wise. That is, a sixel whose size isn’t a multiple of the cell dimensions will leave unsightly holes in the first sixel. This patch takes care of both issues. The first one is actually the easiest one: all we need to do is calculate the intersection, and blend the two images. To keep things relatively simple, we use the pixman image from the *new* image, and use the ‘OVER_REVERSE’ operation to blend the new image over the old one. That is, the old image is still split into four tiles (top, left, right, bottom), just like before. But instead of throwing away the fifth middle tile, we blend it with the new image. As an optimization, this is only done if the new image has transparency (P1=1). The second problem is solved by detecting when we’re erasing an area from the second image that is larger than the new image. In this case, we enlarge the new image, and copy the old image into the new one. Finally, when we enlarge the new image, there may be areas in the new image that is *not* covered by the old image. These areas are made transparent. The end result is: * Each cell is covered by at *most* 1 sixel image. I.e. the total numbers of sixels are finite. This is important for the ‘mpv --vo=sixel’ use case - we don’t want to end up with thousands of sixels layered on top of each other. * Writing an opaque sixel on top of another sixel has _almost_ zero performance impact. Especially if the two sixels have the same size, so that we don’t have to resize the new image. Again, important for the ‘mpv --vo=sixel’ use case. Closes #562
* | Merge branch 'tabs'Daniel Eklöf2021-06-09-4/+70
|\ \ | |/ |/| | | Closes #508
| * changelog: tabs are preservedDaniel Eklöf2021-06-09-0/+2
| |
| * csi: CHT: don’t alter the LCF flagDaniel Eklöf2021-06-08-0/+3
| | | | | | | | | | This makes us pass the vttest 11.5.4 (Test non-VT100 -> Test ISO-6429 cursor-movement -> CHT) test.
| * vt: TAB: don’t print a ‘\t’ to the grid if the *current* cell isn’t emptyDaniel Eklöf2021-06-08-3/+4
| | | | | | | | | | | | | | | | If the cursor is already at the right edge, our logic that checked for non-empty cells failed; it didn’t check the current cell. Fix by initializing ‘emit_tab_char’ to true/false, depending on the contents of the current cell.
| * extract: consume spaces following a tabDaniel Eklöf2021-06-08-0/+23
| | | | | | | | | | | | That is, we choose to copy the tab character, and not the spaces it represents. Most importantly, we don’t copy *both* the tab and the spaces.
| * vt: emit a tab character if all cells between cursor and tab stop are emptyDaniel Eklöf2021-06-08-4/+41
|/ | | | | | | | | | | | | | | | | | | | | | TAB (\t) move the cursor to the next tab stop. That’s it, according to the specification. However, many terminal emulators try to keep tabs in the grid, to be able to e.g. copy them. That is, copying a text chunk containing tabs should result in tabs being pasted, not spaces. In order to do that, we need to print a tab character to the grid. To improve text reflow of tabs, we also print spaces to the subsequent cells, up until (but not including) the next tab stop. However, we can only do this if all the cells between the cursor and the next tab stop are empty, since (obviously), we cannot overwrite pre-existing characters. Finally, while some fonts render tabs as spaces (i.e. an empty glyph), some use a glyph representing “unprintable” characters, or similar. Thus, we need to exclude cells with tab characters when rendering.
* Merge branch 'il-dl-reset-cursor-col'Daniel Eklöf2021-06-08-0/+3
|\
| * csi: IL+DL: move cursor to column 0Daniel Eklöf2021-06-08-0/+3
|/ | | | | | | | | This fixes vttest 11.6.6.3 Test non-VT100 -> Test ISO-6429 colors -> Test of VT102-style features with BCE -> Test Insert/Delete Char/Line
* Merge branch 'reverse-video-only-affects-default-fg-bg'Daniel Eklöf2021-06-08-4/+7
|\
| * render: reverse video only swaps *default* fg/bgDaniel Eklöf2021-06-08-4/+7
| | | | | | | | | | | | | | | | | | This matches XTerm behavior, and fixes vttest 11.6.6.2: Test non-VT100 -> Test ISO-6429 colors -> Test of VT102-style features with BCE -> Test of screen features
* | vt: fix buggy chains of ternary expressions in action_esc_dispatch()Craig Barnes2021-06-08-18/+9
| | | | | | | | | | | | | | | | | | | | Only the first character in the chain was being compared with `priv` and the rest were just being evaluated as simple expressions. This was causing the G2 and G3 operations to erroneously use the G1 index. Since the characters are a contiguous range, we can just subtract the start of the range to get the appropriate index. The outer switch statement already ensures the values are in range.
* | terminal: fix compilation error when debug logging is enabledCraig Barnes2021-06-08-2/+2
|/ | | | | | | | | | Without this fix, setting LOG_ENABLE_DBG to 1 in terminal.c would cause the following error: > terminal.c:1787: 'struct terminal' has no member named 'font_scale' The 'font_scale' member was removed in commit 2afc6782361d0deaa443234466775b1121feec8f.
* vt: \E#8: print ‘E’ using the default attributesDaniel Eklöf2021-06-07-1/+1
|
* selection: reset ‘empty_count’ after we’ve emitted the empty cellsDaniel Eklöf2021-06-05-0/+2
| | | | | | | | | | | | | | When marking and unmarking cells, we don’t highlight trailing empty cells. We do however highlight empty cells if they are followed by non-empty cells. I think this was an intentional choice. If one row ended with trailing empty cells, but *no* hard linebreak, then we’d continue on the next row, and emit all the empty cells once we hit a non-emtpy cell on the second row. But this is something that shouldn’t happen in any real-world use cases.
* Merge branch 'scrollback-key-bindings-pass-through-alt-screen'Daniel Eklöf2021-06-05-12/+36
|\ | | | | | | Closes #573
| * input: pass through scrollback-* key bindings when alt screen is activwDaniel Eklöf2021-06-04-12/+36
|/ | | | | | | | | Since the alt screen have no scrollback, all scrollback-* actions are effectively no-ops when the alt screen is active. Make them available to the client application instead. Closes #573
* Merge branch 'osc-9'Daniel Eklöf2021-06-04-1/+10
|\
| * osc: implement iTerm2’s OSC-9 - desktop notificationsDaniel Eklöf2021-06-04-1/+10
|/
* Merge branch 'chunked-reflow'Daniel Eklöf2021-06-04-96/+166
|\ | | | | | | Closes #504
| * changelog: text reflow performanceDaniel Eklöf2021-06-04-0/+1
| |
| * grid: reflow: ‘amount’ has already been added to ‘from’Daniel Eklöf2021-06-02-1/+1
| |
| * selection: fix bad assertionDaniel Eklöf2021-06-02-2/+2
| | | | | | | | | | When there are multiple multi-column characters back-to-back, the cell before the pivot end point may in fact be a SPACER+1 cell.
| * grid: reflow: URI range start: take over ownership of URI stringDaniel Eklöf2021-06-02-1/+2
| | | | | | | | | | Instead of strdup:ing the URI, take over ownership. This is ok since the old URI range will be free:d anyway.
| * grid: reflow: debug loggingDaniel Eklöf2021-06-02-12/+18
| |
| * grid: reflow: when determining row end coord, check *last* URI rangeDaniel Eklöf2021-06-02-1/+5
| |
| * grid: reflow: when determining row end coord, check *last* tracking pointDaniel Eklöf2021-06-02-2/+10
| |
| * grid: reflow: check the *entire* row for non-empty cellsDaniel Eklöf2021-06-02-1/+1
| |
| * grid: reflow: avoid unnecessary if-statements before chunking a rowDaniel Eklöf2021-06-02-8/+13
| |
| * grid: disable reflow timing by defaultDaniel Eklöf2021-06-02-1/+1
| |
| * grid: reflow: commentsDaniel Eklöf2021-06-02-1/+22
| |
| * grid: no need to keep the tp_col/uri_col variables aroundDaniel Eklöf2021-06-02-6/+3
| |
| * grid: fix col max calculation when row contains URI rangesDaniel Eklöf2021-06-02-1/+1
| |
| * grid: set tp/uri break flags explicitly when we know them to be trueDaniel Eklöf2021-06-02-6/+12
| |
| * grid: reflow: slightly simplified logic for end-coordinate calculationDaniel Eklöf2021-06-02-10/+8
| |
| * grid: reflow: rename _range -> rangeDaniel Eklöf2021-06-02-16/+16
| |
| * grid: reflow: remove dead codeDaniel Eklöf2021-06-02-135/+0
| |
| * grid: reflow: memcpy() chunks of cells, instead of single cell-by-cellDaniel Eklöf2021-06-02-1/+159
|/ | | | | | | | | | | | | | | | | | | | Instead of walking the old grid cell-by-cell, and checking for tracking points, OSC-8 URIs etc on each cell, memcpy() sequences of cells. For each row, find the end column, by scanning backward, looking for the first non-empty cell. Chunk the row based on tracking point coordinates. If there aren’t any tracking coordinates, or OSC-8 URIs on the current row, the entire row is copied in one go. The chunk of cells is copied to the new grid. We may have to split it up into multiple copies, since not all cells may fit on the current “new” row. Care must also be taken to not line break in the middle of a multi-column character.
* Merge branch 'restore-sighup-handler'Daniel Eklöf2021-06-02-2/+9
|\
| * slave/spawn: restore SIGHUP handler after fork(), before exec()Daniel Eklöf2021-06-02-2/+9
|/ | | | | | Foot installs a SIG_IGN handler for SIGHUP. Ignored signals are inherited in sub-processes. Thus, we need to restore it to SIG_DFL before exec:ing.
* Merge branch 'dont-split-multi-column-chars-when-resizing-alt-screen'Daniel Eklöf2021-06-02-1/+7
|\
| * grid: don’t cut multi-column chars in half when resizing the alt screenDaniel Eklöf2021-06-02-1/+7
|/ | | | | | | | When we resize the alt screen, we don’t reflow the text, we simply truncate all the lines. When doing this, make sure we don’t truncate in the middle of a multi-column character.
* Merge branch 'url-mode-off-by-one'Daniel Eklöf2021-06-02-5/+13
|\
| * url-mode: off-by-one error in end-point column of auto-detected URLsDaniel Eklöf2021-06-02-5/+13
|/ | | | | | When an auto-detected URL ended *on* the right-most column, the URL endpoint was off by one, resulting in the underline in URL mode being one character short.
* Merge branch 'document-terminfo'Daniel Eklöf2021-06-02-2/+70
|\ | | | | | | Closes #549
| * doc: foot{,client}: updates from feedback from @craigbarnesDaniel Eklöf2021-06-02-8/+8
| |
| * doc: footclient.1: -t,--term: add references to ENVIRONMENT and TERMINFO sectionsDaniel Eklöf2021-06-02-1/+2
| |
| * doc: footclient.1: add TERMINFO sectionDaniel Eklöf2021-06-02-0/+33
| |
| * doc: foot.1: -t,--term: add references to ENVIRONMENT and TERMINFO sectionsDaniel Eklöf2021-06-02-1/+2
| |
| * doc: foot.1: add TERMINFO sectionDaniel Eklöf2021-06-02-0/+33
|/
* Merge branch 'pua-double-width'Daniel Eklöf2021-06-01-8/+35
|\
| * config: add boolean option tweak.pua-double-widthDaniel Eklöf2021-06-01-8/+35
|/ | | | | | | When enabled, PUA (Private Usage Area) codepoints are always treated as double-width glyphs, regardless of the actual glyph width. Requires allow-overflowing-double-width-glyphs=yes