diff --git a/examples/screencopy.c b/examples/screencopy.c
index 98df09b5..8b064a15 100644
--- a/examples/screencopy.c
+++ b/examples/screencopy.c
@@ -113,7 +113,8 @@ static void frame_handle_buffer(void *data,
}
static void frame_handle_ready(void *data,
- struct zwlr_screencopy_frame_v1 *frame) {
+ struct zwlr_screencopy_frame_v1 *frame, uint32_t tv_sec_hi,
+ uint32_t tv_sec_lo, uint32_t tv_nsec) {
buffer_copy_done = true;
}
@@ -217,7 +218,7 @@ int main(int argc, char *argv[]) {
}
struct zwlr_screencopy_frame_v1 *frame =
- zwlr_screencopy_manager_v1_capture_output(screencopy_manager, output);
+ zwlr_screencopy_manager_v1_capture_output(screencopy_manager, 0, output);
zwlr_screencopy_frame_v1_add_listener(frame, &frame_listener, NULL);
while (!buffer_copy_done) {
diff --git a/protocol/wlr-screencopy-unstable-v1.xml b/protocol/wlr-screencopy-unstable-v1.xml
index 6bd5a75f..52f3385e 100644
--- a/protocol/wlr-screencopy-unstable-v1.xml
+++ b/protocol/wlr-screencopy-unstable-v1.xml
@@ -26,6 +26,15 @@
This protocol allows clients to ask the compositor to copy part of the
screen content to a client buffer.
+
+ Warning! The protocol described in this file is experimental and
+ backward incompatible changes may be made. Backward compatible changes
+ may be added together with the corresponding interface version bump.
+ Backward incompatible changes are done by bumping the version number in
+ the protocol and interface names and resetting the interface version.
+ Once the protocol is to be declared stable, the 'z' prefix and the
+ version number in the protocol and interface names are removed and the
+ interface version number is reset.
@@ -36,9 +45,11 @@
- Request to start capturing from the given output.
+ Capture the next frame of a an entire output.
+
@@ -52,8 +63,17 @@
- This object represents a frame which is ready to have its resources
- fetched and used.
+ This object represents a single frame.
+
+ When created, a "buffer" event will be sent. The client will then be able
+ to send a "copy" request. If the capture is successful, the compositor
+ will finally a "ready" event.
+
+ If the capture failed, the "failed" event is sent. This can happen anytime
+ before the "ready" event.
+
+ Once either a "ready" or a "failed" event is received, the client should
+ destroy the frame.
@@ -99,23 +119,37 @@
Called as soon as the frame is copied, indicating it is available
- for reading.
+ for reading. This event includes the time at which presentation happened
+ at.
- Upon receiving this event, the client should destroy the object.
+ The timestamp is expressed as tv_sec_hi, tv_sec_lo, tv_nsec triples,
+ each component being an unsigned 32-bit value. Whole seconds are in
+ tv_sec which is a 64-bit value combined from tv_sec_hi and tv_sec_lo,
+ and the additional fractional part in tv_nsec as nanoseconds. Hence,
+ for valid timestamps tv_nsec must be in [0, 999999999]. The seconds part
+ may have an arbitrary offset at start.
+
+ After receiving this event, the client should destroy the object.
+
+
+
This event indicates that the attempted frame copy has failed.
- Upon receiving this event, the client should destroy the object.
+ After receiving this event, the client should destroy the object.
- Destroys the frame.
+ Destroys the frame. This request can be sent at any time by the client.
diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c
index 197ba330..6b6472e1 100644
--- a/types/wlr_screencopy_v1.c
+++ b/types/wlr_screencopy_v1.c
@@ -21,6 +21,7 @@ static void frame_handle_output_swap_buffers(struct wl_listener *listener,
void *_data) {
struct wlr_screencopy_frame_v1 *frame =
wl_container_of(listener, frame, output_swap_buffers);
+ struct wlr_output_event_swap_buffers *event = _data;
struct wlr_output *output = frame->output;
struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend);
@@ -51,7 +52,10 @@ static void frame_handle_output_swap_buffers(struct wl_listener *listener,
return;
}
- zwlr_screencopy_frame_v1_send_ready(frame->resource);
+ uint32_t tv_sec_hi = event->when->tv_sec >> 32;
+ uint32_t tv_sec_lo = event->when->tv_sec & 0xFFFFFFFF;
+ zwlr_screencopy_frame_v1_send_ready(frame->resource,
+ tv_sec_hi, tv_sec_lo, event->when->tv_nsec);
// TODO: make frame resource inert
}
@@ -134,7 +138,7 @@ static struct wlr_screencopy_manager_v1 *manager_from_resource(
static void manager_handle_capture_output(struct wl_client *client,
struct wl_resource *manager_resource, uint32_t id,
- struct wl_resource *output_resource) {
+ int32_t overlay_cursor, struct wl_resource *output_resource) {
struct wlr_screencopy_manager_v1 *manager =
manager_from_resource(manager_resource);
struct wlr_output *output = wlr_output_from_resource(output_resource);