From bac3ab552683516ee5a09632468cd8de529d311f Mon Sep 17 00:00:00 2001 From: Alexander Orzechowski Date: Mon, 21 Feb 2022 20:57:45 -0500 Subject: [PATCH] seat: Remove dead seatop_render function --- include/sway/input/seat.h | 8 -------- sway/desktop/render.c | 9 --------- sway/input/seat.c | 6 ------ 3 files changed, 23 deletions(-) diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 3c81a7136..e5aa84783 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h @@ -13,7 +13,6 @@ #include "sway/input/text_input.h" struct sway_seat; -struct render_context; struct sway_seatop_impl { void (*button)(struct sway_seat *seat, uint32_t time_msec, @@ -53,7 +52,6 @@ struct sway_seatop_impl { uint32_t time_msec, enum wlr_tablet_tool_tip_state state); void (*end)(struct sway_seat *seat); void (*unref)(struct sway_seat *seat, struct sway_container *con); - void (*render)(struct sway_seat *seat, struct render_context *ctx); bool allow_set_cursor; }; @@ -353,12 +351,6 @@ void seatop_end(struct sway_seat *seat); */ void seatop_unref(struct sway_seat *seat, struct sway_container *con); -/** - * Instructs a seatop to render anything that it needs to render - * (eg. dropzone for move-tiling) - */ -void seatop_render(struct sway_seat *seat, struct render_context *ctx); - bool seatop_allows_set_cursor(struct sway_seat *seat); /** diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 60431d791..23ced7a15 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -973,13 +973,6 @@ static void render_floating(struct render_context *ctx) { } } -static void render_seatops(struct render_context *ctx) { - struct sway_seat *seat; - wl_list_for_each(seat, &server.input->seats, link) { - seatop_render(seat, ctx); - } -} - void output_render(struct render_context *ctx) { struct wlr_output *wlr_output = ctx->output->wlr_output; struct sway_output *output = ctx->output; @@ -1072,8 +1065,6 @@ void output_render(struct render_context *ctx) { &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); } - render_seatops(ctx); - struct sway_seat *seat = input_manager_current_seat(); struct sway_container *focus = seat_get_focused_container(seat); if (focus && focus->view) { diff --git a/sway/input/seat.c b/sway/input/seat.c index b8daa2979..75fea484c 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -1691,12 +1691,6 @@ void seatop_end(struct sway_seat *seat) { seat->seatop_impl = NULL; } -void seatop_render(struct sway_seat *seat, struct render_context *ctx) { - if (seat->seatop_impl->render) { - seat->seatop_impl->render(seat, ctx); - } -} - bool seatop_allows_set_cursor(struct sway_seat *seat) { return seat->seatop_impl->allow_set_cursor; }