alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3468 from emersion/fix-output-gain-crtc

Browse source 
Fix re-enabling outputs gaining a CRTC
This commit is contained in:
Drew DeVault 2019-01-20 09:01:33 -05:00 committed by GitHub
parent 62260ab56e 0bf3252d8b
commit a3d3504072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/desktop/output.c
View file

@ -503,20 +503,22 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
static void handle_mode(struct wl_listener *listener, void *data) { static void handle_mode(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, mode); struct sway_output *output = wl_container_of(listener, output, mode);
if (!output->configured) { if (!output->configured && !output->enabled) {
return;
}
if (!output->enabled) {
struct output_config *oc = output_find_config(output); struct output_config *oc = output_find_config(output);
if (output->wlr_output->current_mode != NULL && if (output->wlr_output->current_mode != NULL &&
(!oc || oc->enabled)) { (!oc || oc->enabled)) {
// We want to enable this output, but it didn't work last time, // We want to enable this output, but it didn't work last time,
// possibly because we hadn't enough CRTCs. Try again now that the // possibly because we hadn't enough CRTCs. Try again now that the
// output has a mode. // output has a mode.
output_enable(output, oc); wlr_log(WLR_DEBUG, "Output %s has gained a CRTC, "
"trying to enable it", output->wlr_output->name);
apply_output_config(oc, output);
} }
return; return;
} }
if (!output->enabled || !output->configured) {
return;
}
arrange_layers(output); arrange_layers(output);
arrange_output(output); arrange_output(output);
transaction_commit_dirty(); transaction_commit_dirty();