Commit graph

100 commits

Author SHA1 Message Date
Daniel Eklöf
d0c5cf6e9f
sixel: reflow: drop sixels that crosses the scrollback history’s end
This fixes various crashes that occurred after a reflow due to the
sixel image list invariants no longer being true.
2020-10-11 19:26:09 +02:00
Daniel Eklöf
d54adc5263
sixel: unhook: do overwrite *after* linefeeding
This ensures the overwrite is done when the scrollback history is in
the same state as when we then insert the new image.
2020-10-11 19:26:07 +02:00
Daniel Eklöf
0e4b0fefc1
sixel: overwrite: use pixman to calculate new the sixel boundaries
When punching a hole in a sixel (and thus splitting it up into up to
four new sixels), use pixman to calculate the new sixel coordinates
and sizes.
2020-10-11 19:26:05 +02:00
Daniel Eklöf
329a290f82
sixel: ovewrite-by-rectangle: in debug builds, cross-reference against pixman
Use pixman to calculate the intersection of the rectangle being
overwritten, and the sixel(s). Verify our code matches.
2020-10-11 19:26:03 +02:00
Daniel Eklöf
09e8a5b11d
sixel: verify scrollback consistency: new verify function
Verifies sixels have been scrolled out correctly
2020-10-11 19:26:01 +02:00
Daniel Eklöf
cc54c1bea7
sixel: add comments to verify_*() functions 2020-10-11 19:26:00 +02:00
Daniel Eklöf
0a802c2693
sixel: verify-*: don’t return anything; rely on asserts only 2020-10-11 19:25:58 +02:00
Daniel Eklöf
eec0971739
sixel: scroll up/down: early return when list is empty
Branch tagged as ‘likely’ for performance reason
2020-10-11 19:25:56 +02:00
Daniel Eklöf
3540031dc6
sixel: cell-size-changed: don’t verify sixels here
The state after this function is an intermediate state and isn’t
necessarily valid.

This sixels needs to be ‘reflowed’ to ensure a valid state. This is
something that should be done by the caller after the text grid has
been reflowed and the sixel coordinates have been re-mapped to the new
grid.

TODO: can/should we update the sixel cols/rows in sixel_reflow()
instead?
2020-10-11 19:25:55 +02:00
Daniel Eklöf
f834ae8add
sixel: unhook: look total number of sixels
This helps debug sixel overwrites, as it makes it more visible when
there are sixels that _should_ have been removed.
2020-10-11 19:25:53 +02:00
Daniel Eklöf
47c884da53
sixel: scroll-up: don’t break out early of loop
This function loops the list of sixels, and discards those that would
be scrolled out if the grid offset is moved forward by the specified
number of rows.

The criteria is when the rebased row value is less than the number of
rows to scroll.

A rebased row number is a zero-based number starting at the beginning
of the scrollback. Thus, when scrolling 5 rows, rows with a rebased
row number between 0-4 will be scrolled out.

For performance reasons, we used to break out of the loop as soon as a
row number *larger* than the scroll count.

This however does not work. The sixels are sorted by their *end*
row. While this works in most cases (think images outputted in the
shell in the normal screen), it doesn’t always.

In the alt screen, where applications can print images just about
anywhere, it is possible to have *any* start row number anywhere in
the sixel list. Just as long as their *end* row numbers are sorted.

