mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not modeset disabled outputs

Browse source
This commit is contained in:
emersion 2018-09-01 18:56:53 +02:00
parent 89a045835f
commit 349d1f3be8
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/config/output.c
View file

@ -196,6 +196,10 @@ void apply_output_config(struct output_config *oc, struct sway_container *output
wlr_log(WLR_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width, wlr_log(WLR_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width,
oc->height, oc->refresh_rate); oc->height, oc->refresh_rate);
set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate); set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
} else if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode =
wl_container_of(wlr_output->modes.prev, mode, link);
wlr_output_set_mode(wlr_output, mode);
} }
if (oc && oc->scale > 0) { if (oc && oc->scale > 0) {
wlr_log(WLR_DEBUG, "Set %s scale to %f", oc->name, oc->scale); wlr_log(WLR_DEBUG, "Set %s scale to %f", oc->name, oc->scale);

6
sway/desktop/output.c
View file

@ -559,12 +559,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wl_list_insert(&root_container.sway_root->all_outputs, &output->link); wl_list_insert(&root_container.sway_root->all_outputs, &output->link);
if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode =
wl_container_of(wlr_output->modes.prev, mode, link);
wlr_output_set_mode(wlr_output, mode);
}
output_enable(output); output_enable(output);
} }