hyprwm/xdg-desktop-portal-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/xdg-desktop-portal-hyprland.git synced 2024-11-22 06:35:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

screencast: restore window share by class

Browse source
This commit is contained in:
vaxerski 2023-05-25 16:54:02 +02:00
parent 4f0c5756c9
commit ca077cc05c
2 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/screencast_common.h
View file

@ -64,7 +64,7 @@ struct xdpw_frame {
uint64_t tv_sec; uint64_t tv_sec;
uint32_t tv_nsec; uint32_t tv_nsec;
struct xdpw_frame_damage damage[4]; struct xdpw_frame_damage damage[4];
uint32_t damage_count; uint32_t damage_count;
struct xdpw_buffer *xdpw_buffer; struct xdpw_buffer *xdpw_buffer;
struct pw_buffer *pw_buffer; struct pw_buffer *pw_buffer;
}; };
@ -164,6 +164,7 @@ struct xdpw_share {
struct xdph_restore_token { struct xdph_restore_token {
char *token; char *token;
char *outputPort; // NULL if not set char *outputPort; // NULL if not set
char *windowClass; // NULL if not set
uint64_t windowHandle; // 0 if not set uint64_t windowHandle; // 0 if not set
struct wl_list link; struct wl_list link;
bool withCursor; bool withCursor;

47
src/screencast/screencast.c
View file

@ -132,14 +132,26 @@ bool setup_outputs(struct xdpw_screencast_context *ctx, struct xdpw_session *ses
if (token) { if (token) {
// attempt to restore // attempt to restore
if (token->outputPort) { if (token->outputPort) {
struct xdpw_wlr_output *output; if (strncmp(token->outputPort, "class:", 6) == 0) {
wl_list_for_each(output, &ctx->output_list, link) { struct SToplevelEntry *current;
if (strcmp(output->name, token->outputPort) == 0) { wl_list_for_each(current, &ctx->toplevel_resource_list, link) {
out.output = output; if (strcmp(token->outputPort + 6, current->clazz) == 0) {
tokenSuccess = true; out.window_handle = token->windowHandle;
break; tokenSuccess = true;
break;
}
}
} else {
struct xdpw_wlr_output *output;
wl_list_for_each(output, &ctx->output_list, link) {
if (strcmp(output->name, token->outputPort) == 0) {
out.output = output;
tokenSuccess = true;
break;
}
} }
} }
} else if (token->windowHandle > 0) { } else if (token->windowHandle > 0) {
struct SToplevelEntry *current; struct SToplevelEntry *current;
wl_list_for_each(current, &ctx->toplevel_resource_list, link) { wl_list_for_each(current, &ctx->toplevel_resource_list, link) {
@ -249,6 +261,16 @@ static struct xdph_restore_token *getRestoreToken(char *sessionToken, struct xdp
restoreToken->token = uuid_str; restoreToken->token = uuid_str;
restoreToken->withCursor = withCursor; restoreToken->withCursor = withCursor;
if (windowSelected) {
struct SToplevelEntry *current;
wl_list_for_each(current, &state->screencast.toplevel_resource_list, link) {
if (current->handle == restoreToken->windowHandle) {
restoreToken->windowClass = getFormat("class:%x", current->clazz);
break;
}
}
}
return restoreToken; return restoreToken;
} }
@ -644,12 +666,13 @@ static int method_screencast_start(sd_bus_message *msg, void *data, sd_bus_error
logprint(DEBUG, "dbus: start: returning node %d", (int)cast->node_id); logprint(DEBUG, "dbus: start: returning node %d", (int)cast->node_id);
if (restoreToken) if (restoreToken)
ret = sd_bus_message_append(reply, "ua{sv}", PORTAL_RESPONSE_SUCCESS, 3, "streams", "a(ua{sv})", 1, cast->node_id, 3, "position", "(ii)", 0, ret = sd_bus_message_append(
0, "size", "(ii)", cast->screencopy_frame_info[WL_SHM].width, cast->screencopy_frame_info[WL_SHM].height, reply, "ua{sv}", PORTAL_RESPONSE_SUCCESS, 3, "streams", "a(ua{sv})", 1, cast->node_id, 3, "position", "(ii)", 0, 0, "size", "(ii)",
"source_type", "u", (cast->target.output ? (1 << MONITOR) : (1 << WINDOW)), "persist_mode", "u", sess->persist, cast->screencopy_frame_info[WL_SHM].width, cast->screencopy_frame_info[WL_SHM].height, "source_type", "u",
"restore_data", "(suv)", "hyprland", 2, "(susbt)" /* amogus */, restoreToken->token, restoreToken->windowHandle, (cast->target.output ? (1 << MONITOR) : (1 << WINDOW)), "persist_mode", "u", sess->persist, "restore_data", "(suv)", "hyprland", 2,
(restoreToken->outputPort == NULL ? "" : restoreToken->outputPort), restoreToken->withCursor, "(susbt)" /* amogus */, restoreToken->token, restoreToken->windowHandle,
(unsigned long)time(NULL)); (restoreToken->outputPort == NULL ? (restoreToken->windowHandle ? restoreToken->windowClass : "") : restoreToken->outputPort),
restoreToken->withCursor, (unsigned long)time(NULL));
else else
ret = sd_bus_message_append(reply, "ua{sv}", PORTAL_RESPONSE_SUCCESS, 1, "streams", "a(ua{sv})", 1, cast->node_id, 3, "position", "(ii)", 0, ret = sd_bus_message_append(reply, "ua{sv}", PORTAL_RESPONSE_SUCCESS, 1, "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, 0, "size", "(ii)", cast->screencopy_frame_info[WL_SHM].width, cast->screencopy_frame_info[WL_SHM].height,