From 50498e109732cc81e0024c226f8f90271f655c1f Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Wed, 19 Jun 2019 17:51:45 -0400 Subject: [PATCH] Replaced screenshooter with screencopy --- include/waybox/server.h | 2 +- protocol/meson.build | 6 +- protocol/screenshooter.xml | 16 --- protocol/wlr-screencopy-unstable-v1.xml | 179 ++++++++++++++++++++++++ waybox/server.c | 2 +- 5 files changed, 184 insertions(+), 21 deletions(-) delete mode 100644 protocol/screenshooter.xml create mode 100644 protocol/wlr-screencopy-unstable-v1.xml diff --git a/include/waybox/server.h b/include/waybox/server.h index 9adf4a8..6d1af7b 100644 --- a/include/waybox/server.h +++ b/include/waybox/server.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/protocol/meson.build b/protocol/meson.build index 004cd76..7e0ee12 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -28,7 +28,7 @@ protocols = [ 'gamma-control.xml', 'gtk-primary-selection.xml', 'idle.xml', - 'screenshooter.xml', + 'wlr-screencopy-unstable-v1.xml', 'server-decoration.xml', 'wlr-layer-shell-unstable-v1.xml', ] @@ -38,7 +38,7 @@ client_protocols = [ [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], 'idle.xml', - 'screenshooter.xml', + 'wlr-screencopy-unstable-v1.xml', 'wlr-layer-shell-unstable-v1.xml', ] @@ -62,4 +62,4 @@ lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers, wlr_protos = declare_dependency( link_with: lib_wl_protos, sources: wl_protos_headers, -) \ No newline at end of file +) diff --git a/protocol/screenshooter.xml b/protocol/screenshooter.xml deleted file mode 100644 index fc48eac..0000000 --- a/protocol/screenshooter.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/protocol/wlr-screencopy-unstable-v1.xml b/protocol/wlr-screencopy-unstable-v1.xml new file mode 100644 index 0000000..a7a2d17 --- /dev/null +++ b/protocol/wlr-screencopy-unstable-v1.xml @@ -0,0 +1,179 @@ + + + + Copyright © 2018 Simon Ser + + 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. + + + + 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. + + + + + This object is a manager which offers requests to start capturing from a + source. + + + + + Capture the next frame of an entire output. + + + + + + + + + Capture the next frame of an output's region. + + The region is given in output logical coordinates, see + xdg_output.logical_size. The region will be clipped to the output's + extents. + + + + + + + + + + + + + All objects created by the manager will still remain valid, until their + appropriate destroy request has been called. + + + + + + + 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 send a "flags" followed by 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. + + + + + Provides information about the frame's buffer. This event is sent once + as soon as the frame is created. + + The client should then create a buffer with the provided attributes, and + send a "copy" request. + + + + + + + + + + Copy the frame to the supplied buffer. The buffer must have a the + correct size, see zwlr_screencopy_frame_v1.buffer. The buffer needs to + have a supported format. + + If the frame is successfully copied, a "flags" and a "ready" events are + sent. Otherwise, a "failed" event is sent. + + + + + + + + + + + + + + + + Provides flags about the frame. This event is sent once before the + "ready" event. + + + + + + + Called as soon as the frame is copied, indicating it is available + for reading. This event includes the time at which presentation happened + at. + + 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. + + After receiving this event, the client should destroy the object. + + + + + + Destroys the frame. This request can be sent at any time by the client. + + + + diff --git a/waybox/server.c b/waybox/server.c index 17f23ad..fabe277 100644 --- a/waybox/server.c +++ b/waybox/server.c @@ -59,7 +59,7 @@ bool start_wb(struct wb_server* server) { } wlr_gamma_control_manager_create(server->wl_display); - wlr_screenshooter_create(server->wl_display); + wlr_screencopy_manager_v1_create(server->wl_display); wlr_gtk_primary_selection_device_manager_create(server->wl_display); wlr_idle_create(server->wl_display);