mirror of
https://github.com/wizbright/waybox.git
synced 2026-02-04 04:06:17 -05:00
Replaced the legacy wlr-screencopy-unstable-v1 with the official
Some checks failed
build / build (push) Has been cancelled
Some checks failed
build / build (push) Has been cancelled
ext-image-copy-capture-v1 and ext-image-capture-source-v1
This commit is contained in:
parent
fee25b89cd
commit
b0cd86a99e
4 changed files with 5 additions and 236 deletions
|
|
@ -13,11 +13,12 @@
|
||||||
#include <wlr/types/wlr_compositor.h>
|
#include <wlr/types/wlr_compositor.h>
|
||||||
#include <wlr/types/wlr_data_device.h>
|
#include <wlr/types/wlr_data_device.h>
|
||||||
#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
|
#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
|
||||||
|
#include <wlr/types/wlr_ext_image_capture_source_v1.h>
|
||||||
|
#include <wlr/types/wlr_ext_image_copy_capture_v1.h>
|
||||||
#include <wlr/types/wlr_gamma_control_v1.h>
|
#include <wlr/types/wlr_gamma_control_v1.h>
|
||||||
#include <wlr/types/wlr_idle_notify_v1.h>
|
#include <wlr/types/wlr_idle_notify_v1.h>
|
||||||
#include <wlr/types/wlr_output_layout.h>
|
#include <wlr/types/wlr_output_layout.h>
|
||||||
#include <wlr/types/wlr_scene.h>
|
#include <wlr/types/wlr_scene.h>
|
||||||
#include <wlr/types/wlr_screencopy_v1.h>
|
|
||||||
#include <wlr/types/wlr_subcompositor.h>
|
#include <wlr/types/wlr_subcompositor.h>
|
||||||
#include <wlr/types/wlr_xdg_output_v1.h>
|
#include <wlr/types/wlr_xdg_output_v1.h>
|
||||||
#include <wlr/types/wlr_xdg_shell.h>
|
#include <wlr/types/wlr_xdg_shell.h>
|
||||||
|
|
|
||||||
|
|
@ -24,19 +24,18 @@ wayland_scanner_client = generator(
|
||||||
protocols = [
|
protocols = [
|
||||||
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
|
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
|
||||||
[wl_protocol_dir, 'staging/ext-idle-notify/ext-idle-notify-v1.xml'],
|
[wl_protocol_dir, 'staging/ext-idle-notify/ext-idle-notify-v1.xml'],
|
||||||
|
[wl_protocol_dir, 'staging/ext-image-copy-capture/ext-image-copy-capture-v1.xml'],
|
||||||
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
||||||
[wl_protocol_dir, 'unstable/primary-selection/primary-selection-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/primary-selection/primary-selection-unstable-v1.xml'],
|
||||||
[wl_protocol_dir, 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml'],
|
||||||
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
|
||||||
'wlr-gamma-control-unstable-v1.xml',
|
'wlr-gamma-control-unstable-v1.xml',
|
||||||
'wlr-layer-shell-unstable-v1.xml',
|
'wlr-layer-shell-unstable-v1.xml',
|
||||||
'wlr-screencopy-unstable-v1.xml',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
client_protocols = [
|
client_protocols = [
|
||||||
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
|
||||||
'wlr-layer-shell-unstable-v1.xml',
|
'wlr-layer-shell-unstable-v1.xml',
|
||||||
'wlr-screencopy-unstable-v1.xml',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
wl_protos_src = []
|
wl_protos_src = []
|
||||||
|
|
|
||||||
|
|
@ -1,232 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<protocol name="wlr_screencopy_unstable_v1">
|
|
||||||
<copyright>
|
|
||||||
Copyright © 2018 Simon Ser
|
|
||||||
Copyright © 2019 Andri Yngvason
|
|
||||||
|
|
||||||
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.
|
|
||||||
</copyright>
|
|
||||||
|
|
||||||
<description summary="screen content capturing on client buffers">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<interface name="zwlr_screencopy_manager_v1" version="3">
|
|
||||||
<description summary="manager to inform clients and begin capturing">
|
|
||||||
This object is a manager which offers requests to start capturing from a
|
|
||||||
source.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<request name="capture_output">
|
|
||||||
<description summary="capture an output">
|
|
||||||
Capture the next frame of an entire output.
|
|
||||||
</description>
|
|
||||||
<arg name="frame" type="new_id" interface="zwlr_screencopy_frame_v1"/>
|
|
||||||
<arg name="overlay_cursor" type="int"
|
|
||||||
summary="composite cursor onto the frame"/>
|
|
||||||
<arg name="output" type="object" interface="wl_output"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="capture_output_region">
|
|
||||||
<description summary="capture an output's region">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="frame" type="new_id" interface="zwlr_screencopy_frame_v1"/>
|
|
||||||
<arg name="overlay_cursor" type="int"
|
|
||||||
summary="composite cursor onto the frame"/>
|
|
||||||
<arg name="output" type="object" interface="wl_output"/>
|
|
||||||
<arg name="x" type="int"/>
|
|
||||||
<arg name="y" type="int"/>
|
|
||||||
<arg name="width" type="int"/>
|
|
||||||
<arg name="height" type="int"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<request name="destroy" type="destructor">
|
|
||||||
<description summary="destroy the manager">
|
|
||||||
All objects created by the manager will still remain valid, until their
|
|
||||||
appropriate destroy request has been called.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
</interface>
|
|
||||||
|
|
||||||
<interface name="zwlr_screencopy_frame_v1" version="3">
|
|
||||||
<description summary="a frame ready for copy">
|
|
||||||
This object represents a single frame.
|
|
||||||
|
|
||||||
When created, a series of buffer events will be sent, each representing a
|
|
||||||
supported buffer type. The "buffer_done" event is sent afterwards to
|
|
||||||
indicate that all supported buffer types have been enumerated. 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.
|
|
||||||
|
|
||||||
For objects version 2 or lower, wl_shm buffers are always supported, ie.
|
|
||||||
the "buffer" event is guaranteed to be sent.
|
|
||||||
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<event name="buffer">
|
|
||||||
<description summary="wl_shm buffer information">
|
|
||||||
Provides information about wl_shm buffer parameters that need to be
|
|
||||||
used for this frame. This event is sent once after the frame is created
|
|
||||||
if wl_shm buffers are supported.
|
|
||||||
</description>
|
|
||||||
<arg name="format" type="uint" enum="wl_shm.format" summary="buffer format"/>
|
|
||||||
<arg name="width" type="uint" summary="buffer width"/>
|
|
||||||
<arg name="height" type="uint" summary="buffer height"/>
|
|
||||||
<arg name="stride" type="uint" summary="buffer stride"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<request name="copy">
|
|
||||||
<description summary="copy the frame">
|
|
||||||
Copy the frame to the supplied buffer. The buffer must have a the
|
|
||||||
correct size, see zwlr_screencopy_frame_v1.buffer and
|
|
||||||
zwlr_screencopy_frame_v1.linux_dmabuf. 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.
|
|
||||||
</description>
|
|
||||||
<arg name="buffer" type="object" interface="wl_buffer"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<enum name="error">
|
|
||||||
<entry name="already_used" value="0"
|
|
||||||
summary="the object has already been used to copy a wl_buffer"/>
|
|
||||||
<entry name="invalid_buffer" value="1"
|
|
||||||
summary="buffer attributes are invalid"/>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<enum name="flags" bitfield="true">
|
|
||||||
<entry name="y_invert" value="1" summary="contents are y-inverted"/>
|
|
||||||
</enum>
|
|
||||||
|
|
||||||
<event name="flags">
|
|
||||||
<description summary="frame flags">
|
|
||||||
Provides flags about the frame. This event is sent once before the
|
|
||||||
"ready" event.
|
|
||||||
</description>
|
|
||||||
<arg name="flags" type="uint" enum="flags" summary="frame flags"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="ready">
|
|
||||||
<description summary="indicates frame is available for reading">
|
|
||||||
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.
|
|
||||||
</description>
|
|
||||||
<arg name="tv_sec_hi" type="uint"
|
|
||||||
summary="high 32 bits of the seconds part of the timestamp"/>
|
|
||||||
<arg name="tv_sec_lo" type="uint"
|
|
||||||
summary="low 32 bits of the seconds part of the timestamp"/>
|
|
||||||
<arg name="tv_nsec" type="uint"
|
|
||||||
summary="nanoseconds part of the timestamp"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="failed">
|
|
||||||
<description summary="frame copy failed">
|
|
||||||
This event indicates that the attempted frame copy has failed.
|
|
||||||
|
|
||||||
After receiving this event, the client should destroy the object.
|
|
||||||
</description>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<request name="destroy" type="destructor">
|
|
||||||
<description summary="delete this object, used or not">
|
|
||||||
Destroys the frame. This request can be sent at any time by the client.
|
|
||||||
</description>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<!-- Version 2 additions -->
|
|
||||||
<request name="copy_with_damage" since="2">
|
|
||||||
<description summary="copy the frame when it's damaged">
|
|
||||||
Same as copy, except it waits until there is damage to copy.
|
|
||||||
</description>
|
|
||||||
<arg name="buffer" type="object" interface="wl_buffer"/>
|
|
||||||
</request>
|
|
||||||
|
|
||||||
<event name="damage" since="2">
|
|
||||||
<description summary="carries the coordinates of the damaged region">
|
|
||||||
This event is sent right before the ready event when copy_with_damage is
|
|
||||||
requested. It may be generated multiple times for each copy_with_damage
|
|
||||||
request.
|
|
||||||
|
|
||||||
The arguments describe a box around an area that has changed since the
|
|
||||||
last copy request that was derived from the current screencopy manager
|
|
||||||
instance.
|
|
||||||
|
|
||||||
The union of all regions received between the call to copy_with_damage
|
|
||||||
and a ready event is the total damage since the prior ready event.
|
|
||||||
</description>
|
|
||||||
<arg name="x" type="uint" summary="damaged x coordinates"/>
|
|
||||||
<arg name="y" type="uint" summary="damaged y coordinates"/>
|
|
||||||
<arg name="width" type="uint" summary="current width"/>
|
|
||||||
<arg name="height" type="uint" summary="current height"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<!-- Version 3 additions -->
|
|
||||||
<event name="linux_dmabuf" since="3">
|
|
||||||
<description summary="linux-dmabuf buffer information">
|
|
||||||
Provides information about linux-dmabuf buffer parameters that need to
|
|
||||||
be used for this frame. This event is sent once after the frame is
|
|
||||||
created if linux-dmabuf buffers are supported.
|
|
||||||
</description>
|
|
||||||
<arg name="format" type="uint" summary="fourcc pixel format"/>
|
|
||||||
<arg name="width" type="uint" summary="buffer width"/>
|
|
||||||
<arg name="height" type="uint" summary="buffer height"/>
|
|
||||||
</event>
|
|
||||||
|
|
||||||
<event name="buffer_done" since="3">
|
|
||||||
<description summary="all buffer types reported">
|
|
||||||
This event is sent once after all buffer events have been sent.
|
|
||||||
|
|
||||||
The client should proceed to create a buffer of one of the supported
|
|
||||||
types, and send a "copy" request.
|
|
||||||
</description>
|
|
||||||
</event>
|
|
||||||
</interface>
|
|
||||||
</protocol>
|
|
||||||
|
|
@ -108,7 +108,8 @@ bool wb_start_server(struct wb_server* server) {
|
||||||
server->gamma_control_set_gamma.notify = handle_gamma_control_set_gamma;
|
server->gamma_control_set_gamma.notify = handle_gamma_control_set_gamma;
|
||||||
wl_signal_add(&server->gamma_control_manager->events.set_gamma, &server->gamma_control_set_gamma);
|
wl_signal_add(&server->gamma_control_manager->events.set_gamma, &server->gamma_control_set_gamma);
|
||||||
|
|
||||||
wlr_screencopy_manager_v1_create(server->wl_display);
|
wlr_ext_image_copy_capture_manager_v1_create(server->wl_display, 1);
|
||||||
|
wlr_ext_output_image_capture_source_manager_v1_create(server->wl_display, 1);
|
||||||
create_idle_manager(server);
|
create_idle_manager(server);
|
||||||
|
|
||||||
wl_list_init(&server->toplevels);
|
wl_list_init(&server->toplevels);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue