diff options
author | Josef Gajdusek <atx@atx.name> | 2019-05-28 21:33:15 +0200 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-05-28 22:43:11 -0400 |
commit | 2c6a10c4ba8e1ab97db81677e32ca1580e4f0430 (patch) | |
tree | 0e0b405643b4ebfefec09097facba7268e86ca6e /sway | |
parent | common/ipc-client: remove ipc recv timeout log (diff) | |
download | sway-2c6a10c4ba8e1ab97db81677e32ca1580e4f0430.tar.gz sway-2c6a10c4ba8e1ab97db81677e32ca1580e4f0430.tar.zst sway-2c6a10c4ba8e1ab97db81677e32ca1580e4f0430.zip |
Provide current DPMS state in GET_OUTPUTS
Diffstat (limited to 'sway')
-rw-r--r-- | sway/ipc-json.c | 3 | ||||
-rw-r--r-- | sway/sway-ipc.7.scd | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 4af8d34b..b9abc47f 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -162,6 +162,8 @@ static void ipc_json_describe_output(struct sway_output *output, | |||
162 | struct wlr_output *wlr_output = output->wlr_output; | 162 | struct wlr_output *wlr_output = output->wlr_output; |
163 | json_object_object_add(object, "type", json_object_new_string("output")); | 163 | json_object_object_add(object, "type", json_object_new_string("output")); |
164 | json_object_object_add(object, "active", json_object_new_boolean(true)); | 164 | json_object_object_add(object, "active", json_object_new_boolean(true)); |
165 | json_object_object_add(object, "dpms", | ||
166 | json_object_new_boolean(output->wlr_output->enabled)); | ||
165 | json_object_object_add(object, "primary", json_object_new_boolean(false)); | 167 | json_object_object_add(object, "primary", json_object_new_boolean(false)); |
166 | json_object_object_add(object, "layout", json_object_new_string("output")); | 168 | json_object_object_add(object, "layout", json_object_new_string("output")); |
167 | json_object_object_add(object, "orientation", | 169 | json_object_object_add(object, "orientation", |
@@ -233,6 +235,7 @@ json_object *ipc_json_describe_disabled_output(struct sway_output *output) { | |||
233 | json_object_object_add(object, "name", | 235 | json_object_object_add(object, "name", |
234 | json_object_new_string(wlr_output->name)); | 236 | json_object_new_string(wlr_output->name)); |
235 | json_object_object_add(object, "active", json_object_new_boolean(false)); | 237 | json_object_object_add(object, "active", json_object_new_boolean(false)); |
238 | json_object_object_add(object, "dpms", json_object_new_boolean(false)); | ||
236 | json_object_object_add(object, "primary", json_object_new_boolean(false)); | 239 | json_object_object_add(object, "primary", json_object_new_boolean(false)); |
237 | json_object_object_add(object, "make", | 240 | json_object_object_add(object, "make", |
238 | json_object_new_string(wlr_output->make)); | 241 | json_object_new_string(wlr_output->make)); |
diff --git a/sway/sway-ipc.7.scd b/sway/sway-ipc.7.scd index 3d22008e..df3d4448 100644 --- a/sway/sway-ipc.7.scd +++ b/sway/sway-ipc.7.scd | |||
@@ -205,6 +205,9 @@ following properties: | |||
205 | |- active | 205 | |- active |
206 | : boolean | 206 | : boolean |
207 | : Whether this output is active/enabled | 207 | : Whether this output is active/enabled |
208 | |- dpms | ||
209 | : boolean | ||
210 | : Whether this output is on/off (via DPMS) | ||
208 | |- primary | 211 | |- primary |
209 | : boolean | 212 | : boolean |
210 | : For i3 compatibility, this will be false. It does not make sense in Wayland | 213 | : For i3 compatibility, this will be false. It does not make sense in Wayland |