diff options
| author | Simon Ser <contact@emersion.fr> | 2019-07-19 22:42:37 +0300 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-07-21 12:33:32 -0400 |
| commit | 76ef089f52b20a2def3dd1f8a8564af165050dcb (patch) | |
| tree | 8494f7962340789840a68f3535607acc31dd6a13 | |
| parent | bb056174146ae01448e0281ea204d2ddd60ebe3c (diff) | |
output: drop wlr_output_mode.flags
AFAIK this was always set to zero. Instead, compute wl_output mode flags on the
fly.
Technically this is a breaking change, but I don't think anybody uses this
field.
| -rw-r--r-- | include/wlr/types/wlr_output.h | 1 | ||||
| -rw-r--r-- | types/wlr_output.c | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index dff9f4eb..9bc1b67f 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -18,7 +18,6 @@ #include <wlr/types/wlr_buffer.h> struct wlr_output_mode { - uint32_t flags; // enum wl_output_mode int32_t width, height; int32_t refresh; // mHz bool preferred; diff --git a/types/wlr_output.c b/types/wlr_output.c index 9d32855f..22b22ef7 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -31,7 +31,10 @@ static void send_all_modes(struct wl_resource *resource) { struct wlr_output_mode *mode; wl_list_for_each(mode, &output->modes, link) { - uint32_t flags = mode->flags & WL_OUTPUT_MODE_PREFERRED; + uint32_t flags = 0; + if (mode->preferred) { + flags |= WL_OUTPUT_MODE_PREFERRED; + } if (output->current_mode == mode) { flags |= WL_OUTPUT_MODE_CURRENT; } @@ -50,9 +53,12 @@ static void send_current_mode(struct wl_resource *resource) { struct wlr_output *output = wlr_output_from_resource(resource); if (output->current_mode != NULL) { struct wlr_output_mode *mode = output->current_mode; - uint32_t flags = mode->flags & WL_OUTPUT_MODE_PREFERRED; - wl_output_send_mode(resource, flags | WL_OUTPUT_MODE_CURRENT, - mode->width, mode->height, mode->refresh); + uint32_t flags = WL_OUTPUT_MODE_CURRENT; + if (mode->preferred) { + flags |= WL_OUTPUT_MODE_PREFERRED; + } + wl_output_send_mode(resource, flags, mode->width, mode->height, + mode->refresh); } else { // Output has no mode wl_output_send_mode(resource, WL_OUTPUT_MODE_CURRENT, output->width, |