aboutsummaryrefslogtreecommitdiff
path: root/sway/config
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-05-13 10:11:10 -0400
committerGitHub <noreply@github.com>2018-05-13 10:11:10 -0400
commit61aa0937a75d23c0f2a00a8cea52c08bf69164dd (patch)
tree5f2e7817313b657431870862d4059b62bcd2e396 /sway/config
parent0c96d757d0d5d1762390dd119cbe344e8781c19f (diff)
parentf40049b5cd8d0274a62399cbdd1f8fd0e7668be3 (diff)
Merge pull request #1824 from snaggen/idle
DPMS and lock handling
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/output.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/sway/config/output.c b/sway/config/output.c
index 68022278..ee2440ea 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -81,6 +81,9 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
free(dst->background_option);
dst->background_option = strdup(src->background_option);
}
+ if (src->dpms_state != 0) {
+ dst->dpms_state = src->dpms_state;
+ }
}
static void set_mode(struct wlr_output *output, int width, int height,
@@ -204,6 +207,20 @@ void apply_output_config(struct output_config *oc, struct sway_container *output
execvp(cmd[0], cmd);
}
}
+ if (oc && oc->dpms_state != DPMS_IGNORE) {
+ switch (oc->dpms_state) {
+ case DPMS_ON:
+ wlr_log(L_DEBUG, "Turning on screen");
+ wlr_output_enable(wlr_output, true);
+ break;
+ case DPMS_OFF:
+ wlr_log(L_DEBUG, "Turning off screen");
+ wlr_output_enable(wlr_output, false);
+ break;
+ case DPMS_IGNORE:
+ break;
+ }
+ }
}
void free_output_config(struct output_config *oc) {