aboutsummaryrefslogtreecommitdiff
path: root/render.c (follow)
Commit message (Collapse)AuthorAgeLines
...
* 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
|
* render: handle compositors that does buffer swappingDaniel Eklöf2019-09-27-45/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all compositors support buffer re-use. I.e. they will call the frame callback *before* the previous buffer has been released. Effectively causing us to swap between two buffers. Previously, this made us enter an infinite re-render loop, since we considered the window 'dirty' (and in need of re-draw) when the buffer is different from last redraw. Now, we detect the buffer swapping case; size must match, and we must not have any other condition that require a full repaint. In this case, we can memcpy() the old buffer to the new one, without dirtying the entire grid. We then update only the dirty cells (and scroll damage). Note that there was a bug here, where we erased the old cursor *before* checking for a new buffer. This worked when the buffer had *not* changed. Now that we need to handle the case where it *has* changed, we must do the memcpy() *before* we erase the cursor, or the re-painted cell is lost. This makes foot work on Plasma, without burning CPU. The memcpy() does incur a performance penalty, but we're still (much) faster than e.g. konsole. In fact, we're still mostly on par with Alacritty.
* render: attach buffer *before* generating damageDaniel Eklöf2019-09-27-2/+1
| | | | Fixes 'invisible window' on Plasma
* main: initialize scale to '1'Daniel Eklöf2019-09-26-13/+1
| | | | | | | | | | This ensures we always have a valid (but possibly incorrect) scaling value. This allows us to simplify code that uses the scale - it doesn't have to verify the scale if valid. Furthermore, since render_resize() is the function that actually updates term->scale, make sure to call it *before* updating the cursor (otherwise, the cursor will use the old scaling value).
* render: remove assertion that isn't always trueDaniel Eklöf2019-09-20-1/+0
| | | | It's not true for e.g. Cascadia code.
* render: search box: use colors from the color tableDaniel Eklöf2019-08-30-2/+3
| | | | | | | | | Use the 'yellow' color from the 'regular' range of colors (SGR 33) for background when we have a match, or 'red' from the 'regular' range of colors (SGR 31) when we don't have a match. Foreground uses the 'black' color from the regular range of colors (SGR 30).
* render: draw (cursor) bar using the same thickness as underlinesDaniel Eklöf2019-08-30-5/+7
|
* render: search box: fix glyph spacingDaniel Eklöf2019-08-30-1/+1
| | | | | We're using the same font as in the terminal, so use the same glyph spacing.
* render: render_search_box: draw cursor as a barDaniel Eklöf2019-08-29-0/+6
|
* render: draw_strikeout: use font_baseline() for baseline calculationDaniel Eklöf2019-08-29-1/+1
|
* render: draw_underline: use font_baseline() for baseline calculationDaniel Eklöf2019-08-29-1/+1
|
* render: draw_bar: don't assume height == ascent+descentDaniel Eklöf2019-08-29-2/+4
| | | | | Instead, draw a bar that is ascent+descent tall, positioned around the baseline such that it starts at the ascent and ends at the descent.
* render: add font_baseline() - calculates the y-coordinate for the baselineDaniel Eklöf2019-08-29-0/+19
| | | | | | | | | | The old baseline calculation was copy-pasted to a couple of places, and also assumed that the font's height was equal to ascent+descent. While this is typically true, it isn't necessarily so. Now, we assume that height >= ascent+descent, and then position the baseline in "center" (but adjusted for the descent).
* render: remove INFO log (that really was a debug log)Daniel Eklöf2019-08-29-2/+0
|
* search: move render() function to the 'render' moduleDaniel Eklöf2019-08-29-0/+54
|
* render: reduce amount of dim while searching scrollback historyDaniel Eklöf2019-08-29-4/+10
|
* render: double-dim fg+bg when searching the scrollback bufferDaniel Eklöf2019-08-28-0/+2
| | | | | By toning down the screen content more, the selection (i.e. the search match) pops out much more.
* render: don't dim selection while searchingDaniel Eklöf2019-08-27-1/+1
|
* search: wip: re-direct input while searching, and build a search bufferDaniel Eklöf2019-08-27-7/+21
| | | | | | | | | | | This adds a new state, 'is_searching'. While active, input is re-directed, and stored in a search buffer. In the future, we'll use this buffer and search for its content in the scrollback buffer, and move the view and create a selection on matches. When rendering in 'is_searching', everything is dimmed. In the future, we'll render the current search buffer on-top of the dimmed "regular" terminal output.
* render: center grid in windowDaniel Eklöf2019-08-27-31/+42
| | | | | Instead of placing the upper left corner of the grid at 0,0 in the window, center it.
* render: log frame rendering time with microseconds instead of millisecondsDaniel Eklöf2019-08-24-2/+2
|
* render: change resize debug log message to an info log messageDaniel Eklöf2019-08-23-1/+1
|
* scrolling: optimize row access by assuming number of rows is a power of 2Daniel Eklöf2019-08-22-9/+8
| | | | | | | | | | | | | | | | | | | With this assumption, we can replace 'a % b' with 'a & (b - 1)'. In terms of instructions, this means a fast 'and' instead of a slow 'div'. Further optimize scrolling by: * not double-initializing empty rows. Previously, grid_row_alloc() called calloc(), which was then followed by a memset() when scrolling. This is of course unnecessary. * Don't loop the entire set of visible rows (this was done to ensure all visible rows had been allocated, and to prefetch the cell contents). This isn't necessary; only newly pulled in rows can be NULL. For now, don't prefetch at all.
* render: multiply width/height with *new* scale factor, not oldDaniel Eklöf2019-08-21-2/+2
|
* render: reload cursor theme when scale (may) have changedDaniel Eklöf2019-08-21-0/+42
|
* render: don't 're-calculate fg unnecessarilyDaniel Eklöf2019-08-18-6/+4
|
* render: minor optimizationDaniel Eklöf2019-08-17-1/+1
| | | | | Don't instantiate a pixman color unnecessarily when drawing a block cursor.
* render: use 32-bit pixman calls, where applicableDaniel Eklöf2019-08-17-2/+2
|
* shm/render: there's no need to have one pixman image per threadDaniel Eklöf2019-08-16-2/+2
|
* render: replace all usage of cairo with pixmanDaniel Eklöf2019-08-16-71/+80
|
* wip: render background and glyphs using pixmanDaniel Eklöf2019-08-16-52/+63
|
* Add background alpha supportDaniel Eklöf2019-08-15-2/+2
|
* output: track output we're mapped on, and use maximum scaleDaniel Eklöf2019-08-12-1/+12
| | | | | | Our surface may be on multiple outputs at the same time. In this case, we use the largest scale factor, and let the compositor down scale on the "other" output(s).
* output: resize on scale changesDaniel Eklöf2019-08-12-2/+8
|
* output: initial support for output scalingDaniel Eklöf2019-08-12-4/+5
| | | | | | * Not updated run-time; only scale at start up used * Multiple monitors (outputs) not supported, as we can't track which output we're on (yet).
* render: fix foreground color for non-block cursorDaniel Eklöf2019-08-12-1/+4
| | | | | | | When rendering either the 'bar' or 'underline' cursor styles, only use the configured "cursor color" if it has actually been configured. If it hasn't, use the current foreground color.
* render: selection may not be "ordered", since it may not have been finalizedDaniel Eklöf2019-08-08-0/+6
|
* selection: ensure start < end in finalizeDaniel Eklöf2019-08-05-24/+16
| | | | | When the selection is finalized, swap start/end if necessary, to make sure start <= end.
* render: make sure the current view is allocated and visibleDaniel Eklöf2019-08-04-8/+8
|
* cell: pack more efficiently and store glyph as a wcharDaniel Eklöf2019-08-02-6/+6
| | | | | | | | | | | 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.