diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-05-13 10:11:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-13 10:11:10 -0400 |
commit | 61aa0937a75d23c0f2a00a8cea52c08bf69164dd (patch) | |
tree | 5f2e7817313b657431870862d4059b62bcd2e396 /include | |
parent | Merge pull request #1960 from RedSoxFan/edge-borders (diff) | |
parent | Remove asciidoc file for swayidle (diff) | |
download | sway-61aa0937a75d23c0f2a00a8cea52c08bf69164dd.tar.gz sway-61aa0937a75d23c0f2a00a8cea52c08bf69164dd.tar.zst sway-61aa0937a75d23c0f2a00a8cea52c08bf69164dd.zip |
Merge pull request #1824 from snaggen/idle
DPMS and lock handling
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 7 | ||||
-rw-r--r-- | include/sway/server.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index b20458cb..f77c3b50 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -107,6 +107,12 @@ struct seat_config { | |||
107 | list_t *attachments; // list of seat_attachment configs | 107 | list_t *attachments; // list of seat_attachment configs |
108 | }; | 108 | }; |
109 | 109 | ||
110 | enum config_dpms { | ||
111 | DPMS_IGNORE, | ||
112 | DPMS_ON, | ||
113 | DPMS_OFF | ||
114 | }; | ||
115 | |||
110 | /** | 116 | /** |
111 | * Size and position configuration for a particular output. | 117 | * Size and position configuration for a particular output. |
112 | * | 118 | * |
@@ -123,6 +129,7 @@ struct output_config { | |||
123 | 129 | ||
124 | char *background; | 130 | char *background; |
125 | char *background_option; | 131 | char *background_option; |
132 | enum config_dpms dpms_state; | ||
126 | }; | 133 | }; |
127 | 134 | ||
128 | /** | 135 | /** |
diff --git a/include/sway/server.h b/include/sway/server.h index 296fbf22..ac685bf8 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -21,6 +21,7 @@ struct sway_server { | |||
21 | 21 | ||
22 | struct wlr_compositor *compositor; | 22 | struct wlr_compositor *compositor; |
23 | struct wlr_data_device_manager *data_device_manager; | 23 | struct wlr_data_device_manager *data_device_manager; |
24 | struct wlr_idle *idle; | ||
24 | 25 | ||
25 | struct sway_input_manager *input; | 26 | struct sway_input_manager *input; |
26 | 27 | ||