mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-11 05:33:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'shm-buffer-busy-sometimes-not-set'

Browse source 
Closes #844
This commit is contained in:
Daniel Eklöf 2021-12-18 14:41:12 +01:00
commit 0b9cb6bd2f
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -60,6 +60,8 @@
(https://codeberg.org/dnkl/foot/issues/842). (https://codeberg.org/dnkl/foot/issues/842).
* Key presses triggering keyboard layout switches also being emitted * Key presses triggering keyboard layout switches also being emitted
CSI codes in the Kitty keyboard protocol. CSI codes in the Kitty keyboard protocol.
* Assertion in `shm.c:buffer_release()`
(https://codeberg.org/dnkl/foot/issues/844).
### Security ### Security

29
shm.c
View file

@ -546,15 +546,9 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height)
else else
#endif #endif
{ {
if (cached == NULL) { if (cached == NULL)
LOG_DBG("re-using buffer %p from cache", (void *)buf); cached = buf;
buf->busy = true; else {
pixman_region32_clear(&buf->public.dirty);
free(buf->public.scroll_damage);
buf->public.scroll_damage = NULL;
xassert(buf->public.pix_instances == chain->pix_instances);
cached = it->item;
} else {
/* We have multiple buffers eligible for /* We have multiple buffers eligible for
* re-use. Pick the “youngest” one, and mark the * re-use. Pick the “youngest” one, and mark the
* other one for purging */ * other one for purging */
@ -562,6 +556,14 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height)
shm_unref(&cached->public); shm_unref(&cached->public);
cached = buf; cached = buf;
} else { } else {
/*
* TODO: I think we _can_ use shm_unref()
* here...
*
* shm_unref() may remove ‘it’, but that
* should be safe; “our” tll_foreach() already
* holds the next pointer.
*/
if (buffer_unref_no_remove_from_chain(buf)) if (buffer_unref_no_remove_from_chain(buf))
tll_remove(chain->bufs, it); tll_remove(chain->bufs, it);
} }
@ -569,8 +571,15 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height)
} }
} }
if (cached != NULL) if (cached != NULL) {
LOG_DBG("re-using buffer %p from cache", (void *)cached);
cached->busy = true;
pixman_region32_clear(&cached->public.dirty);
free(cached->public.scroll_damage);
cached->public.scroll_damage = NULL;
xassert(cached->public.pix_instances == chain->pix_instances);
return &cached->public; return &cached->public;
}
struct buffer *ret; struct buffer *ret;
get_new_buffers(chain, 1, &width, &height, &ret, false); get_new_buffers(chain, 1, &width, &height, &ret, false);