From 1c8b72e0cd63c4965bc04e7390d3165a9e4c08ce Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 7 Sep 2017 17:31:30 +0200 Subject: Add screenshooter skeleton --- include/wlr/types/wlr_screenshooter.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 include/wlr/types/wlr_screenshooter.h (limited to 'include/wlr') diff --git a/include/wlr/types/wlr_screenshooter.h b/include/wlr/types/wlr_screenshooter.h new file mode 100644 index 00000000..5d1a9254 --- /dev/null +++ b/include/wlr/types/wlr_screenshooter.h @@ -0,0 +1,21 @@ +#ifndef _WLR_SCREENSHOOTER_H +#define _WLR_SCREENSHOOTER_H +#include + +struct wlr_screenshooter { + struct wl_global *wl_global; + + void *data; +}; + +struct wlr_screenshot { + struct wl_resource *resource; + struct wl_resource *output; + + void* data; +}; + +struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display); +void wlr_screenshooter_destroy(struct wlr_screenshooter *screenshooter); + +#endif -- cgit v1.2.3 From 35f970025133dc5ad627936a3cdeacb37b532072 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 8 Sep 2017 18:09:09 +0200 Subject: First attempt to implement screenshooter --- backend/drm/drm.c | 10 ++ examples/meson.build | 6 + examples/screenshot.c | 292 ++++++++++++++++++++++++++++++++++++ include/wlr/interfaces/wlr_output.h | 1 + include/wlr/types/wlr_output.h | 1 + protocol/meson.build | 2 + types/wlr_output.c | 6 + types/wlr_screenshooter.c | 43 +++++- 8 files changed, 360 insertions(+), 1 deletion(-) create mode 100644 examples/screenshot.c (limited to 'include/wlr') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 9e5346a1..117e5749 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -634,6 +634,15 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output, return drm->iface->crtc_move_cursor(drm, conn->crtc, x, y); } +static void wlr_drm_connector_read_pixels(struct wlr_output *_output, + void *out_data) { + struct wlr_drm_output *output = (struct wlr_drm_output *)_output; + struct wlr_drm_crtc *crtc = output->crtc; + struct wlr_drm_plane *plane = crtc->primary; + glReadPixels(0, 0, plane->width, plane->height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, + out_data); +} + static void wlr_drm_connector_destroy(struct wlr_output *output) { struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; wlr_drm_connector_cleanup(conn); @@ -652,6 +661,7 @@ static struct wlr_output_impl output_impl = { .swap_buffers = wlr_drm_connector_swap_buffers, .set_gamma = wlr_drm_connector_set_gamma, .get_gamma_size = wlr_drm_connector_get_gamma_size, + .read_pixels = wlr_drm_connector_read_pixels, }; static int retry_pageflip(void *data) { diff --git a/examples/meson.build b/examples/meson.build index 6ec40843..292ab053 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -22,3 +22,9 @@ executable( dependencies: wlroots, link_with: lib_shared, ) + +executable( + 'screenshot', + 'screenshot.c', + dependencies: [wayland_client, wlr_protos, dependency('cairo')], +) diff --git a/examples/screenshot.c b/examples/screenshot.c new file mode 100644 index 00000000..0f1f1efe --- /dev/null +++ b/examples/screenshot.c @@ -0,0 +1,292 @@ +/* + * Copyright © 2008 Kristian Høgsberg + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#define _XOPEN_SOURCE 700 +#define _POSIX_C_SOURCE 199309L +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../backend/wayland/os-compatibility.c" + +static struct wl_shm *shm; +static struct orbital_screenshooter *screenshooter; +static struct wl_list output_list; +int min_x, min_y, max_x, max_y; +int buffer_copy_done; + +struct screenshooter_output { + struct wl_output *output; + struct wl_buffer *buffer; + int width, height, offset_x, offset_y; + void *data; + struct wl_list link; +}; + +static void +display_handle_geometry(void *data, + struct wl_output *wl_output, + int x, + int y, + int physical_width, + int physical_height, + int subpixel, + const char *make, + const char *model, + int transform) +{ + struct screenshooter_output *output; + + output = wl_output_get_user_data(wl_output); + + if (wl_output == output->output) { + output->offset_x = x; + output->offset_y = y; + } +} + +static void +display_handle_mode(void *data, + struct wl_output *wl_output, + uint32_t flags, + int width, + int height, + int refresh) +{ + struct screenshooter_output *output; + + output = wl_output_get_user_data(wl_output); + + if (wl_output == output->output && (flags & WL_OUTPUT_MODE_CURRENT)) { + output->width = width; + output->height = height; + } +} + +static const struct wl_output_listener output_listener = { + display_handle_geometry, + display_handle_mode +}; + +static void +screenshot_done(void *data, struct orbital_screenshot *screenshot) +{ + buffer_copy_done = 1; +} + +static const struct orbital_screenshot_listener screenshot_listener = { + screenshot_done +}; + +static void +handle_global(void *data, struct wl_registry *registry, + uint32_t name, const char *interface, uint32_t version) +{ + static struct screenshooter_output *output; + + if (strcmp(interface, "wl_output") == 0) { + output = calloc(1, sizeof *output); + output->output = wl_registry_bind(registry, name, + &wl_output_interface, 1); + wl_list_insert(&output_list, &output->link); + wl_output_add_listener(output->output, &output_listener, output); + } else if (strcmp(interface, "wl_shm") == 0) { + shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); + } else if (strcmp(interface, "orbital_screenshooter") == 0) { + screenshooter = wl_registry_bind(registry, name, + &orbital_screenshooter_interface, + 1); + } +} + +static void +handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) +{ + /* XXX: unimplemented */ +} + +static const struct wl_registry_listener registry_listener = { + handle_global, + handle_global_remove +}; + +static struct wl_buffer * +create_shm_buffer(int width, int height, void **data_out) +{ + struct wl_shm_pool *pool; + struct wl_buffer *buffer; + int fd, size, stride; + void *data; + + stride = width * 4; + size = stride * height; + + fd = os_create_anonymous_file(size); + if (fd < 0) { + fprintf(stderr, "creating a buffer file for %d B failed: %m\n", + size); + return NULL; + } + + data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (data == MAP_FAILED) { + fprintf(stderr, "mmap failed: %m\n"); + close(fd); + return NULL; + } + + pool = wl_shm_create_pool(shm, fd, size); + close(fd); + buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride, + WL_SHM_FORMAT_XRGB8888); + wl_shm_pool_destroy(pool); + + *data_out = data; + + return buffer; +} + +static void +write_png(int width, int height) +{ + int output_stride, buffer_stride, i; + cairo_surface_t *surface; + void *data, *d, *s; + struct screenshooter_output *output, *next; + + buffer_stride = width * 4; + + data = calloc(1, buffer_stride * height); + if (!data) + return; + + wl_list_for_each_safe(output, next, &output_list, link) { + output_stride = output->width * 4; + s = output->data; + d = data + (output->offset_y - min_y) * buffer_stride + + (output->offset_x - min_x) * 4; + + for (i = 0; i < output->height; i++) { + memcpy(d, s, output_stride); + d += buffer_stride; + s += output_stride; + } + + free(output); + } + + surface = cairo_image_surface_create_for_data(data, + CAIRO_FORMAT_ARGB32, + width, height, buffer_stride); + cairo_surface_write_to_png(surface, "wayland-screenshot.png"); + cairo_surface_destroy(surface); + free(data); +} + +static int +set_buffer_size(int *width, int *height) +{ + struct screenshooter_output *output; + min_x = min_y = INT_MAX; + max_x = max_y = INT_MIN; + int position = 0; + + wl_list_for_each_reverse(output, &output_list, link) { + output->offset_x = position; + position += output->width; + } + + wl_list_for_each(output, &output_list, link) { + min_x = MIN(min_x, output->offset_x); + min_y = MIN(min_y, output->offset_y); + max_x = MAX(max_x, output->offset_x + output->width); + max_y = MAX(max_y, output->offset_y + output->height); + } + + if (max_x <= min_x || max_y <= min_y) + return -1; + + *width = max_x - min_x; + *height = max_y - min_y; + + return 0; +} + +int main(int argc, char *argv[]) +{ + struct wl_display *display; + struct wl_registry *registry; + struct screenshooter_output *output; + int width, height; + + display = wl_display_connect(NULL); + if (display == NULL) { + fprintf(stderr, "failed to create display: %m\n"); + return -1; + } + + wl_list_init(&output_list); + registry = wl_display_get_registry(display); + wl_registry_add_listener(registry, ®istry_listener, NULL); + wl_display_dispatch(display); + wl_display_roundtrip(display); + + if (screenshooter == NULL) { + fprintf(stderr, "display doesn't support screenshooter\n"); + return -1; + } + + if (set_buffer_size(&width, &height)) { + fprintf(stderr, "cannot set buffer size\n"); + return -1; + } + + wl_list_for_each(output, &output_list, link) { + if (output->width == 0 || output->height == 0) { + continue; + } + + output->buffer = create_shm_buffer(output->width, output->height, &output->data); + if (output->buffer == NULL) { + return -1; + } + struct orbital_screenshot *screenshot = orbital_screenshooter_shoot( + screenshooter, output->output, output->buffer); + orbital_screenshot_add_listener(screenshot, &screenshot_listener, screenshot); + buffer_copy_done = 0; + while (!buffer_copy_done) + wl_display_roundtrip(display); + } + + write_png(width, height); + + return 0; +} diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index 7d2821e0..2fd306d7 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -19,6 +19,7 @@ struct wlr_output_impl { void (*set_gamma)(struct wlr_output *output, uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); uint16_t (*get_gamma_size)(struct wlr_output *output); + void (*read_pixels)(struct wlr_output *_output, void *out_data); }; void wlr_output_init(struct wlr_output *output, const struct wlr_output_impl *impl); diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 1fa6ad9e..509e1bcb 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -70,5 +70,6 @@ void wlr_output_swap_buffers(struct wlr_output *output); void wlr_output_set_gamma(struct wlr_output *output, uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); uint16_t wlr_output_get_gamma_size(struct wlr_output *output); +void wlr_output_read_pixels(struct wlr_output *output, void *out_data); #endif diff --git a/protocol/meson.build b/protocol/meson.build index 28a7b668..79871fea 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -28,6 +28,8 @@ protocols = [ client_protocols = [ [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], + 'gamma-control.xml', + 'screenshooter.xml', ] wl_protos_src = [] diff --git a/types/wlr_output.c b/types/wlr_output.c index f167a213..abad1aec 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -247,3 +247,9 @@ uint16_t wlr_output_get_gamma_size(struct wlr_output *output) { } return output->impl->get_gamma_size(output); } + +void wlr_output_read_pixels(struct wlr_output *output, void *out_data) { + if (output->impl->read_pixels) { + output->impl->read_pixels(output, out_data); + } +} diff --git a/types/wlr_screenshooter.c b/types/wlr_screenshooter.c index 20be1103..43e5fcd9 100644 --- a/types/wlr_screenshooter.c +++ b/types/wlr_screenshooter.c @@ -6,9 +6,44 @@ #include #include "screenshooter-protocol.h" +struct screenshot_state { + struct wl_shm_buffer *shm_buffer; + struct wlr_output *output; + struct wlr_screenshot *screenshot; + struct wl_listener frame_listener; +}; + +static void output_frame_notify(struct wl_listener *listener, void *_data) { + struct screenshot_state *state = wl_container_of(listener, state, frame_listener); + + void *data = wl_shm_buffer_get_data(state->shm_buffer); + wl_shm_buffer_begin_access(state->shm_buffer); + wlr_output_read_pixels(state->output, data); + wl_shm_buffer_end_access(state->shm_buffer); + + wl_list_remove(&listener->link); + orbital_screenshot_send_done(state->screenshot->resource); + + // TODO: free(state) +} + static void screenshooter_shoot(struct wl_client *client, struct wl_resource *_screenshooter, uint32_t id, struct wl_resource *_output, struct wl_resource *_buffer) { + struct wlr_output *output = wl_resource_get_user_data(_output); + if (!wl_shm_buffer_get(_buffer)) { + wlr_log(L_ERROR, "Invalid buffer: not a shared memory buffer"); + return; + } + struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get(_buffer); + int32_t width = wl_shm_buffer_get_width(shm_buffer); + int32_t height = wl_shm_buffer_get_height(shm_buffer); + // TODO: int32_t stride = wl_shm_buffer_get_stride(shm_buffer); + if (width < output->width || height < output->height) { + wlr_log(L_ERROR, "Invalid buffer: too small"); + return; + } + struct wlr_screenshot *screenshot; if (!(screenshot = calloc(1, sizeof(struct wlr_screenshot)))) { return; @@ -18,7 +53,13 @@ static void screenshooter_shoot(struct wl_client *client, &orbital_screenshot_interface, wl_resource_get_version(_screenshooter), id); wlr_log(L_DEBUG, "new screenshot %p (res %p)", screenshot, screenshot->resource); wl_resource_set_implementation(screenshot->resource, NULL, screenshot, NULL); - // TODO: orbital_screenshot_send_done(screenshot->resource); + + struct screenshot_state *state = calloc(1, sizeof(struct screenshot_state)); + state->shm_buffer = shm_buffer; + state->output = output; + state->screenshot = screenshot; + state->frame_listener.notify = output_frame_notify; + wl_signal_add(&output->events.frame, &state->frame_listener); } static struct orbital_screenshooter_interface screenshooter_impl = { -- cgit v1.2.3 From d0db6a80ab64ee1f5d090677c18f57109b36575a Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 9 Sep 2017 11:32:03 +0200 Subject: Add post_frame event to wlr_output, use wlr_drm_plane_make_current in wlr_drm_output_read_pixels --- backend/drm/drm.c | 7 ++++--- include/wlr/types/wlr_output.h | 1 + types/wlr_output.c | 1 + types/wlr_screenshooter.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) (limited to 'include/wlr') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 117e5749..ec0c29f7 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -636,9 +636,9 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output, static void wlr_drm_connector_read_pixels(struct wlr_output *_output, void *out_data) { - struct wlr_drm_output *output = (struct wlr_drm_output *)_output; - struct wlr_drm_crtc *crtc = output->crtc; - struct wlr_drm_plane *plane = crtc->primary; + struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; + struct wlr_drm_plane *plane = conn->crtc->primary; + wlr_drm_plane_make_current(conn->renderer, plane); glReadPixels(0, 0, plane->width, plane->height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, out_data); } @@ -846,6 +846,7 @@ static void page_flip_handler(int fd, unsigned seq, if (drm->session->active) { wl_signal_emit(&conn->output.events.frame, &conn->output); + wl_signal_emit(&conn->output.events.post_frame, &conn->output); } } diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 509e1bcb..a7ad2dbd 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -37,6 +37,7 @@ struct wlr_output { struct { struct wl_signal frame; + struct wl_signal post_frame; struct wl_signal resolution; struct wl_signal destroy; } events; diff --git a/types/wlr_output.c b/types/wlr_output.c index abad1aec..e0220e6b 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -105,6 +105,7 @@ void wlr_output_init(struct wlr_output *output, output->transform = WL_OUTPUT_TRANSFORM_NORMAL; output->scale = 1; wl_signal_init(&output->events.frame); + wl_signal_init(&output->events.post_frame); wl_signal_init(&output->events.resolution); wl_signal_init(&output->events.destroy); } diff --git a/types/wlr_screenshooter.c b/types/wlr_screenshooter.c index 43e5fcd9..5f20925c 100644 --- a/types/wlr_screenshooter.c +++ b/types/wlr_screenshooter.c @@ -59,7 +59,7 @@ static void screenshooter_shoot(struct wl_client *client, state->output = output; state->screenshot = screenshot; state->frame_listener.notify = output_frame_notify; - wl_signal_add(&output->events.frame, &state->frame_listener); + wl_signal_add(&output->events.post_frame, &state->frame_listener); } static struct orbital_screenshooter_interface screenshooter_impl = { -- cgit v1.2.3 From d4cc82f11a4917328366926083a703d85e50ddd6 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 7 Oct 2017 12:01:21 +0200 Subject: Call glReadPixels right before swapping buffers --- backend/drm/drm.c | 10 ---------- examples/screenshot.c | 2 +- include/wlr/interfaces/wlr_output.h | 1 - include/wlr/types/wlr_output.h | 2 +- types/wlr_output.c | 12 ++++++++---- types/wlr_screenshooter.c | 2 +- 6 files changed, 11 insertions(+), 18 deletions(-) (limited to 'include/wlr') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index d08fa7f4..9e5346a1 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -634,14 +634,6 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output, return drm->iface->crtc_move_cursor(drm, conn->crtc, x, y); } -static void wlr_drm_connector_read_pixels(struct wlr_output *output, - void *out_data) { - int width, height; - wlr_output_effective_resolution(output, &width, &height); - wlr_drm_connector_make_current(output); - glReadPixels(0, 0, width, height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, out_data); -} - static void wlr_drm_connector_destroy(struct wlr_output *output) { struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; wlr_drm_connector_cleanup(conn); @@ -660,7 +652,6 @@ static struct wlr_output_impl output_impl = { .swap_buffers = wlr_drm_connector_swap_buffers, .set_gamma = wlr_drm_connector_set_gamma, .get_gamma_size = wlr_drm_connector_get_gamma_size, - .read_pixels = wlr_drm_connector_read_pixels, }; static int retry_pageflip(void *data) { @@ -845,7 +836,6 @@ static void page_flip_handler(int fd, unsigned seq, if (drm->session->active) { wl_signal_emit(&conn->output.events.frame, &conn->output); - wl_signal_emit(&conn->output.events.post_frame, &conn->output); } } diff --git a/examples/screenshot.c b/examples/screenshot.c index 0f1f1efe..f70b9b56 100644 --- a/examples/screenshot.c +++ b/examples/screenshot.c @@ -204,7 +204,7 @@ write_png(int width, int height) } surface = cairo_image_surface_create_for_data(data, - CAIRO_FORMAT_ARGB32, + CAIRO_FORMAT_RGB24, width, height, buffer_stride); cairo_surface_write_to_png(surface, "wayland-screenshot.png"); cairo_surface_destroy(surface); diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index 2fd306d7..7d2821e0 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -19,7 +19,6 @@ struct wlr_output_impl { void (*set_gamma)(struct wlr_output *output, uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); uint16_t (*get_gamma_size)(struct wlr_output *output); - void (*read_pixels)(struct wlr_output *_output, void *out_data); }; void wlr_output_init(struct wlr_output *output, const struct wlr_output_impl *impl); diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index a7ad2dbd..7fab1cf6 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -37,7 +37,7 @@ struct wlr_output { struct { struct wl_signal frame; - struct wl_signal post_frame; + struct wl_signal swap_buffers; struct wl_signal resolution; struct wl_signal destroy; } events; diff --git a/types/wlr_output.c b/types/wlr_output.c index e0220e6b..85357d2a 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -105,7 +106,7 @@ void wlr_output_init(struct wlr_output *output, output->transform = WL_OUTPUT_TRANSFORM_NORMAL; output->scale = 1; wl_signal_init(&output->events.frame); - wl_signal_init(&output->events.post_frame); + wl_signal_init(&output->events.swap_buffers); wl_signal_init(&output->events.resolution); wl_signal_init(&output->events.destroy); } @@ -232,6 +233,8 @@ void wlr_output_swap_buffers(struct wlr_output *output) { wlr_render_with_matrix(output->cursor.renderer, output->cursor.texture, &matrix); } + wl_signal_emit(&output->events.swap_buffers, &output); + output->impl->swap_buffers(output); } @@ -250,7 +253,8 @@ uint16_t wlr_output_get_gamma_size(struct wlr_output *output) { } void wlr_output_read_pixels(struct wlr_output *output, void *out_data) { - if (output->impl->read_pixels) { - output->impl->read_pixels(output, out_data); - } + // TODO: is wlr_output_make_current required? + wlr_output_make_current(output); + glReadPixels(0, 0, output->width, output->height, GL_BGRA_EXT, + GL_UNSIGNED_BYTE, out_data); } diff --git a/types/wlr_screenshooter.c b/types/wlr_screenshooter.c index 5f20925c..48db62c0 100644 --- a/types/wlr_screenshooter.c +++ b/types/wlr_screenshooter.c @@ -59,7 +59,7 @@ static void screenshooter_shoot(struct wl_client *client, state->output = output; state->screenshot = screenshot; state->frame_listener.notify = output_frame_notify; - wl_signal_add(&output->events.post_frame, &state->frame_listener); + wl_signal_add(&output->events.swap_buffers, &state->frame_listener); } static struct orbital_screenshooter_interface screenshooter_impl = { -- cgit v1.2.3 From a87f0160174487a1bbb1280597b73d36755542de Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 7 Oct 2017 19:01:11 +0200 Subject: Remove cairo dependency, write raw pixels --- examples/meson.build | 2 +- examples/screenshot.c | 24 +++++++++++++++++------- include/wlr/types/wlr_output.h | 4 ++++ types/wlr_output.c | 17 +++++++++++++---- 4 files changed, 35 insertions(+), 12 deletions(-) (limited to 'include/wlr') diff --git a/examples/meson.build b/examples/meson.build index 292ab053..a29a3310 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -26,5 +26,5 @@ executable( executable( 'screenshot', 'screenshot.c', - dependencies: [wayland_client, wlr_protos, dependency('cairo')], + dependencies: [wayland_client, wlr_protos], ) diff --git a/examples/screenshot.c b/examples/screenshot.c index f70b9b56..253638c9 100644 --- a/examples/screenshot.c +++ b/examples/screenshot.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include "../backend/wayland/os-compatibility.c" @@ -174,11 +173,20 @@ create_shm_buffer(int width, int height, void **data_out) return buffer; } +static void argb_to_rgba(uint32_t *data, size_t height, size_t stride) { + size_t n = height*stride/4; + for (size_t i = 0; i < n; ++i) { + uint32_t v = data[i]; + uint32_t rgb = v & 0x00ffffff; + uint32_t a = (v & 0xff000000) >> 24; + data[i] = (rgb << 8) | a; + } +} + static void write_png(int width, int height) { int output_stride, buffer_stride, i; - cairo_surface_t *surface; void *data, *d, *s; struct screenshooter_output *output, *next; @@ -203,11 +211,13 @@ write_png(int width, int height) free(output); } - surface = cairo_image_surface_create_for_data(data, - CAIRO_FORMAT_RGB24, - width, height, buffer_stride); - cairo_surface_write_to_png(surface, "wayland-screenshot.png"); - cairo_surface_destroy(surface); + argb_to_rgba(data, height, buffer_stride); + + // TODO: call convert + FILE *f = fopen("wayland-screenshot", "w"); + fwrite(data, buffer_stride * height, 1, f); + fclose(f); + free(data); } diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 7fab1cf6..ab3be5c7 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -71,6 +71,10 @@ void wlr_output_swap_buffers(struct wlr_output *output); void wlr_output_set_gamma(struct wlr_output *output, uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); uint16_t wlr_output_get_gamma_size(struct wlr_output *output); + +/** + * Reads all pixels from the output and stores them as ARGB. + */ void wlr_output_read_pixels(struct wlr_output *output, void *out_data); #endif diff --git a/types/wlr_output.c b/types/wlr_output.c index 85357d2a..1db63151 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -252,9 +251,19 @@ uint16_t wlr_output_get_gamma_size(struct wlr_output *output) { return output->impl->get_gamma_size(output); } +static void rgba_to_argb(uint32_t *data, size_t height, size_t stride) { + size_t n = height*stride/4; + for (size_t i = 0; i < n; ++i) { + uint32_t v = data[i]; + uint32_t rgb = (v & 0xffffff00) >> 8; + uint32_t a = v & 0x000000ff; + data[i] = rgb | (a << 24); + } +} + void wlr_output_read_pixels(struct wlr_output *output, void *out_data) { - // TODO: is wlr_output_make_current required? wlr_output_make_current(output); - glReadPixels(0, 0, output->width, output->height, GL_BGRA_EXT, - GL_UNSIGNED_BYTE, out_data); + glReadPixels(0, 0, output->width, output->height, GL_RGBA, GL_UNSIGNED_BYTE, + out_data); + rgba_to_argb(out_data, output->height, output->width*4); } -- cgit v1.2.3 From 0ce313530446b801302850f03c4a8d8c20cfd782 Mon Sep 17 00:00:00 2001 From: emersion Date: Sun, 8 Oct 2017 02:11:56 +0200 Subject: Move read_pixels from output to renderer --- include/wlr/render.h | 15 ++++++++++----- include/wlr/render/interface.h | 2 ++ include/wlr/types/wlr_output.h | 5 ----- include/wlr/types/wlr_screenshooter.h | 9 +++++++-- render/gles2/renderer.c | 19 ++++++++++++++++++- render/wlr_renderer.c | 5 +++++ rootston/desktop.c | 3 ++- types/wlr_output.c | 17 ----------------- types/wlr_screenshooter.c | 25 ++++++++++++++++++++----- 9 files changed, 64 insertions(+), 36 deletions(-) (limited to 'include/wlr') diff --git a/include/wlr/render.h b/include/wlr/render.h index 2fbfb476..5027064d 100644 --- a/include/wlr/render.h +++ b/include/wlr/render.h @@ -30,27 +30,32 @@ struct wlr_texture *wlr_render_texture_create(struct wlr_renderer *r); * This will render the texture at <123, 321>. */ bool wlr_render_with_matrix(struct wlr_renderer *r, - struct wlr_texture *texture, const float (*matrix)[16]); + struct wlr_texture *texture, const float (*matrix)[16]); /** * Renders a solid quad in the specified color. */ void wlr_render_colored_quad(struct wlr_renderer *r, - const float (*color)[4], const float (*matrix)[16]); + const float (*color)[4], const float (*matrix)[16]); /** * Renders a solid ellipse in the specified color. */ void wlr_render_colored_ellipse(struct wlr_renderer *r, - const float (*color)[4], const float (*matrix)[16]); + const float (*color)[4], const float (*matrix)[16]); /** * Returns a list of pixel formats supported by this renderer. */ const enum wl_shm_format *wlr_renderer_get_formats( - struct wlr_renderer *r, size_t *len); + struct wlr_renderer *r, size_t *len); /** * Returns true if this wl_buffer is a DRM buffer. */ bool wlr_renderer_buffer_is_drm(struct wlr_renderer *renderer, - struct wl_resource *buffer); + struct wl_resource *buffer); +/** + * Reads pixels and stores them in out_data as ARGB8888. + */ +void wlr_renderer_read_pixels(struct wlr_renderer *r, int x, int y, + int width, int height, void *out_data); /** * Destroys this wlr_renderer. Textures must be destroyed separately. */ diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index cbe33822..bbc5acb4 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -28,6 +28,8 @@ struct wlr_renderer_impl { struct wlr_renderer *renderer, size_t *len); bool (*buffer_is_drm)(struct wlr_renderer *renderer, struct wl_resource *buffer); + void (*read_pixels)(struct wlr_renderer *renderer, int x, int y, int width, + int height, void *out_data); void (*destroy)(struct wlr_renderer *renderer); }; diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index ab3be5c7..52d377e3 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -72,9 +72,4 @@ void wlr_output_set_gamma(struct wlr_output *output, uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); uint16_t wlr_output_get_gamma_size(struct wlr_output *output); -/** - * Reads all pixels from the output and stores them as ARGB. - */ -void wlr_output_read_pixels(struct wlr_output *output, void *out_data); - #endif diff --git a/include/wlr/types/wlr_screenshooter.h b/include/wlr/types/wlr_screenshooter.h index 5d1a9254..4bda3d3c 100644 --- a/include/wlr/types/wlr_screenshooter.h +++ b/include/wlr/types/wlr_screenshooter.h @@ -4,18 +4,23 @@ struct wlr_screenshooter { struct wl_global *wl_global; + struct wlr_renderer *renderer; void *data; }; struct wlr_screenshot { struct wl_resource *resource; - struct wl_resource *output; + struct wl_resource *output_resource; + + struct wlr_output *output; + struct wlr_screenshooter *screenshooter; void* data; }; -struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display); +struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display, + struct wlr_renderer *renderer); void wlr_screenshooter_destroy(struct wlr_screenshooter *screenshooter); #endif diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index d6c22ebe..9a013338 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -226,7 +226,23 @@ static bool wlr_gles2_buffer_is_drm(struct wlr_renderer *_renderer, (struct wlr_gles2_renderer *)_renderer; EGLint format; return wlr_egl_query_buffer(renderer->egl, buffer, - EGL_TEXTURE_FORMAT, &format); + EGL_TEXTURE_FORMAT, &format); +} + +static void rgba_to_argb(uint32_t *data, size_t height, size_t stride) { + size_t n = height*stride/4; + for (size_t i = 0; i < n; ++i) { + uint32_t v = data[i]; + uint32_t rgb = (v & 0xffffff00) >> 8; + uint32_t a = v & 0x000000ff; + data[i] = rgb | (a << 24); + } +} + +static void wlr_gles2_read_pixels(struct wlr_renderer *renderer, int x, int y, + int width, int height, void *out_data) { + glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, out_data); + rgba_to_argb(out_data, height, width*4); } static struct wlr_renderer_impl wlr_renderer_impl = { @@ -238,6 +254,7 @@ static struct wlr_renderer_impl wlr_renderer_impl = { .render_ellipse = wlr_gles2_render_ellipse, .formats = wlr_gles2_formats, .buffer_is_drm = wlr_gles2_buffer_is_drm, + .read_pixels = wlr_gles2_read_pixels, }; struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend) { diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index fec5e38a..ef0c31be 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -51,3 +51,8 @@ bool wlr_renderer_buffer_is_drm(struct wlr_renderer *r, struct wl_resource *buffer) { return r->impl->buffer_is_drm(r, buffer); } + +void wlr_renderer_read_pixels(struct wlr_renderer *r, int x, int y, + int width, int height, void *out_data) { + r->impl->read_pixels(r, x, y, width, height, out_data); +} diff --git a/rootston/desktop.c b/rootston/desktop.c index 65333e77..c10cd641 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -182,7 +182,8 @@ struct roots_desktop *desktop_create(struct roots_server *server, desktop->gamma_control_manager = wlr_gamma_control_manager_create( server->wl_display); - desktop->screenshooter = wlr_screenshooter_create(server->wl_display); + desktop->screenshooter = wlr_screenshooter_create(server->wl_display, + server->renderer); return desktop; } diff --git a/types/wlr_output.c b/types/wlr_output.c index 1db63151..64f67f2d 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -250,20 +250,3 @@ uint16_t wlr_output_get_gamma_size(struct wlr_output *output) { } return output->impl->get_gamma_size(output); } - -static void rgba_to_argb(uint32_t *data, size_t height, size_t stride) { - size_t n = height*stride/4; - for (size_t i = 0; i < n; ++i) { - uint32_t v = data[i]; - uint32_t rgb = (v & 0xffffff00) >> 8; - uint32_t a = v & 0x000000ff; - data[i] = rgb | (a << 24); - } -} - -void wlr_output_read_pixels(struct wlr_output *output, void *out_data) { - wlr_output_make_current(output); - glReadPixels(0, 0, output->width, output->height, GL_RGBA, GL_UNSIGNED_BYTE, - out_data); - rgba_to_argb(out_data, output->height, output->width*4); -} diff --git a/types/wlr_screenshooter.c b/types/wlr_screenshooter.c index ddcaf52b..38204aa1 100644 --- a/types/wlr_screenshooter.c +++ b/types/wlr_screenshooter.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -21,7 +22,6 @@ struct screenshot_state { int32_t width, height, stride; uint8_t *pixels; struct wl_shm_buffer *shm_buffer; - struct wlr_output *output; struct wlr_screenshot *screenshot; struct wl_listener frame_listener; }; @@ -29,8 +29,12 @@ struct screenshot_state { static void output_frame_notify(struct wl_listener *listener, void *_data) { struct screenshot_state *state = wl_container_of(listener, state, frame_listener); + struct wlr_renderer *renderer = state->screenshot->screenshooter->renderer; + struct wlr_output *output = state->screenshot->output; - wlr_output_read_pixels(state->output, state->pixels); + wlr_output_make_current(output); + wlr_renderer_read_pixels(renderer, 0, 0, output->width, output->height, + state->pixels); void *data = wl_shm_buffer_get_data(state->shm_buffer); wl_shm_buffer_begin_access(state->shm_buffer); @@ -49,6 +53,8 @@ static void output_frame_notify(struct wl_listener *listener, void *_data) { static void screenshooter_shoot(struct wl_client *client, struct wl_resource *_screenshooter, uint32_t id, struct wl_resource *_output, struct wl_resource *_buffer) { + struct wlr_screenshooter *screenshooter = + wl_resource_get_user_data(_screenshooter); struct wlr_output *output = wl_resource_get_user_data(_output); if (!wl_shm_buffer_get(_buffer)) { wlr_log(L_ERROR, "Invalid buffer: not a shared memory buffer"); @@ -81,7 +87,9 @@ static void screenshooter_shoot(struct wl_client *client, wl_client_post_no_memory(client); return; } - screenshot->output = _output; + screenshot->output_resource = _output; + screenshot->output = output; + screenshot->screenshooter = screenshooter; screenshot->resource = wl_resource_create(client, &orbital_screenshot_interface, wl_resource_get_version(_screenshooter), id); @@ -91,12 +99,15 @@ static void screenshooter_shoot(struct wl_client *client, NULL); struct screenshot_state *state = calloc(1, sizeof(struct screenshot_state)); + if (!state) { + wl_client_post_no_memory(client); + return; + } state->width = width; state->height = height; state->stride = stride; state->pixels = pixels; state->shm_buffer = shm_buffer; - state->output = output; state->screenshot = screenshot; state->frame_listener.notify = output_frame_notify; wl_signal_add(&output->events.swap_buffers, &state->frame_listener); @@ -122,12 +133,15 @@ static void screenshooter_bind(struct wl_client *wl_client, screenshooter, NULL); } -struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display) { +struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display, + struct wlr_renderer *renderer) { struct wlr_screenshooter *screenshooter = calloc(1, sizeof(struct wlr_screenshooter)); if (!screenshooter) { return NULL; } + screenshooter->renderer = renderer; + struct wl_global *wl_global = wl_global_create(display, &orbital_screenshooter_interface, 1, screenshooter, screenshooter_bind); if (!wl_global) { @@ -135,6 +149,7 @@ struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display) { return NULL; } screenshooter->wl_global = wl_global; + return screenshooter; } -- cgit v1.2.3