From a0fa7909cdc23660dc51ea3cd36cf0aada5b1ad7 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:50:06 +0000 Subject: [PATCH] nuke toplevel_mgr_bind --- include/screencast_common.h | 1 - src/screencast/screencast.c | 2 -- src/screencast/wlr_screencast.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/screencast_common.h b/include/screencast_common.h index ea768a1..012e9ba 100644 --- a/include/screencast_common.h +++ b/include/screencast_common.h @@ -127,7 +127,6 @@ struct xdpw_screencast_context { struct hyprland_toplevel_export_manager_v1 *hyprland_toplevel_manager; struct zwlr_foreign_toplevel_manager_v1 *wlroots_toplevel_manager; struct wl_list toplevel_resource_list; - int toplevel_mgr_bind; // gbm struct gbm_device *gbm; diff --git a/src/screencast/screencast.c b/src/screencast/screencast.c index 0340023..3296bf7 100644 --- a/src/screencast/screencast.c +++ b/src/screencast/screencast.c @@ -170,7 +170,6 @@ static int start_screencast(struct xdpw_screencast_instance *cast) { // process at least one frame so that we know // some of the metadata required for the pipewire // remote state connected event - cast->ctx->toplevel_mgr_bind = 1; wl_display_dispatch(cast->ctx->state->wl_display); wl_display_roundtrip(cast->ctx->state->wl_display); @@ -522,7 +521,6 @@ int xdpw_screencast_init(struct xdpw_state *state) { state->screencast = (struct xdpw_screencast_context){0}; state->screencast.state = state; state->screencast.hyprland_toplevel_manager = NULL; - state->screencast.toplevel_mgr_bind = 0; int err; err = xdpw_pwr_context_create(state); diff --git a/src/screencast/wlr_screencast.c b/src/screencast/wlr_screencast.c index 10d895f..daffc53 100644 --- a/src/screencast/wlr_screencast.c +++ b/src/screencast/wlr_screencast.c @@ -1070,7 +1070,7 @@ static void wlr_registry_handle_add(void *data, struct wl_registry *reg, ctx->hyprland_toplevel_manager = wl_registry_bind(reg, id, &hyprland_toplevel_export_manager_v1_interface, version); } - if (!strcmp(interface, zwlr_foreign_toplevel_manager_v1_interface.name) && ctx->toplevel_mgr_bind && !ctx->wlroots_toplevel_manager) { + if (!strcmp(interface, zwlr_foreign_toplevel_manager_v1_interface.name) && !ctx->wlroots_toplevel_manager) { uint32_t version = ver; logprint(DEBUG, "hyprland: |-- registered to interface %s (Version %u)", interface, version);