For example, a huuuge sixel that covers the entire scrollback. This
sixel will naturally be first in the list (and thus sixel_scroll_up()
will visit it *last*, since it iterates the list in reverse), but
should still be destroyed when scrolling.
2020-10-11 19:25:51 +02:00
Daniel Eklöf
5a2cc9c9ae
sixel: verify-list-order: add an ‘index’ variable
This will make it easier when debugging assertions in this function.
2020-10-11 19:25:50 +02:00
Daniel Eklöf
96a20c9df7
sixel: overwrite-by-rectangle: assert sixels don’t cross scrollback wrap-around 2020-10-11 19:25:48 +02:00
Daniel Eklöf
6a8130c122
sixel: scroll: call sixel_erase() instead of sixel_destroy()
This ensures the screen is updated correctly. Without this, the sixel
image would remain on screen until force-refreshed by some other means.
2020-10-11 19:25:46 +02:00
Daniel Eklöf
74703822fb
sixel: TOOD -> TODO (fixes codespell build error) 2020-10-11 19:25:44 +02:00
Daniel Eklöf
29d0068462
sixel: verify-no-overlap: free pixman regions 2020-10-11 19:25:43 +02:00
Daniel Eklöf
e8f703eb65
sixel: verify-no-overlap: initialize ‘intersection’ pixman region 2020-10-11 19:25:41 +02:00
Daniel Eklöf
af7fd00909
sixel: unhook: only call render_refresh() once 2020-10-11 19:25:38 +02:00
Daniel Eklöf
2e7afc615c
sixel: implement reflow
Move sixel reflow from grid_reflow() to sixel_reflow(). This lets us
use internal sixel functions to update the sixels.

Note that grid_reflow() still needs to remap the sixelss coordinates.
2020-10-11 19:25:36 +02:00
Daniel Eklöf
da866f6453
sixel: verify-sixels: check for bad list order last 2020-10-11 19:25:32 +02:00
Daniel Eklöf
0876c7eafe
sixel: verify-no-wraparound-crossover: fix calculation of ‘end’ row 2020-10-11 19:25:31 +02:00
Daniel Eklöf
74c7373efc
sixel: add sixel_cell_size_changed()
This function should be called *after* the cell dimensions have
changed, but *before* resizing/reflowing the grids.
2020-10-11 19:25:29 +02:00
Daniel Eklöf
5e5036bec9
sixel: debug: more fine-grained verification of sixel image list
* Verify no sixel crosses the scrollback wrap-around
* Verify no sixels overlap
2020-10-11 19:25:27 +02:00
Daniel Eklöf
368305aa59
sixel: overwrite: calculate split-up image pieces’ rows/cols from their width/height 2020-10-11 19:25:24 +02:00
Daniel Eklöf
e694f293ac
sixel: overwrite: remove asserts
Sixels may extend outside the visible screen area
2020-10-11 19:25:22 +02:00
Daniel Eklöf
cdcdfe527c
sixel: fix sheared image when image crosses scrollback wrap-around
When a sixel image crosses the scrollback wrap-around, it is split up
into (at least) two pieces.

We use cursor->point.col for all pieces’ x-coordinate. This caused the
final image to appear sheared, since we do a carriage-return (after a
number of linefeeds) after each piece - this causes the cursor’s
position to be reset to the left margin.

The solution is simple; remember the cursor’s initial x-coordinate,
and use that to position all image pieces.

Closes #151.
2020-10-11 19:25:18 +02:00
Daniel Eklöf
7a7ba599c3
sixel: overwrite-by-rectangle expects ‘width’ to not exceed screen
This fixes a crash when the emitted sixel extends beyond the right
margin. The crash only happens when there are other sixel images
already emitted.

Fixes part of #151
2020-10-11 19:25:16 +02:00
Daniel Eklöf
2c515c27e5
sixel: fold long line 2020-10-11 19:25:14 +02:00
Daniel Eklöf
aa3985a298
Don't use "case X ... Y:", if possible/where it makes sense 2020-08-23 10:07:08 +02:00
Daniel Eklöf
e32c0d9bf6
Cast printf formatter %p arguments to void* 2020-08-23 10:07:08 +02:00
Daniel Eklöf
dabdffafa5
don't use empty struct initializers 2020-08-23 10:07:00 +02:00
Craig Barnes
7a77958ba2 Convert most dynamic allocations to use functions from xmalloc.h 2020-08-08 20:37:57 +01:00
Daniel Eklöf
f6473756d9
sixel: remove sixel-to-be-splitted *before* splitting it
This fixes an assertion in debug builds, due to the pre-splitted and
splitted sixels overlapping.
2020-07-23 18:15:29 +02:00
Daniel Eklöf
fda6e9c2c9
sixel: overwrite: use target sixel's height, not cell height
When copying the image data for the left and right parts of the
splitted images, use the sixel's height, not the cell height.

