diff options
-rw-r--r-- | include/sway/input/seat.h | 8 | ||||
-rw-r--r-- | sway/desktop/render.c | 9 | ||||
-rw-r--r-- | sway/input/seat.c | 6 |
3 files changed, 0 insertions, 23 deletions
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 3c81a713..e5aa8478 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #include "sway/input/text_input.h" | 13 | #include "sway/input/text_input.h" |
14 | 14 | ||
15 | struct sway_seat; | 15 | struct sway_seat; |
16 | struct render_context; | ||
17 | 16 | ||
18 | struct sway_seatop_impl { | 17 | struct sway_seatop_impl { |
19 | void (*button)(struct sway_seat *seat, uint32_t time_msec, | 18 | void (*button)(struct sway_seat *seat, uint32_t time_msec, |
@@ -53,7 +52,6 @@ struct sway_seatop_impl { | |||
53 | uint32_t time_msec, enum wlr_tablet_tool_tip_state state); | 52 | uint32_t time_msec, enum wlr_tablet_tool_tip_state state); |
54 | void (*end)(struct sway_seat *seat); | 53 | void (*end)(struct sway_seat *seat); |
55 | void (*unref)(struct sway_seat *seat, struct sway_container *con); | 54 | void (*unref)(struct sway_seat *seat, struct sway_container *con); |
56 | void (*render)(struct sway_seat *seat, struct render_context *ctx); | ||
57 | bool allow_set_cursor; | 55 | bool allow_set_cursor; |
58 | }; | 56 | }; |
59 | 57 | ||
@@ -353,12 +351,6 @@ void seatop_end(struct sway_seat *seat); | |||
353 | */ | 351 | */ |
354 | void seatop_unref(struct sway_seat *seat, struct sway_container *con); | 352 | void seatop_unref(struct sway_seat *seat, struct sway_container *con); |
355 | 353 | ||
356 | /** | ||
357 | * Instructs a seatop to render anything that it needs to render | ||
358 | * (eg. dropzone for move-tiling) | ||
359 | */ | ||
360 | void seatop_render(struct sway_seat *seat, struct render_context *ctx); | ||
361 | |||
362 | bool seatop_allows_set_cursor(struct sway_seat *seat); | 354 | bool seatop_allows_set_cursor(struct sway_seat *seat); |
363 | 355 | ||
364 | /** | 356 | /** |
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 60431d79..23ced7a1 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -973,13 +973,6 @@ static void render_floating(struct render_context *ctx) { | |||
973 | } | 973 | } |
974 | } | 974 | } |
975 | 975 | ||
976 | static void render_seatops(struct render_context *ctx) { | ||
977 | struct sway_seat *seat; | ||
978 | wl_list_for_each(seat, &server.input->seats, link) { | ||
979 | seatop_render(seat, ctx); | ||
980 | } | ||
981 | } | ||
982 | |||
983 | void output_render(struct render_context *ctx) { | 976 | void output_render(struct render_context *ctx) { |
984 | struct wlr_output *wlr_output = ctx->output->wlr_output; | 977 | struct wlr_output *wlr_output = ctx->output->wlr_output; |
985 | struct sway_output *output = ctx->output; | 978 | struct sway_output *output = ctx->output; |
@@ -1072,8 +1065,6 @@ void output_render(struct render_context *ctx) { | |||
1072 | &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); | 1065 | &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); |
1073 | } | 1066 | } |
1074 | 1067 | ||
1075 | render_seatops(ctx); | ||
1076 | |||
1077 | struct sway_seat *seat = input_manager_current_seat(); | 1068 | struct sway_seat *seat = input_manager_current_seat(); |
1078 | struct sway_container *focus = seat_get_focused_container(seat); | 1069 | struct sway_container *focus = seat_get_focused_container(seat); |
1079 | if (focus && focus->view) { | 1070 | if (focus && focus->view) { |
diff --git a/sway/input/seat.c b/sway/input/seat.c index b8daa297..75fea484 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -1691,12 +1691,6 @@ void seatop_end(struct sway_seat *seat) { | |||
1691 | seat->seatop_impl = NULL; | 1691 | seat->seatop_impl = NULL; |
1692 | } | 1692 | } |
1693 | 1693 | ||
1694 | void seatop_render(struct sway_seat *seat, struct render_context *ctx) { | ||
1695 | if (seat->seatop_impl->render) { | ||
1696 | seat->seatop_impl->render(seat, ctx); | ||
1697 | } | ||
1698 | } | ||
1699 | |||
1700 | bool seatop_allows_set_cursor(struct sway_seat *seat) { | 1694 | bool seatop_allows_set_cursor(struct sway_seat *seat) { |
1701 | return seat->seatop_impl->allow_set_cursor; | 1695 | return seat->seatop_impl->allow_set_cursor; |
1702 | } | 1696 | } |