blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #420 from emersion/output-done 

Call wl_output_send_done when current mode is updated
This commit is contained in:
Drew DeVault 2017-11-15 16:42:01 -05:00 committed by GitHub
parent 0fe51b66e4 bf1f461eba
commit ac78c6642a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
types/wlr_output.c
View File

@ -29,8 +29,7 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
if (version >= WL_OUTPUT_MODE_SINCE_VERSION) { if (version >= WL_OUTPUT_MODE_SINCE_VERSION) {
struct wlr_output_mode *mode; struct wlr_output_mode *mode;
wl_list_for_each(mode, &output->modes, link) { wl_list_for_each(mode, &output->modes, link) {
// TODO: mode->flags should just be preferred uint32_t flags = mode->flags & WL_OUTPUT_MODE_PREFERRED;
uint32_t flags = mode->flags;
if (output->current_mode == mode) { if (output->current_mode == mode) {
flags |= WL_OUTPUT_MODE_CURRENT; flags |= WL_OUTPUT_MODE_CURRENT;
} }
@ -62,13 +61,17 @@ static void wlr_output_send_current_mode_to_resource(
} }
if (output->current_mode != NULL) { if (output->current_mode != NULL) {
struct wlr_output_mode *mode = output->current_mode; struct wlr_output_mode *mode = output->current_mode;
wl_output_send_mode(resource, mode->flags | WL_OUTPUT_MODE_CURRENT, 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); mode->width, mode->height, mode->refresh);
} else { } else {
// Output has no mode, send the current width/height // Output has no mode, send the current width/height
wl_output_send_mode(resource, WL_OUTPUT_MODE_CURRENT, output->width, wl_output_send_mode(resource, WL_OUTPUT_MODE_CURRENT, output->width,
output->height, 0); output->height, 0);
} }
if (version >= WL_OUTPUT_DONE_SINCE_VERSION) {
wl_output_send_done(resource);
}
} }
static void wl_output_destroy(struct wl_resource *resource) { static void wl_output_destroy(struct wl_resource *resource) {
@ -163,6 +166,9 @@ bool wlr_output_set_mode(struct wlr_output *output,
void wlr_output_update_size(struct wlr_output *output, int32_t width, void wlr_output_update_size(struct wlr_output *output, int32_t width,
int32_t height) { int32_t height) {
if (output->width == width && output->height == height) {
return;
}
output->width = width; output->width = width;
output->height = height; output->height = height;
wlr_output_update_matrix(output); wlr_output_update_matrix(output);