Skip to content

Commit

Permalink
screencast: Implement restore token
Browse files Browse the repository at this point in the history
  • Loading branch information
@columbarius
columbarius committed Feb 20, 2023
1 parent a320d72 commit 8ec3184
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 5 deletions.
15 changes: 14 additions & 1 deletion include/screencast_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

// this seems to be right based on
// https://github.com/flatpak/xdg-desktop-portal/blob/309a1fc0cf2fb32cceb91dbc666d20cf0a3202c2/src/screen-cast.c#L955
#define XDP_CAST_PROTO_VER 3
#define XDP_CAST_PROTO_VER 4
#define XDP_CAST_DATA_VER 1

enum cursor_modes {
HIDDEN = 1,
Expand All @@ -24,6 +25,12 @@ enum source_types {
WINDOW = 2,
};

enum persist_modes {
PERSIST_NONE = 0,
PERSIST_TRANSIENT = 1,
PERSIST_PERMANENT = 2,
};

enum buffer_type {
WL_SHM = 0,
DMABUF = 1,
Expand Down Expand Up @@ -134,6 +141,11 @@ struct xdpw_screencast_target {
bool with_cursor;
};

struct xdpw_screencast_restore_data {
uint32_t version;
const char *output_name;
};

struct xdpw_screencast_instance {
// list
struct wl_list link;
Expand Down Expand Up @@ -174,6 +186,7 @@ struct xdpw_screencast_instance {
struct xdpw_screencast_session_data {
struct xdpw_screencast_instance *screencast_instance;
uint32_t cursor_mode;
uint32_t persist_mode;
};

struct xdpw_wlr_output {
Expand Down
2 changes: 2 additions & 0 deletions include/wlr_screencast.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ int xdpw_wlr_screencopy_init(struct xdpw_state *state);
void xdpw_wlr_screencopy_finish(struct xdpw_screencast_context *ctx);

bool xdpw_wlr_target_chooser(struct xdpw_screencast_context *ctx, struct xdpw_screencast_target *target);
bool xdpw_wlr_target_from_data(struct xdpw_screencast_context *ctx, struct xdpw_screencast_target *target,
struct xdpw_screencast_restore_data *data);

void xdpw_wlr_frame_finish(struct xdpw_screencast_instance *cast);
void xdpw_wlr_frame_start(struct xdpw_screencast_instance *cast);
Expand Down
123 changes: 119 additions & 4 deletions src/screencast/screencast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ void xdpw_screencast_instance_teardown(struct xdpw_screencast_instance *cast) {
}
}

bool setup_target(struct xdpw_screencast_context *ctx, struct xdpw_session *sess) {
bool setup_target(struct xdpw_screencast_context *ctx, struct xdpw_session *sess, struct xdpw_screencast_restore_data *data) {
bool target_initialized = false;

struct xdpw_wlr_output *output, *tmp_o;
wl_list_for_each_reverse_safe(output, tmp_o, &ctx->output_list, link) {
Expand All @@ -122,7 +123,15 @@ bool setup_target(struct xdpw_screencast_context *ctx, struct xdpw_session *sess
return false;
}
target->with_cursor = sess->screencast_data.cursor_mode == EMBEDDED;
if (!xdpw_wlr_target_chooser(ctx, target)) {
if (data) {
target_initialized = xdpw_wlr_target_from_data(ctx, target, data);
}
if (!target_initialized) {
target_initialized = xdpw_wlr_target_chooser(ctx, target);
//TODO: Chooser option to confirm the persist mode
sess->screencast_data.persist_mode = PERSIST_NONE;
}
if (!target_initialized) {
logprint(ERROR, "wlroots: no output found");
free(target);
return false;
Expand Down Expand Up @@ -309,9 +318,12 @@ static int method_screencast_select_sources(sd_bus_message *msg, void *data,

// default to embedded cursor mode if not specified
sess->screencast_data.cursor_mode = EMBEDDED;
// default to no persist if not specified
sess->screencast_data.persist_mode = PERSIST_NONE;

char *key;
int innerRet = 0;
struct xdpw_screencast_restore_data restore_data = {0};
while ((ret = sd_bus_message_enter_container(msg, 'e', "sv")) > 0) {
innerRet = sd_bus_message_read(msg, "s", &key);
if (innerRet < 0) {
Expand All @@ -337,6 +349,81 @@ static int method_screencast_select_sources(sd_bus_message *msg, void *data,
goto error;
}
logprint(INFO, "dbus: option cursor_mode:%x", sess->screencast_data.cursor_mode);
} else if (strcmp(key, "restore_data") == 0) {
logprint(INFO, "dbus: restore data available");
char *portal_vendor;
innerRet = sd_bus_message_enter_container(msg, 'v', "(suv)");
if (innerRet < 0) {
logprint(ERROR, "dbus: error entering variant");
return innerRet;
}
innerRet = sd_bus_message_enter_container(msg, 'r', "suv");
if (innerRet < 0) {
logprint(ERROR, "dbus: error entering struct");
return innerRet;
}
sd_bus_message_read(msg, "s", &portal_vendor);
if (strcmp(portal_vendor, "wlroots") != 0) {
logprint(INFO, "dbus: skipping restore_data from another vendor (%s)", portal_vendor);
sd_bus_message_skip(msg, "uv");
continue;
}
sd_bus_message_read(msg, "u", &restore_data.version);
if (restore_data.version == 1) {
innerRet = sd_bus_message_enter_container(msg, 'v', "a{sv}");
if (innerRet < 0) {
return innerRet;
}
innerRet = sd_bus_message_enter_container(msg, 'a', "{sv}");
if (innerRet < 0) {
return innerRet;
}
logprint(INFO, "dbus: restoring session from data");
int rdRet;
char *rdKey;
while ((innerRet = sd_bus_message_enter_container(msg, 'e', "sv")) > 0) {
rdRet = sd_bus_message_read(msg, "s", &rdKey);
if (rdRet < 0) {
return rdRet;
}
if (strcmp(rdKey, "output_name") == 0) {
sd_bus_message_read(msg, "v", "s", &restore_data.output_name);
logprint(INFO, "dbus: option restore_data.output_name: %s", restore_data.output_name);
} else {
logprint(WARN, "dbus: unknown option %s", rdKey);
sd_bus_message_skip(msg, "v");
}
innerRet = sd_bus_message_exit_container(msg); // dictionary
if (innerRet < 0) {
return innerRet;
}
}
if (innerRet < 0) {
return innerRet;
}
innerRet = sd_bus_message_exit_container(msg); //array
if (innerRet < 0) {
return innerRet;
}
innerRet = sd_bus_message_exit_container(msg); //variant
if (innerRet < 0) {
return innerRet;
}
} else {
sd_bus_message_skip(msg, "v");
logprint(ERROR, "Unknown restore_data version: %u", restore_data.version);
}
innerRet = sd_bus_message_exit_container(msg); // struct
if (innerRet < 0) {
return innerRet;
}
innerRet = sd_bus_message_exit_container(msg); // variant
if (innerRet < 0) {
return innerRet;
}
} else if (strcmp(key, "persist_mode") == 0) {
sd_bus_message_read(msg, "v", "u", &sess->screencast_data.persist_mode);
logprint(INFO, "dbus: option persist_mode:%u", sess->screencast_data.persist_mode);
} else {
logprint(WARN, "dbus: unknown option %s", key);
sd_bus_message_skip(msg, "v");
Expand All @@ -355,7 +442,7 @@ static int method_screencast_select_sources(sd_bus_message *msg, void *data,
return ret;
}

bool output_selection_canceled = !setup_target(ctx, sess);
bool output_selection_canceled = !setup_target(ctx, sess, restore_data.version > 0 ? &restore_data : NULL);

ret = sd_bus_message_new_method_return(msg, &reply);
if (ret < 0) {
Expand Down Expand Up @@ -476,13 +563,41 @@ static int method_screencast_start(sd_bus_message *msg, void *data,
}

logprint(DEBUG, "dbus: start: returning node %d", (int)cast->node_id);
ret = sd_bus_message_append(reply, "ua{sv}", PORTAL_RESPONSE_SUCCESS, 1,
ret = sd_bus_message_append(reply, "u", PORTAL_RESPONSE_SUCCESS);
if (ret < 0) {
return ret;
}
ret = sd_bus_message_open_container(reply, 'a', "{sv}");
if (ret < 0) {
return ret;
}
ret = sd_bus_message_append(reply, "{sv}",
"streams", "a(ua{sv})", 1,
cast->node_id, 3,
"position", "(ii)", 0, 0,
"size", "(ii)", cast->screencopy_frame_info[WL_SHM].width, cast->screencopy_frame_info[WL_SHM].height,
"source_type", "u", 1 << MONITOR);
if (ret < 0) {
return ret;
}
ret = sd_bus_message_append(reply, "{sv}",
"persist_mode", "u", sess->screencast_data.persist_mode);
if (ret < 0) {
return ret;
}
if (sess->screencast_data.persist_mode != PERSIST_NONE) {
struct xdpw_screencast_restore_data restore_data;
restore_data.output_name = cast->target->output->name;
ret = sd_bus_message_append(reply, "{sv}",
"restore_data", "(suv)",
"wlroots", XDP_CAST_DATA_VER,
"a{sv}", 1, "output_name", "s", restore_data.output_name);
if (ret < 0) {
return ret;
}
}

ret = sd_bus_message_close_container(reply);
if (ret < 0) {
return ret;
}
Expand Down
12 changes: 12 additions & 0 deletions src/screencast/wlr_screencast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,18 @@ bool xdpw_wlr_target_chooser(struct xdpw_screencast_context *ctx, struct xdpw_sc
return target->output != NULL;
}

bool xdpw_wlr_target_from_data(struct xdpw_screencast_context *ctx, struct xdpw_screencast_target *target,
struct xdpw_screencast_restore_data *data) {
struct xdpw_wlr_output *out = NULL;
out = xdpw_wlr_output_find_by_name(&ctx->output_list, data->output_name);

if (!out) {
return false;
}
target->output = out;
return true;
}

static void wlr_remove_output(struct xdpw_wlr_output *out) {
free(out->name);
free(out->make);
Expand Down

0 comments on commit 8ec3184

Please sign in to comment.