aboutsummaryrefslogtreecommitdiff
path: root/shm.h
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-18 09:41:14 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-18 09:41:14 +0000
commit34de799f90780097a6754e46efe302dcd3ec6eae (patch)
treeb2c91383efc3705a0952d8ab20830fbec7f6dc79 /shm.h
parentMerge branch 'allow-bleeding-glyphs' (diff)
parentshm: chain_free: BUG() if there are buffers remaining after purge (diff)
Merge branch 'refactor-shm-buffer-management'
Diffstat (limited to 'shm.h')
-rw-r--r--shm.h66
1 files changed, 18 insertions, 48 deletions
diff --git a/shm.h b/shm.h
index 610f0311..180c8525 100644
--- a/shm.h
+++ b/shm.h
@@ -7,69 +7,46 @@
#include <pixman.h>
#include <wayland-client.h>
-#include "terminal.h"
+#include <tllist.h>
-struct buffer_pool {
- int fd; /* memfd */
- struct wl_shm_pool *wl_pool;
-
- void *real_mmapped; /* Address returned from mmap */
- size_t mmap_size; /* Size of mmap (>= size) */
-
- size_t ref_count;
-};
+struct damage;
struct buffer {
- unsigned long cookie;
-
int width;
int height;
int stride;
- bool locked; /* Caller owned, shm won’t destroy it */
- bool busy; /* Owned by compositor */
- size_t size; /* Buffer size */
- void *mmapped; /* Raw data (TODO: rename) */
+ void *data;
struct wl_buffer *wl_buf;
pixman_image_t **pix;
size_t pix_instances;
- /* Internal */
- struct buffer_pool *pool;
- off_t offset; /* Offset into memfd where data begins */
-
- bool scrollable;
- bool purge; /* True if this buffer should be destroyed */
-
unsigned age;
+
struct damage *scroll_damage;
size_t scroll_damage_count;
pixman_region32_t dirty;
};
-struct buffer_description {
- int width;
- int height;
- unsigned long cookie;
-};
-
void shm_fini(void);
void shm_set_max_pool_size(off_t max_pool_size);
+struct buffer_chain;
+struct buffer_chain *shm_chain_new(
+ struct wl_shm *shm, bool scrollable, size_t pix_instances);
+void shm_chain_free(struct buffer_chain *chain);
+
/*
* Returns a single buffer.
*
* May returned a cached buffer. If so, the buffer’s age indicates how
* many shm_get_buffer() calls have been made for the same
- * width/height/cookie while the buffer was still busy.
+ * width/height while the buffer was still busy.
*
* A newly allocated buffer has an age of 1234.
*/
-struct buffer *shm_get_buffer(
- struct wl_shm *shm, int width, int height, unsigned long cookie,
- bool scrollable, size_t pix_instances);
-
+struct buffer *shm_get_buffer(struct buffer_chain *chain, int width, int height);
/*
* Returns many buffers, described by ‘info’, all sharing the same SHM
* buffer pool.
@@ -85,23 +62,16 @@ struct buffer *shm_get_buffer(
* soon as the compositor releases them.
*/
void shm_get_many(
- struct wl_shm *shm, size_t count,
- struct buffer_description info[static count],
- struct buffer *bufs[static count], size_t pix_instances);
+ struct buffer_chain *chain, size_t count,
+ int widths[static count], int heights[static count],
+ struct buffer *bufs[static count]);
bool shm_can_scroll(const struct buffer *buf);
-bool shm_scroll(struct wl_shm *shm, struct buffer *buf, int rows,
+bool shm_scroll(struct buffer *buf, int rows,
int top_margin, int top_keep_rows,
int bottom_margin, int bottom_keep_rows);
-void shm_purge(struct wl_shm *shm, unsigned long cookie);
-
-struct terminal;
-static inline unsigned long shm_cookie_grid(const struct terminal *term) { return (unsigned long)((uintptr_t)term + 0); }
-static inline unsigned long shm_cookie_search(const struct terminal *term) { return (unsigned long)((uintptr_t)term + 1); }
-static inline unsigned long shm_cookie_scrollback_indicator(const struct terminal *term) { return (unsigned long)(uintptr_t)term + 2; }
-static inline unsigned long shm_cookie_render_timer(const struct terminal *term) { return (unsigned long)(uintptr_t)term + 3; }
-static inline unsigned long shm_cookie_csd(const struct terminal *term, int n) { return (unsigned long)((uintptr_t)term + 4 + (n)); }
+void shm_addref(struct buffer *buf);
+void shm_unref(struct buffer *buf);
-struct url;
-static inline unsigned long shm_cookie_url(const struct url *url) { return (unsigned long)(uintptr_t)url; }
+void shm_purge(struct buffer_chain *chain);