dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-04-27 19:26:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate some drwbuf fields

Browse Source 
We have those fields on the drwbuf struct, but we always use the
same ones. Let's deduplicate those fields by moving them on the drwsurf.

Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Willow Barraco 2025-04-17 17:58:39 +02:00 committed by Maarten van Gompel
parent 55b88bc14f
commit 73caeee513
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drw.c
View File

@ -7,8 +7,8 @@
#include "math.h" #include "math.h"
void drwbuf_handle_release(void *data, struct wl_buffer *wl_buffer) { void drwbuf_handle_release(void *data, struct wl_buffer *wl_buffer) {
struct drwbuf *db = data; struct drwsurf *ds = data;
db->released = true; ds->released = true;
}; };
const struct wl_buffer_listener buffer_listener = { const struct wl_buffer_listener buffer_listener = {
@ -23,11 +23,11 @@ void drwsurf_handle_frame_cb(void* data, struct wl_callback* callback,
ds->frame_cb = NULL; ds->frame_cb = NULL;
cairo_rectangle_int_t r = {0}; cairo_rectangle_int_t r = {0};
for (int i = 0; i < cairo_region_num_rectangles(ds->back_buffer->damage); i++) { for (int i = 0; i < cairo_region_num_rectangles(ds->damage); i++) {
cairo_region_get_rectangle(ds->back_buffer->damage, i, &r); cairo_region_get_rectangle(ds->damage, i, &r);
wl_surface_damage(ds->surf, r.x, r.y, r.width, r.height); wl_surface_damage(ds->surf, r.x, r.y, r.width, r.height);
}; };
cairo_region_subtract(ds->display_buffer->damage, ds->display_buffer->damage); cairo_region_subtract(ds->damage, ds->damage);
drwsurf_attach(ds); drwsurf_attach(ds);
} }
@ -50,8 +50,8 @@ void drwsurf_register_frame_cb(struct drwsurf *ds)
void drwsurf_damage(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t w, uint32_t h) void drwsurf_damage(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t w, uint32_t h)
{ {
cairo_rectangle_int_t rect = { x, y, w, h }; cairo_rectangle_int_t rect = { x, y, w, h };
cairo_region_union_rectangle(ds->back_buffer->damage, &rect); cairo_region_union_rectangle(ds->damage, &rect);
cairo_region_union_rectangle(ds->back_buffer->backport_damage, &rect); cairo_region_union_rectangle(ds->backport_damage, &rect);
drwsurf_register_frame_cb(ds); drwsurf_register_frame_cb(ds);
} }
@ -62,6 +62,15 @@ drwsurf_resize(struct drwsurf *ds, uint32_t w, uint32_t h, double s)
ds->width = ceil(w * s); ds->width = ceil(w * s);
ds->height = ceil(h * s); ds->height = ceil(h * s);
if (ds->damage)
cairo_region_destroy(ds->damage);
ds->damage = cairo_region_create();
if (ds->backport_damage)
cairo_region_destroy(ds->backport_damage);
ds->backport_damage = cairo_region_create();
ds->released = true;
setup_buffer(ds, ds->back_buffer); setup_buffer(ds, ds->back_buffer);
setup_buffer(ds, ds->display_buffer); setup_buffer(ds, ds->display_buffer);
} }
@ -75,8 +84,8 @@ drwsurf_backport(struct drwsurf *ds)
cairo_set_operator(ds->back_buffer->cairo, CAIRO_OPERATOR_SOURCE); cairo_set_operator(ds->back_buffer->cairo, CAIRO_OPERATOR_SOURCE);
cairo_rectangle_int_t r = {0}; cairo_rectangle_int_t r = {0};
for (int i = 0; i < cairo_region_num_rectangles(ds->display_buffer->backport_damage); i++) { for (int i = 0; i < cairo_region_num_rectangles(ds->backport_damage); i++) {
cairo_region_get_rectangle(ds->display_buffer->backport_damage, i, &r); cairo_region_get_rectangle(ds->backport_damage, i, &r);
cairo_set_source_surface(ds->back_buffer->cairo, ds->display_buffer->cairo_surf, 0, 0); cairo_set_source_surface(ds->back_buffer->cairo, ds->display_buffer->cairo_surf, 0, 0);
cairo_rectangle( cairo_rectangle(
@ -90,7 +99,7 @@ drwsurf_backport(struct drwsurf *ds)
}; };
cairo_restore(ds->back_buffer->cairo); cairo_restore(ds->back_buffer->cairo);
cairo_region_subtract(ds->display_buffer->backport_damage, ds->display_buffer->backport_damage); cairo_region_subtract(ds->backport_damage, ds->backport_damage);
} }
void void
@ -98,15 +107,16 @@ drwsurf_attach(struct drwsurf *ds)
{ {
wl_surface_attach(ds->surf, ds->back_buffer->buf, 0, 0); wl_surface_attach(ds->surf, ds->back_buffer->buf, 0, 0);
wl_surface_commit(ds->surf); wl_surface_commit(ds->surf);
ds->back_buffer->released = false; ds->released = false;
ds->attached = true; ds->attached = true;
} }
void void
drwsurf_flip(struct drwsurf *ds) drwsurf_flip(struct drwsurf *ds)
{ {
if (ds->back_buffer->released) if (ds->released)
return; return;
ds->released = true;
struct drwbuf *tmp = ds->back_buffer; struct drwbuf *tmp = ds->back_buffer;
ds->back_buffer = ds->display_buffer; ds->back_buffer = ds->display_buffer;
ds->display_buffer = tmp; ds->display_buffer = tmp;
@ -250,8 +260,7 @@ setup_buffer(struct drwsurf *drwsurf, struct drwbuf *drwbuf)
stride, WL_SHM_FORMAT_ARGB8888); stride, WL_SHM_FORMAT_ARGB8888);
wl_shm_pool_destroy(pool); wl_shm_pool_destroy(pool);
close(fd); close(fd);
wl_buffer_add_listener(drwbuf->buf, &buffer_listener, drwbuf); wl_buffer_add_listener(drwbuf->buf, &buffer_listener, drwsurf);
drwbuf->released = true;
if (drwbuf->cairo_surf) if (drwbuf->cairo_surf)
@ -260,13 +269,6 @@ setup_buffer(struct drwsurf *drwsurf, struct drwbuf *drwbuf)
drwbuf->pool_data, CAIRO_FORMAT_ARGB32, drwsurf->width, drwbuf->pool_data, CAIRO_FORMAT_ARGB32, drwsurf->width,
drwsurf->height, stride); drwsurf->height, stride);
if (drwbuf->damage)
cairo_region_destroy(drwbuf->damage);
drwbuf->damage = cairo_region_create();
if (drwbuf->backport_damage)
cairo_region_destroy(drwbuf->backport_damage);
drwbuf->backport_damage = cairo_region_create();
if (drwbuf->cairo) if (drwbuf->cairo)
cairo_destroy(drwbuf->cairo); cairo_destroy(drwbuf->cairo);
drwbuf->cairo = cairo_create(drwbuf->cairo_surf); drwbuf->cairo = cairo_create(drwbuf->cairo_surf);

4
drw.h
View File

@ -10,12 +10,10 @@ struct drw {
struct drwbuf { struct drwbuf {
uint32_t size; uint32_t size;
struct wl_buffer *buf; struct wl_buffer *buf;
cairo_region_t *damage, *backport_damage;
cairo_surface_t *cairo_surf; cairo_surface_t *cairo_surf;
cairo_t *cairo; cairo_t *cairo;
PangoLayout *layout; PangoLayout *layout;
unsigned char *pool_data; unsigned char *pool_data;
bool released;
}; };
struct drwsurf { struct drwsurf {
uint32_t width, height; uint32_t width, height;
@ -26,7 +24,9 @@ struct drwsurf {
struct wl_shm *shm; struct wl_shm *shm;
struct wl_callback *frame_cb; struct wl_callback *frame_cb;
cairo_region_t *damage, *backport_damage;
bool attached; bool attached;
bool released;
struct drwbuf *back_buffer; struct drwbuf *back_buffer;
struct drwbuf *display_buffer; struct drwbuf *display_buffer;