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

conf: max-shm-pool-size-mb=0 now disables SHM scrolling

Browse source
This commit is contained in:
Daniel Eklöf 2020-03-26 18:04:30 +01:00
parent 0baa249d8b
commit c4aaba6299
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shm.c
View file

@ -133,7 +133,6 @@ instantiate_offset(struct wl_shm *shm, struct buffer *buf, off_t new_offset)
assert(buf->mmapped == NULL); assert(buf->mmapped == NULL);
assert(buf->wl_buf == NULL); assert(buf->wl_buf == NULL);
assert(buf->pix == NULL); assert(buf->pix == NULL);
assert(new_offset + buf->size <= max_pool_size);
void *mmapped = MAP_FAILED; void *mmapped = MAP_FAILED;
struct wl_buffer *wl_buf = NULL; struct wl_buffer *wl_buf = NULL;
@ -257,8 +256,8 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie,
off_t initial_offset = 0; off_t initial_offset = 0;
off_t memfd_size = size; off_t memfd_size = size;
#else #else
off_t initial_offset = scrollable ? (max_pool_size / 4) & ~(page_size() - 1) : 0; off_t initial_offset = scrollable && max_pool_size > 0 ? (max_pool_size / 4) & ~(page_size() - 1) : 0;
off_t memfd_size = scrollable ? max_pool_size : size; off_t memfd_size = scrollable && max_pool_size > 0 ? max_pool_size : size;
#endif #endif
LOG_DBG("memfd-size: %lu, initial offset: %lu", memfd_size, initial_offset); LOG_DBG("memfd-size: %lu, initial offset: %lu", memfd_size, initial_offset);
@ -359,7 +358,7 @@ shm_can_scroll(const struct buffer *buf)
/* Not enough virtual address space in 32-bit */ /* Not enough virtual address space in 32-bit */
return false; return false;
#else #else
return can_punch_hole && buf->scrollable; return can_punch_hole && max_pool_size > 0 && buf->scrollable;
#endif #endif
} }
@ -409,9 +408,6 @@ shm_scroll_forward(struct wl_shm *shm, struct buffer *buf, int rows,
assert(buf->wl_buf); assert(buf->wl_buf);
assert(buf->fd >= 0); assert(buf->fd >= 0);
if (!can_punch_hole)
return false;
LOG_DBG("scrolling %d rows (%d bytes)", rows, rows * buf->stride); LOG_DBG("scrolling %d rows (%d bytes)", rows, rows * buf->stride);
const off_t diff = rows * buf->stride; const off_t diff = rows * buf->stride;
@ -604,6 +600,9 @@ shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows,
int top_margin, int top_keep_rows, int top_margin, int top_keep_rows,
int bottom_margin, int bottom_keep_rows) int bottom_margin, int bottom_keep_rows)
{ {
if (!shm_can_scroll(buf))
return false;
assert(rows != 0); assert(rows != 0);
return rows > 0 return rows > 0
? shm_scroll_forward(shm, buf, rows, top_margin, top_keep_rows, bottom_margin, bottom_keep_rows) ? shm_scroll_forward(shm, buf, rows, top_margin, top_keep_rows, bottom_margin, bottom_keep_rows)