aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-08-04 02:02:13 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-08-06 11:31:39 +0900
commita8a239e2f1ca6236c2b8f7cebf0cc37890e77ec0 (patch)
tree31206baa6238542c53d6c6b51e08d572caea8fed
parentinput/cursor: do not hide when buttons are pressed (diff)
downloadsway-a8a239e2f1ca6236c2b8f7cebf0cc37890e77ec0.tar.gz
sway-a8a239e2f1ca6236c2b8f7cebf0cc37890e77ec0.tar.zst
sway-a8a239e2f1ca6236c2b8f7cebf0cc37890e77ec0.zip
swaymsg: return 2 for sway errors
This mirrors a change in i3 4.17 that returns 2 for errors from sway, including invalid command, command failed, and invalid subscription requests
-rw-r--r--swaymsg/main.c2
-rw-r--r--swaymsg/swaymsg.1.scd13
2 files changed, 14 insertions, 1 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c
index f288d4a0..a018a68e 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -475,7 +475,7 @@ int main(int argc, char **argv) {
475 ret = 1; 475 ret = 1;
476 } else { 476 } else {
477 if (!success(obj, true)) { 477 if (!success(obj, true)) {
478 ret = 1; 478 ret = 2;
479 } 479 }
480 if (!quiet && (type != IPC_SUBSCRIBE || ret != 0)) { 480 if (!quiet && (type != IPC_SUBSCRIBE || ret != 0)) {
481 if (raw) { 481 if (raw) {
diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd
index 1bcf956a..bcddf35b 100644
--- a/swaymsg/swaymsg.1.scd
+++ b/swaymsg/swaymsg.1.scd
@@ -86,6 +86,19 @@ _swaymsg_ [options...] [message]
86 provided in the form of a valid JSON array. If any of the types are invalid 86 provided in the form of a valid JSON array. If any of the types are invalid
87 or if an valid JSON array is not provided, this will result in an failure. 87 or if an valid JSON array is not provided, this will result in an failure.
88 88
89# RETURN CODES
90
91*0*
92 Success
93
94*1*
95 swaymsg errors such as invalid syntax, unable to connect to the ipc socket
96 or unable to parse sway's reply
97
98*2*
99 Sway returned an error when processing the command (ex. invalid command,
100 command failed, and invalid subscription request)
101
89# SEE ALSO 102# SEE ALSO
90 103
91*sway*(5) *sway-bar*(5) *sway-input*(5) *sway-output*(5) *sway-ipc*(7) 104*sway*(5) *sway-bar*(5) *sway-input*(5) *sway-output*(5) *sway-ipc*(7)