Commit 3df602a62da5024bfa4e68f87355f789632973a1 - wlroots

export-dmabuf: disable hardware cursors if desired Also make the frame resource inert when sending "ready". emersion 5 years ago

3 changed file(s) with 29 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all

-1

examples/dmabuf-capture.c less more

44	44
45	45	/* Target */
46	46	struct wl_output *target_output;
	47	bool with_cursor;
47	48
48	49	/* Main frame callback */
49	50	struct zwlr_export_dmabuf_frame_v1 *frame_callback;

453	454
454	455	static void register_cb(struct capture_context *ctx) {
455	456	ctx->frame_callback = zwlr_export_dmabuf_manager_v1_capture_output(
456		ctx->export_manager, 0, ctx->target_output);
	457	ctx->export_manager, ctx->with_cursor, ctx->target_output);
457	458
458	459	zwlr_export_dmabuf_frame_v1_add_listener(ctx->frame_callback,
459	460	&frame_listener, ctx);

801	802	}
802	803
803	804	ctx.target_output = o->output;
	805	ctx.with_cursor = true;
804	806	ctx.hw_device_type = av_hwdevice_find_type_by_name(argv[2]);
805	807	ctx.hardware_device = argv[3];
806	808

-0

include/wlr/types/wlr_export_dmabuf_v1.h less more

8	8	#ifndef WLR_TYPES_WLR_EXPORT_DMABUF_V1_H
9	9	#define WLR_TYPES_WLR_EXPORT_DMABUF_V1_H
10	10
	11	#include <stdbool.h>
11	12	#include <wayland-server.h>
12	13	#include <wlr/render/dmabuf.h>
13	14

20	21
21	22	struct wlr_dmabuf_attributes attribs;
22	23	struct wlr_output *output;
	24
	25	bool cursor_locked;
23	26
24	27	struct wl_listener output_swap_buffers;
25	28	};

+23

-3

types/wlr_export_dmabuf_v1.c less more

28	28	.destroy = frame_handle_destroy,
29	29	};
30	30
31		static void frame_handle_resource_destroy(struct wl_resource *resource) {
32		struct wlr_export_dmabuf_frame_v1 *frame = frame_from_resource(resource);
	31	static void frame_destroy(struct wlr_export_dmabuf_frame_v1 *frame) {
	32	if (frame == NULL) {
	33	return;
	34	}
	35	if (frame->cursor_locked) {
	36	wlr_output_lock_software_cursors(frame->output, false);
	37	}
33	38	wl_list_remove(&frame->link);
34	39	wl_list_remove(&frame->output_swap_buffers.link);
35	40	wlr_dmabuf_attributes_finish(&frame->attribs);
	41	// Make the frame resource inert
	42	wl_resource_set_user_data(frame->resource, NULL);
36	43	free(frame);
	44	}
	45
	46	static void frame_handle_resource_destroy(struct wl_resource *resource) {
	47	struct wlr_export_dmabuf_frame_v1 *frame = frame_from_resource(resource);
	48	frame_destroy(frame);
37	49	}
38	50
39	51	static void frame_output_handle_swap_buffers(struct wl_listener *listener,

50	62	uint32_t tv_sec_lo = tv_sec & 0xFFFFFFFF;
51	63	zwlr_export_dmabuf_frame_v1_send_ready(frame->resource,
52	64	tv_sec_hi, tv_sec_lo, event->when->tv_nsec);
	65	frame_destroy(frame);
53	66	}
54	67
55	68

95	108	if (!output->impl->export_dmabuf) {
96	109	zwlr_export_dmabuf_frame_v1_send_cancel(frame->resource,
97	110	ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERMANENT);
	111	frame_destroy(frame);
98	112	return;
99	113	}
100	114

102	116	if (!wlr_output_export_dmabuf(output, attribs)) {
103	117	zwlr_export_dmabuf_frame_v1_send_cancel(frame->resource,
104	118	ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_TEMPORARY);
105		return;
	119	frame_destroy(frame);
	120	return;
	121	}
	122
	123	if (overlay_cursor) {
	124	wlr_output_lock_software_cursors(frame->output, true);
	125	frame->cursor_locked = true;
106	126	}
107	127
108	128	uint32_t frame_flags = ZWLR_EXPORT_DMABUF_FRAME_V1_FLAGS_TRANSIENT;