This fixes a crash when the sixel didn't cover the entire cell height.
2020-07-23 18:13:54 +02:00
Daniel Eklöf
674f0dd0fc
sixel: verify list order: fix assertion when two sixels are on the same row
Two sixel may in fact exist on the same row, assuming their columns
don't overlap.
2020-07-16 08:13:44 +02:00
Daniel Eklöf
b9719673a1
term: rename term_formfeed() -> term_carriage_return() 2020-07-14 09:29:10 +02:00
Daniel Eklöf
3063204289
sixel: overwrite_by_row: handle case where 'width' goes past end of row
Cap 'width' to maximum number of columns available.
2020-07-07 10:42:59 +02:00
Daniel Eklöf
fad5838dba
Merge branch 'master' into sixel-performance 2020-06-29 22:03:26 +02:00
Daniel Eklöf
62be729c45
scroll: destroy scrolled out sixels before scroll is applied
The logic that breaks out of sixel loops does not work for rows that
has already wrapped around.

Thus, we need to destroy sixels that are about to be scrolled
out *before* we actually scroll.

Since this is the *only* time we destroy sixels (instead of
overwriting it), rename the sixel functions. And, since they now do a
very specific thing, they can be greatly simplified (and thus faster).
2020-06-29 22:01:02 +02:00
Daniel Eklöf
8f5e6e85e0
sixel: destroy all sixels when font size is decreased
If changing the font size causes the cell size to decrease, either
horizontally or vertically (or both), then delete all sixels since the
grid space they allocated no longer is enough to hold the images.
2020-06-29 21:53:29 +02:00
Daniel Eklöf
1140dd37d3
sixel: overwrite-by-rectangle: optimize: break out of loop as soon as possible
Since the images are sorted, we can break out of the loop as soon as
we detect an image that *ends before* the rectangle's top starts.

In order for the row comparisons to work, the row numbers must be
re-based against the current scrollback offset, or the
scrollback *end*, to be precise.
2020-06-28 19:22:23 +02:00
Daniel Eklöf
aa1951a4d2
sixel: overwrite-by-row: optimize: break out of loop as soon as possible
Since the images are sorted, we can break out of the loop as soon as
we detect an image that *ends before* the row we're looking for.

In order for the row comparisons to work, the row numbers must be
re-based against the current scrollback offset, or the
scrollback *end*, to be precise.
2020-06-28 14:24:30 +02:00
Daniel Eklöf
4006fc86e4
sixel: overwrite: pass 'width' to sixel_overwrite_at_cursor()
This is necessary to handle multi-column characters correctly.
2020-06-28 11:01:19 +02:00
Daniel Eklöf
0483466f68
sixel: insert: calculate end rows in a single statement 2020-06-28 10:45:05 +02:00
Daniel Eklöf
4a0042ba15
sixel: insert: sort sixels such that those furthest up in the scrollback is at the back 2020-06-28 09:16:43 +02:00
Daniel Eklöf
247e0c42d3
sixel: add local function sixel_insert()
Replace all tll_push_*() calls with calls to this function.
2020-06-28 08:37:25 +02:00
Daniel Eklöf
186a07c364
sixel: split -> overwrite 2020-06-27 15:29:47 +02:00
Daniel Eklöf
ae727e372a
term: erasing characters now splits sixels instead of deleting them 2020-06-27 15:22:31 +02:00
Daniel Eklöf
0953ffd2d3
sixel: delete/split: early(ier) exit when there aren't in sixel images
Avoid unnecessary wrap checks if the sixel image list is empty.
2020-06-27 14:43:29 +02:00
Daniel Eklöf
8cdfd03c4b
sixel: split: make pixman instantiation generic 2020-06-27 14:26:13 +02:00