summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-08-10 13:13:10 -0400
committerLibravatar GitHub <noreply@github.com>2016-08-10 13:13:10 -0400
commit5c87cc7cb190fbc1ed2a8e8e9d10208a6384e21c (patch)
tree6fb0de479008bf961d16c2dacaee07d9adf3ab10
parentMerge pull request #846 from mmlb/doc-all-xkb-env-vars (diff)
parentHandle output disabling during runtime (diff)
downloadsway-5c87cc7cb190fbc1ed2a8e8e9d10208a6384e21c.tar.gz
sway-5c87cc7cb190fbc1ed2a8e8e9d10208a6384e21c.tar.zst
sway-5c87cc7cb190fbc1ed2a8e8e9d10208a6384e21c.zip
Merge pull request #851 from thejan2009/output-disable-during-runtime
Handle output disabling during runtime
-rw-r--r--sway/config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index a1f33dcf..8531a337 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -859,6 +859,11 @@ void apply_input_config(struct input_config *ic, struct libinput_device *dev) {
859} 859}
860 860
861void apply_output_config(struct output_config *oc, swayc_t *output) { 861void apply_output_config(struct output_config *oc, swayc_t *output) {
862 if (oc->enabled == 0) {
863 destroy_output(output);
864 return;
865 }
866
862 if (oc && oc->width > 0 && oc->height > 0) { 867 if (oc && oc->width > 0 && oc->height > 0) {
863 output->width = oc->width; 868 output->width = oc->width;
864 output->height = oc->height; 869 output->height = oc->height;