From 7b530bf4487f36273938ffd7236dad8a7629790a Mon Sep 17 00:00:00 2001 From: Will McKinnon Date: Mon, 15 Aug 2022 00:54:07 -0400 Subject: Revert "merge sway master" This reverts commit 7460d9f565092836f81b917a040caff57142d91a. --- sway/desktop/output.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'sway/desktop/output.c') diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ab60bd71..107e5080 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include "config.h" #include "log.h" @@ -738,15 +738,14 @@ static void update_output_manager_config(struct sway_server *server) { } struct wlr_output_configuration_head_v1 *config_head = wlr_output_configuration_head_v1_create(config, output->wlr_output); - struct wlr_box output_box; - wlr_output_layout_get_box(root->output_layout, - output->wlr_output, &output_box); + struct wlr_box *output_box = wlr_output_layout_get_box( + root->output_layout, output->wlr_output); // We mark the output enabled even if it is switched off by DPMS config_head->state.enabled = output->current_mode != NULL && output->enabled; config_head->state.mode = output->current_mode; - if (!wlr_box_empty(&output_box)) { - config_head->state.x = output_box.x; - config_head->state.y = output_box.y; + if (output_box) { + config_head->state.x = output_box->x; + config_head->state.y = output_box->y; } } -- cgit v1.2.3