RPJosh
/
wlvncc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print an 'oops' when the wl_buffer is still attached during drawing

pull/3/head
Andri Yngvason 2020-12-06 19:30:46 +00:00
parent c45613dbe7
commit 7c8c29beb2
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.c
View File

@ -43,6 +43,7 @@ struct buffer {
enum wl_shm_format format; enum wl_shm_format format;
struct wl_buffer* wl_buffer; struct wl_buffer* wl_buffer;
void* pixels; void* pixels;
bool is_attached;
}; };
struct window { struct window {
@ -130,6 +131,17 @@ static const struct wl_registry_listener registry_listener = {
.global_remove = registry_remove, .global_remove = registry_remove,
}; };
static void buffer_release(void* data, struct wl_buffer* wl_buffer)
{
(void)wl_buffer;
struct buffer* self = data;
self->is_attached = false;
}
static const struct wl_buffer_listener buffer_listener = {
.release = buffer_release,
};
static struct buffer* buffer_create(int width, int height, int stride, static struct buffer* buffer_create(int width, int height, int stride,
enum wl_shm_format format) enum wl_shm_format format)
{ {
@ -163,6 +175,9 @@ static struct buffer* buffer_create(int width, int height, int stride,
goto shm_failure; goto shm_failure;
close(fd); close(fd);
wl_buffer_add_listener(self->wl_buffer, &buffer_listener, self);
return self; return self;
shm_failure: shm_failure:
@ -263,6 +278,7 @@ static int init_signal_handler(void)
static void window_attach(struct window* w, int x, int y) static void window_attach(struct window* w, int x, int y)
{ {
w->buffer->is_attached = true;
wl_surface_attach(w->wl_surface, w->buffer->wl_buffer, x, y); wl_surface_attach(w->wl_surface, w->buffer->wl_buffer, x, y);
} }
@ -436,8 +452,9 @@ void on_vnc_client_update_fb(struct vnc_client* client)
if (!pixman_region_not_empty(&client->damage)) if (!pixman_region_not_empty(&client->damage))
return; return;
// TODO: Make sure that the buffer is released at this point, or make if (window->buffer->is_attached)
// this a side-buffer and copy damaged regions into double buffers. fprintf(stderr, "Oops, buffer is still attached.\n");
window_attach(window, 0, 0); window_attach(window, 0, 0);
int n_rects = 0; int n_rects = 0;