aboutsummaryrefslogtreecommitdiff
path: root/render.c (follow)
Commit message (Collapse)AuthorAgeLines
* render: resize: take padding from configuration into accountDaniel Eklöf2020-02-15-2/+16
|
* render: reflow: set 'linebreak' flag before inserting new lineDaniel Eklöf2020-02-15-9/+14
|
* render: reflow: remove 'linebreak' flag from recycled rowsDaniel Eklöf2020-02-15-4/+6
|
* render: reflow: no need to mark new rows as dirtyDaniel Eklöf2020-02-15-4/+3
|
* render: resize: cancel selection before reflowing textDaniel Eklöf2020-02-15-0/+2
| | | | The old selection will no longer be valid once we resize the grids.
* render: reflow: bug: fix off-by-oneDaniel Eklöf2020-02-15-6/+7
| | | | | | | | The 'last-row' variable points to the last row the cursor is *on*, thus it's not a counter, and we need to add one when calculating the new grid offsets, or we get an off-by-one error. With this, there's no longer any need to scroll the reflowed text.
* term: convert cell 'linefeed' attribute to a row 'linebreak' propertyDaniel Eklöf2020-02-14-34/+24
| | | | | | | | | | | | | | | | To do text reflow, we only need to know if a line has been explicitly linebreaked or not. If not, that means it wrapped, and that we should *not* insert a linebreak when reflowing text. When reflowing text, when reaching the end of a row in the old grid, only insert a linebreak in the new grid if the old row had been explicitly linebreaked. Furthermore, when reflowing text and wrapping a row in the new grid, mark the previous row as linebreaked if either the last cell was (the last column in the last row) empty, or the current cell (the first column in the new row) is empty. If both are non-empty, then we assume a linewrap.
* render: resize: don't reflow text if grid layout hasn't changedDaniel Eklöf2020-02-14-0/+7
| | | | | | | | A window resize doesn't necessarily mean the grid layout changes. When it doesn't, don't reflow text. This fixes a slowness issue on Sway, when swapping positions of two ~equally sized windows.
* render: reflow: erase row when wrapping around the scrollbackDaniel Eklöf2020-02-14-1/+2
|
* render: reflow: mark all "new" rows as dirtyDaniel Eklöf2020-02-14-2/+4
|
* render: resize: do linefeed *after* updating cursor positionDaniel Eklöf2020-02-12-2/+6
|
* render: resize; heuristics to prevent prompt from being printed on a newlineDaniel Eklöf2020-02-12-5/+5
|
* render: resize: temporarily disable row adjustmentDaniel Eklöf2020-02-12-0/+3
| | | | | | This was intended to prevent a new prompt from being printed on a newline. However, it breaks normal output under certain conditions, that have yet to be determined exactly what they are.
* render: resize: only stay on current row if col is within grid widthDaniel Eklöf2020-02-12-1/+3
|
* render: spellingDaniel Eklöf2020-02-12-1/+1
|
* render: resize: calculated cursor row *should* never be beyond the screen bottomDaniel Eklöf2020-02-10-1/+2
|
* render: reflow: clear new line if already allocatedDaniel Eklöf2020-02-10-1/+2
|
* render: resize: fix cursor positioning at grid wrap aroundDaniel Eklöf2020-02-10-2/+6
| | | | | | | | | When current view is at a grid wrap around (last emitted row index is < grid offset), the cursor row ended up being negative which we then mapped to the top line. This is wrong. When we're at a wrap around, re-adjust cursor by adding the grid's row count.
* render: reflow: initial line is always unallocatedDaniel Eklöf2020-02-10-5/+5
|
* vt: tag cells that were form-feed:ed, to allow correct text reflowDaniel Eklöf2020-02-10-1/+4
| | | | | | | | | 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.
* render: reflow: no need to clear cellsDaniel Eklöf2020-02-10-2/+1
| | | | | We set initialize=true when allocating a new row. This initializes the cell to 0, with clean=1.
* render: initial support for text reflowDaniel Eklöf2020-02-10-36/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The algorithm is as follows: Start at the beginning of the scrollback. That is, at the oldest emitted lines. This is done by taking the current offset, and adding the number of (old) screen rows, and then iterating until we find the first allocated line. Next, we iterate the entire old grid. At the beginning, we allocate a line for the new grid, and setup a global pointer for that line, and the current cell index. For each line in the old grid, iterate its cells. Copy the the cells over to the new line. Whenever the new line reaches its maximum number of columns, we line break it by increasing the current row index and allocating a new row (if necessary - we may be overwriting old scrollback if the new grid is smaller than the old grid). Whenever we reach the end of a line of the old grid, we insert a line break in the new grid's line too **if** the last cell in the old line was empty. If it was **not** empty, we **don't** line break the new line. Furthermore, empty cells in general need special consideration. A line ending with a string of empty cells doesn't have to be copied the new line. And more importantly, should **not** increase the new line's cell index (which may cause line breaks, which is incorrect). However, if a string of empty cells is followed by non empty cells, we need to copy all the preceding empty cells to the line too. When the entire scrollback history has been reflowed, we need to figure out the new grid's offset. This is done by trying to put the **last** emitted line at the bottom of the screen. I.e. the new offset is typically "last_line_idx - term->rows". However, we need to handle empty lines. So, after subtracting the number of screen rows, we _increase_ the offset until we see a non-empty line. This ensures we handle grid's that doesn't fill an entire screen. Finally, we need to re-position the cursor. This is done by trying to place the cursor **at** (_not_ after) the last emitted line. We keep the current cursor column as is (but possibly truncated, if the grid's width decreased).
* render: resize: reset scroll damageDaniel Eklöf2020-02-08-1/+2
| | | | | We've resized, and reset the render's 'last-buf' pointer; any scroll damage we have is **not** valid anymore.
* render: add render_resize_force()Daniel Eklöf2020-02-08-5/+18
| | | | | This forces a full resize operation, even though actual window size (or scale) hasn't changed.
* presentation: store input timestamp in a per-commit contextDaniel Eklöf2020-01-21-32/+39
| | | | | This should reduce the risk of mixing up an input timestamp with the corresponding rendered frame.
* render: fallback to background color if cursor text color is not setDaniel Eklöf2020-01-20-3/+3
|
* fcft: update to 1.0.0Daniel Eklöf2020-01-19-2/+3
| | | | | Allow/disallow subpixel antialiasing in font_glyph_for_wc(), not using font_enable_subpixel_antialias().
* render: resize: TIOCSWINSZ: don't include padding in ws_{x,y}pixelDaniel Eklöf2020-01-12-2/+2
|
* term: shorten application_synchronized_updates -> app_sync_updatesDaniel Eklöf2020-01-12-2/+2
|
* term/render: move {enable,disable}_application_synchronized_updates()Daniel Eklöf2020-01-12-31/+1
| | | | From render -> terminal
* render: add a timeout for application synchronized updatesDaniel Eklöf2020-01-12-5/+17
| | | | | This ensures we can recover from a crashing (or bad behaving) application that sends a BSU but then never sends an ESU.
* render: rename render_{enable,disable}_refresh()Daniel Eklöf2020-01-12-3/+3
|
* term: rename refresh_prohibited -> application_synchronized_updatesDaniel Eklöf2020-01-12-5/+5
|
* render: add render_{enable,disable}_refresh()Daniel Eklöf2020-01-12-0/+24
| | | | | | | Calling render_disable_refresh() causes update requests to that terminal to be ignored. Calling render_enable_refresh() re-enables updates.
* render: don't bother trying to lookup glyph for empty cellsDaniel Eklöf2020-01-12-1/+2
| | | | | Depending on the font, it may not have an entry for code point '0', which will cause us to try to load fallback fonts.
* selection: update: don't dirty cells that don't change stateDaniel Eklöf2020-01-06-1/+1
| | | | | | | | | | | | | | | | Previously when updating a selection, we would unmark *all* cells in the old selection, and then mark all cells in the new selection. This caused *all* cells to be dirtied and thus re-rendered. Avoid this, by adding a temporary state to the cells' selected state. Before unmarking the old selection, pre-mark the new selection using a temporary state. When unmarking the old selection, ignore cells in this temporary state. When marking the new selection, ignore cells in this temporary state (except clearing the temporary state).
* search: rename render.search_offset -> render.search_glyph_offsetDaniel Eklöf2020-01-05-6/+6
|
* render: ensure cursor is always visible in the search boxDaniel Eklöf2020-01-05-6/+26
| | | | | | | | | | | | | | | | | | Maintain a view 'offset' (which glyph from the search string to start rendering at). This defines the start of the viewable area. The end is the offset + the search box size (which is limited to the window size). Adjust this offset whenever the cursor moves outside the viewable area. For now, this is always done in the same way: set the offset to the cursor position. This means that when we're entering text at the end of the search criteria (i.e. the normal case; we're simply typing), and the search box reaches the window size, the cursor will jump to the start of the search box, which will be empty. This could be confusing, but let's go with for now.
* render: xcursor: remove render_xcursor_refresh()Daniel Eklöf2020-01-04-18/+17
|
* renderer: destroy: actually free the renderer instance (doh!)Daniel Eklöf2020-01-04-0/+2
|
* wayland: use a low priority FDM hook to flush the wayland socketDaniel Eklöf2020-01-04-2/+0
| | | | | | | | This way, we don't have to manually insert flushes in code paths that may execute outside of a wl_display_dispatch_pending(). (Those that execute inside a wl_display_dispatch_pending() are subject to the flush performed at the end of the normal wayland FDM handler).
* fdm: add hook prioritiesDaniel Eklöf2020-01-04-2/+5
| | | | | | | | | | There are now three hook priorities: low, normal, high. High priority hooks are executed *first*. Normal next, and last the low priority hooks. The renderer's terminal refresh hook now runs as a normal priority hook.
* render: throttle xcursor updatesDaniel Eklöf2020-01-04-20/+125
| | | | | | | | | | | | | | | | | | | | | | | With a bad behaving client (e.g. 'less' with mouse support enabled), we can end up with a *lot* of xcursor updates (so much, that we flooded the wayland socket before we implemented a blocking wayl_flush()). Since there's little point in updating the cursor more than once per frame interval, use frame callbacks to throttle the updates. This works more or lesslike normal terminal refreshes: render_xcursor_set() stores the last terminal (window) that had (and updated) the cursor. The renderer's FDM hook checks if we have such a pending terminal set, and if so, tries to refresh the cursor. This is done by first checking if we're already waiting for a callback from a previous cursor update, and if so we do nothing; the callback will update the cursor for the next frame. If we're *not* already waiting for a callback, we update the cursor immediately.
* wayland: wl_display_flush() never blocksDaniel Eklöf2020-01-04-1/+1
| | | | | | | | | | | | | | | | | | | Since it doesn't block, we need to detect EAGAIN failures and ensure we actually flush everything. If we don't, we sooner or later end up in a wayland client library call that aborts due to the socket buffer being full. Ideally, we'd simply enable POLLOUT in the FDM. However, we cannot write *anything* to the wayland socket until we've actually managed to send everything. This means enabling POLLOUT in the FDM wont work since we may (*will*) end up trying to write more data to it before we've flushed it. So, add a wrapper function, wayl_flush(), that acts as a blocking variant of wl_display_flush(), by detecting EAGAIN failiures and calling poll() itself, on the wayland socket only, until all data has been sent.
* render: remove debug loggingDaniel Eklöf2020-01-04-5/+2
|
* render: attrs_to_font() is not used outside of render.cDaniel Eklöf2020-01-04-1/+1
|
* render: trigger terminal refreshes in an FDM hookDaniel Eklöf2020-01-04-6/+56
| | | | | | | | | | | | | | | | | | | | | | In some cases, we end up calling render_refresh() multiple times in the same FDM iteration. This means will render the first update immediately, and then set the 'pending' flag, causing the updated content to be rendered in the next frame. This can cause flicker, or flashes, since we're presenting one or more intermediate frames until the final content is shown. Not to mention that it is inefficient to render multiple frames like this. Fix by: * render_refresh() only sets a flag in the terminal * install an FDM hook; this hook loops all terminals and executes what render_refresh() _used_ to do (that is, render immediately if we're not waiting for a frame callback, otherwise set 'pending' flag). for all terminals that have the 'refresh_needed' flag set.
* selection: store cell 'selected' state in the cells' attributesDaniel Eklöf2020-01-04-53/+8
| | | | | | | | | Instead of having the renderer calculate, for each cell, whether that cell is currently selected or not, make selection_update() mark/unmark the selected cells. The renderer now only has to look at the cells' 'selected' attribute. This makes the renderer both smaller and faster.
* render: coord_is_selected: handle block selectionsDaniel Eklöf2020-01-03-8/+22
|
* render: refresh: ensure window has been configuredDaniel Eklöf2020-01-03-0/+2
|
* render: remove 'refresh' from render_resize()Daniel Eklöf2020-01-03-3/+2
|
* render: render_resize(): don't do anything if width or height is 0Daniel Eklöf2020-01-03-0/+3
|
* render: resize() now only calls refresh() if asked toDaniel Eklöf2020-01-03-2/+3
|
* Merge branch 'master' into visual-focusDaniel Eklöf2020-01-03-1/+1
|\
| * render: use a unique buffer cookie for the 'search' surfaceDaniel Eklöf2020-01-03-1/+1
| | | | | | | | | | | | | | | | This fixes an issue where rendering the 'search' box caused the last normal buffer from being purged. This meant the terminal had a pointer to a now freed buffer, which we de-referenced and occasionally memcpy:ied from.
* | render: draw_cursor: use terminal's visual focus to determine cursor shapeDaniel Eklöf2020-01-02-5/+3
| |
* | wayland: rename focused/moused to kbd_focus/mouse_focusDaniel Eklöf2020-01-02-1/+1
|/
* render: presentation: cleanupDaniel Eklöf2020-01-01-6/+20
|
* render: call wl_display_flush() right after wl_surface_commit()Daniel Eklöf2020-01-01-2/+1
| | | | This groups the two calls, for readability.
* render: presentation: clean up frame interval count calculationDaniel Eklöf2020-01-01-1/+1
|
* render: presentation: space between value and "µs"Daniel Eklöf2019-12-31-3/+3
|
* render: presentation: also use seconds when calculating frame interval countDaniel Eklöf2019-12-31-2/+2
|
* render: presentation: log both input -> commit and commit -> presented timesDaniel Eklöf2019-12-31-29/+40
|
* render: reset input/commit timestamps on presentation discarded eventDaniel Eklöf2019-12-31-0/+3
|
* wayland: optionally use the presentation time protocol to measure input lagDaniel Eklöf2019-12-31-0/+123
| | | | | | | | | | | | | | | | | | | This adds a flag, -p,--presentation-timings, that enables input lag measuring using the presentation time Wayland protocol. When enabled, we store a timestamp when we *send* a key to the slave. Then, when we commit a frame for rendering to the compositor, we request presentation feedback. We also store a timestamp for when the frame was committed. The 'presented' callback then looks at the input and commit timestamps, and compares it with the presented timestamp. The delay is logged at INFO when the delay was less than one frame interval, at WARN when it was one frame interval, and at ERR when it was two or more frame intervals. We also update statistic counters that we log when foot is shut down.
* render: fix bug when erasing old cursor; send correct compositor damageDaniel Eklöf2019-12-19-3/+3
|
* render: render_cell: break out cursor renderingDaniel Eklöf2019-12-19-57/+68
|
* render: attrs_to_font: const:ifyDaniel Eklöf2019-12-19-1/+1
|
* term/render: check for is_shutting_down in grid_render()Daniel Eklöf2019-12-19-0/+3
|
* render: get rid of 'all-clean' detectionDaniel Eklöf2019-12-17-21/+10
| | | | | | | | | | | | | | | | | Instead of trying to figure out if we had to render something (i.e. something in the grid was dirty), and using that to determine whether to post a callback or not, we now let render_refresh() set a flag indication we need to render another frame. This simplifies render_grid(), which now _always_ renders, and pushes it to the compositor. The callback handler checks the pending flag and simply doesn't call render_grid() when there's no more pending state to render. This ends up reducing the number of wakeups when e.g. having a blinking cursor.
* render: move blink timer handling to term.cDaniel Eklöf2019-12-17-49/+2
|
* render: render block cursor as a hollow rectangle when unfocusedDaniel Eklöf2019-12-16-14/+36
|
* term: implement cursor blinkingDaniel Eklöf2019-12-15-2/+16
| | | | | | | | | | | | | | Blinking can be enabled either by setting the cursor style with CSI Ps SP q and selecting a blinking style. Or, with 'CSI ? 12 h' Note that both affect the same internal state. I.e. you can disable blinking with CSI ? 12l after having selected a blinking cursor style. This is consistent with XTerm behavior.
* fcft: update to 0.3.0Daniel Eklöf2019-12-03-10/+4
| | | | | fcft now calculates the underline and strikeout integer positions, making our rendering code much simpler.
* render: limit size of search surface to parent windowDaniel Eklöf2019-12-03-4/+2
| | | | | | This shouldn't be necessary, but Sway acts up when the subsurface exceeds the parent surface (window, in this case) size, and extends the window size (if floating), leaving it with no content
* render: don't allow negative coordinates of the search surfaceDaniel Eklöf2019-12-03-1/+2
| | | | | | While the protocol allows this, it appears Sway offsets (moves) the parent surface when this happens, resulting in a window half without content.
* fcft: include <fcft/fcft.h>, and use fcft/stride.h instead of local copyDaniel Eklöf2019-12-01-1/+1
|
* fcft: use fcft instead of local copy of font.c/font.hDaniel Eklöf2019-12-01-1/+2
|
* render: fix underline/strikeout positioningDaniel Eklöf2019-11-30-6/+8
| | | | | | | | | | | | There were two errors: * We subtracted half the line width instead of adding it to the baseline * We rounded the line positioning and thickness before the positioning calculation. In particular, rounding the thickness before using it to adjust the position was wrong. Now we round just before the pixman call.
* render: font_baseline(): simply use the primary font's ascentDaniel Eklöf2019-11-30-16/+4
| | | | | | This is what we used as baseline for regular glyphs anyway. Thus, we can update that code to call font_baseline() now. This makes it easier to change how we define the baseline in the future.
* render: fix rendering of cursor when cell is reversedDaniel Eklöf2019-11-28-13/+19
| | | | | | When the user had configured the cursor color, we failed to invert (reverse) the foreground and background color when the cursor was on a cell with the 'reverse' attribute set.
* font: move metrics from terminal struct to font structDaniel Eklöf2019-11-26-11/+11
|
* term: add struct cursorDaniel Eklöf2019-11-17-10/+10
|
* render: configure default tab stops when resizing the terminalDaniel Eklöf2019-11-16-0/+5
|
* Revert "render: last_buf may point to a free:d buffer"Daniel Eklöf2019-11-02-18/+8
| | | | This reverts commit 4d3251a93b4ba309d573aca6ff397df44c4ff760.
* render: last_buf may point to a free:d bufferDaniel Eklöf2019-11-01-8/+18
| | | | So, store last buf's width/height separately
* shm: associate a 'cookie' with each bufferDaniel Eklöf2019-11-01-3/+7
| | | | | | | When re-using a buffer from cache, only re-use ones with a matching cookie. This prevents contention between multiple terminal windows.
* shm: get_buffer(): remove 'copies' argument; it's not usedDaniel Eklöf2019-11-01-2/+2
|
* render: limit length of title in call to xdg_toplevel_set_title()Daniel Eklöf2019-11-01-1/+13
| | | | | | Trying to pass a too long title (not sure what "too long" is though...) will trigger a call to abort() inside the wayland-client library.
* render: call wl_display_flush() after renderingDaniel Eklöf2019-11-01-0/+2
| | | | This allows us to remove that call from the main event loop.
* Merge branch 'fdm'Daniel Eklöf2019-10-30-85/+33
|\
| * render worker context: allocate, and let worker threads freeDaniel Eklöf2019-10-28-0/+1
| | | | | | | | | | | | | | | | | | | | Since we now initialize the worker threads from term_init(), which returns before the threads terminate, we can no longer use stack-allocated worker contexts. We _could_ put them in the terminal struct. But a simpler solution is to allocate them in term_init(), and let the threads free them when they don't need them anymore.
| * wayland: move reload_cursor_theme() and update_cursor_surface() to waylandDaniel Eklöf2019-10-27-55/+0
| |
| * wayland: implement wayl_init()Daniel Eklöf2019-10-27-28/+28
| | | | | | | | Wayland instantiation is now done by the wayland backend, not in main.
| * term: wayland struct is now not a part of the terminal structDaniel Eklöf2019-10-27-22/+22
| | | | | | | | | | | | We do however need access to it, so provide a pointer. The difference is that now we can have a *single* wayland instance, but multiple terminal instances.
| * wayland: implement wayl_win_destroy()Daniel Eklöf2019-10-27-6/+6
| |
| * term: move per-window wayland objects from wayland struct to terminal structDaniel Eklöf2019-10-27-23/+25
| | | | | | | | | | | | | | | | Short term, we want to break out the wayland backend from the terminal struct. Long term, we might want to support multiple windows. One step towards both the above is separating global wayland objects from per-window objects.
* | scrollback: regression: fix rendering of scrollback diffs less than a screenDaniel Eklöf2019-10-29-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing "small" scrolls (typically done via mouse wheel or similar), we render the scrolling by emitting a "scroll damage". A recent commit changed how scroll damage is rendered; only when the view is at the bottom ("following" the screen output) do we render the damage. To fix this, add a new type of scroll damage, SCROLL_DAMAGE_IN_VIEW and SCROLL_DAMAGE_REVERSE_IN_VIEW. These signal to the renderer that it should always render the damage.
* | render: regression: don't apply scroll damage when view is in scrollbackDaniel Eklöf2019-10-28-12/+15
|/ | | | | | | | | | | | | | When user has scrolled back in the output history, new output should not trigger scrolling. This was true for normal cell rendering, which renders the cells *in view*, not caring where the "front" of the output is. However, we still applied scroll damage. I.e. we memmoved part of the screen. The fix is simple; only apply scroll damage when the view is at the front of the output.
* font: font_from_name() returns an allocated font structDaniel Eklöf2019-10-16-2/+2
|