mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-02 07:15:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: scroll: use shm scrolling even though we have a top region

Browse source
This commit is contained in:
Daniel Eklöf 2020-03-23 20:16:19 +01:00
parent 75180cea37
commit 00129b1935
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
render.c
View file

@ -551,6 +551,7 @@ grid_render_scroll(struct terminal *term, struct buffer *buf,
gettimeofday(&start_time, NULL); gettimeofday(&start_time, NULL);
#endif #endif
uint8_t *raw = buf->mmapped;
int dst_y = term->margins.top + (dmg->scroll.region.start + 0) * term->cell_height; int dst_y = term->margins.top + (dmg->scroll.region.start + 0) * term->cell_height;
int src_y = term->margins.top + (dmg->scroll.region.start + dmg->scroll.lines) * term->cell_height; int src_y = term->margins.top + (dmg->scroll.region.start + dmg->scroll.lines) * term->cell_height;
@ -587,15 +588,26 @@ grid_render_scroll(struct terminal *term, struct buffer *buf,
* SHM. Otherwise use memmove. * SHM. Otherwise use memmove.
*/ */
bool try_shm_scroll = bool try_shm_scroll =
dmg->scroll.region.start == 0 && shm_can_scroll() && (dmg->scroll.lines +
dmg->scroll.lines + (term->rows - dmg->scroll.region.end) < term->rows / 2; dmg->scroll.region.start +
(term->rows - dmg->scroll.region.end)) < term->rows / 2;
bool did_shm_scroll = false; bool did_shm_scroll = false;
//try_shm_scroll = false; //try_shm_scroll = false;
//try_shm_scroll = true; //try_shm_scroll = true;
/* TODO: this could easily use up all stack */
uint8_t top_region[dmg->scroll.region.start * term->cell_height * buf->stride];
if (try_shm_scroll) { if (try_shm_scroll) {
if (dmg->scroll.region.start > 0) {
/* Store a copy of the top region - we need to restore it after scrolling */
memcpy(top_region,
(uint8_t *)buf->mmapped + term->margins.top * buf->stride,
sizeof(top_region));
}
did_shm_scroll = shm_scroll( did_shm_scroll = shm_scroll(
term->wl->shm, buf, dmg->scroll.lines * term->cell_height); term->wl->shm, buf, dmg->scroll.lines * term->cell_height);
@ -620,6 +632,12 @@ grid_render_scroll(struct terminal *term, struct buffer *buf,
*/ */
if (did_shm_scroll) { if (did_shm_scroll) {
/* Mmap changed - update buffer pointer */
raw = buf->mmapped;
/* Restore top scrolling region */
memcpy(raw + term->margins.top * buf->stride, top_region, sizeof(top_region));
/* Restore bottom scrolling region */ /* Restore bottom scrolling region */
if (dmg->scroll.region.end < term->rows) { if (dmg->scroll.region.end < term->rows) {
int src = dmg->scroll.region.end - dmg->scroll.lines; int src = dmg->scroll.region.end - dmg->scroll.lines;
@ -629,7 +647,6 @@ grid_render_scroll(struct terminal *term, struct buffer *buf,
LOG_DBG("memmoving %zu lines of scroll region", amount); LOG_DBG("memmoving %zu lines of scroll region", amount);
assert(src >= 0); assert(src >= 0);
uint8_t *raw = buf->mmapped;
memmove( memmove(
raw + (term->margins.top + dst * term->cell_height) * buf->stride, raw + (term->margins.top + dst * term->cell_height) * buf->stride,
raw + (term->margins.top + src * term->cell_height) * buf->stride, raw + (term->margins.top + src * term->cell_height) * buf->stride,