mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screenshooter: Just use frame signal for screenshots too

Browse Source 
We'll remove the odd do_read_pixels callback next.
This commit is contained in:
Kristian Høgsberg
2012-06-20 00:05:46 -04:00
parent e9d0492419
commit ae2ba9b01b
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/screenshooter.c
+38 -36
View File
@@ -42,10 +42,11 @@ struct screenshooter {
struct wl_listener destroy_listener; struct wl_listener destroy_listener;
}; };
struct screenshooter_read_pixels { struct screenshooter_frame_listener {
struct weston_read_pixels base; struct wl_listener listener;
struct wl_buffer *buffer; struct wl_buffer *buffer;
struct wl_resource *resource; struct wl_resource *resource;
struct weston_output *output;
}; };
static void static void
@@ -92,18 +93,34 @@ copy_rgba_yflip(uint8_t *dst, uint8_t *src, int height, int stride)
} }
static void static void
screenshooter_read_pixels_done(struct weston_read_pixels *base, screenshooter_frame_notify(struct wl_listener *listener, void *data)
struct weston_output *output)
{ {
struct screenshooter_read_pixels *r = struct screenshooter_frame_listener *l =
(struct screenshooter_read_pixels *) base; container_of(listener,
struct screenshooter_frame_listener, listener);
struct weston_output *output = l->output;
int32_t stride; int32_t stride;
uint8_t *d, *s; uint8_t *pixels, *d, *s;
stride = wl_shm_buffer_get_stride(r->buffer); wl_list_remove(&listener->link);
stride = l->buffer->width * 4;
pixels = malloc(stride * l->buffer->height);
d = wl_shm_buffer_get_data(r->buffer); if (pixels == NULL) {
s = r->base.data + stride * (r->buffer->height - 1); wl_resource_post_no_memory(l->resource);
free(l);
return;
}
glPixelStorei(GL_PACK_ALIGNMENT, 1);
glReadPixels(0, 0, output->current->width, output->current->height,
output->compositor->read_format,
GL_UNSIGNED_BYTE, pixels);
stride = wl_shm_buffer_get_stride(l->buffer);
d = wl_shm_buffer_get_data(l->buffer);
s = pixels + stride * (l->buffer->height - 1);
switch (output->compositor->read_format) { switch (output->compositor->read_format) {
case GL_BGRA_EXT: case GL_BGRA_EXT:
@@ -116,12 +133,9 @@ screenshooter_read_pixels_done(struct weston_read_pixels *base,
break; break;
} }
wl_list_remove(&r->base.link); screenshooter_send_done(l->resource);
free(pixels);
screenshooter_send_done(r->resource); free(l);
free(r->base.data);
free(r);
} }
static void static void
@@ -131,9 +145,8 @@ screenshooter_shoot(struct wl_client *client,
struct wl_resource *buffer_resource) struct wl_resource *buffer_resource)
{ {
struct weston_output *output = output_resource->data; struct weston_output *output = output_resource->data;
struct screenshooter_read_pixels *r; struct screenshooter_frame_listener *l;
struct wl_buffer *buffer = buffer_resource->data; struct wl_buffer *buffer = buffer_resource->data;
int32_t stride;
if (!wl_buffer_is_shm(buffer)) if (!wl_buffer_is_shm(buffer))
return; return;
@@ -142,29 +155,18 @@ screenshooter_shoot(struct wl_client *client,
buffer->height < output->current->height) buffer->height < output->current->height)
return; return;
r = malloc(sizeof *r); l = malloc(sizeof *l);
if (r == NULL) { if (l == NULL) {
wl_resource_post_no_memory(resource); wl_resource_post_no_memory(resource);
return; return;
} }
r->base.x = 0; l->buffer = buffer;
r->base.y = 0; l->resource = resource;
r->base.width = output->current->width; l->output = output;
r->base.height = output->current->height;
r->base.done = screenshooter_read_pixels_done;
r->buffer = buffer;
r->resource = resource;
stride = buffer->width * 4;
r->base.data = malloc(stride * buffer->height);
if (r->base.data == NULL) { l->listener.notify = screenshooter_frame_notify;
free(r); wl_signal_add(&output->frame_signal, &l->listener);
wl_resource_post_no_memory(resource);
return;
}
wl_list_insert(output->read_pixels_list.prev, &r->base.link);
weston_compositor_schedule_repaint(output->compositor); weston_compositor_schedule_repaint(output->compositor);
} }