aboutsummaryrefslogtreecommitdiffstats
path: root/swaymsg
diff options
context:
space:
mode:
authorLibravatar Peter Grayson <pete@jpgrayson.net>2019-03-08 12:43:04 -0500
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-03-08 14:29:39 -0500
commitb7fe5097e949b9bfde6fd52f26d2599068833563 (patch)
tree37459687d2f8a639bc0439c98fdb00bf87d61ad8 /swaymsg
parentipc: describe libinput device configuration (diff)
downloadsway-b7fe5097e949b9bfde6fd52f26d2599068833563.tar.gz
sway-b7fe5097e949b9bfde6fd52f26d2599068833563.tar.zst
sway-b7fe5097e949b9bfde6fd52f26d2599068833563.zip
Add -p/--pretty option to swaymsg
This new option forces pretty (non-raw/non-JSON) output. By default, when not using a tty, swaymsg outputs using the "raw" format. This makes it impossible to, for example, pipe the pretty output to a pager such as `less` since piping does not use a tty. The new -p/--pretty option gives the user explicit control over the output format while retaining the default tty-dependent behavior. Signed-off-by: Peter Grayson <pete@jpgrayson.net>
Diffstat (limited to 'swaymsg')
-rw-r--r--swaymsg/main.c7
-rw-r--r--swaymsg/swaymsg.1.scd3
2 files changed, 9 insertions, 1 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c
index e51c00d9..a0ef7e3d 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -326,6 +326,7 @@ int main(int argc, char **argv) {
326 static struct option long_options[] = { 326 static struct option long_options[] = {
327 {"help", no_argument, NULL, 'h'}, 327 {"help", no_argument, NULL, 'h'},
328 {"monitor", no_argument, NULL, 'm'}, 328 {"monitor", no_argument, NULL, 'm'},
329 {"pretty", no_argument, NULL, 'p'},
329 {"quiet", no_argument, NULL, 'q'}, 330 {"quiet", no_argument, NULL, 'q'},
330 {"raw", no_argument, NULL, 'r'}, 331 {"raw", no_argument, NULL, 'r'},
331 {"socket", required_argument, NULL, 's'}, 332 {"socket", required_argument, NULL, 's'},
@@ -339,6 +340,7 @@ int main(int argc, char **argv) {
339 "\n" 340 "\n"
340 " -h, --help Show help message and quit.\n" 341 " -h, --help Show help message and quit.\n"
341 " -m, --monitor Monitor until killed (-t SUBSCRIBE only)\n" 342 " -m, --monitor Monitor until killed (-t SUBSCRIBE only)\n"
343 " -p, --pretty Use pretty output even when not using a tty\n"
342 " -q, --quiet Be quiet.\n" 344 " -q, --quiet Be quiet.\n"
343 " -r, --raw Use raw output even if using a tty\n" 345 " -r, --raw Use raw output even if using a tty\n"
344 " -s, --socket <socket> Use the specified socket.\n" 346 " -s, --socket <socket> Use the specified socket.\n"
@@ -350,7 +352,7 @@ int main(int argc, char **argv) {
350 int c; 352 int c;
351 while (1) { 353 while (1) {
352 int option_index = 0; 354 int option_index = 0;
353 c = getopt_long(argc, argv, "hmqrs:t:v", long_options, &option_index); 355 c = getopt_long(argc, argv, "hmpqrs:t:v", long_options, &option_index);
354 if (c == -1) { 356 if (c == -1) {
355 break; 357 break;
356 } 358 }
@@ -358,6 +360,9 @@ int main(int argc, char **argv) {
358 case 'm': // Monitor 360 case 'm': // Monitor
359 monitor = true; 361 monitor = true;
360 break; 362 break;
363 case 'p': // Pretty
364 raw = false;
365 break;
361 case 'q': // Quiet 366 case 'q': // Quiet
362 quiet = true; 367 quiet = true;
363 break; 368 break;
diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd
index 523db6cc..1bcf956a 100644
--- a/swaymsg/swaymsg.1.scd
+++ b/swaymsg/swaymsg.1.scd
@@ -19,6 +19,9 @@ _swaymsg_ [options...] [message]
19 there is a malformed response or an invalid event type was requested, 19 there is a malformed response or an invalid event type was requested,
20 swaymsg will stop monitoring and exit. 20 swaymsg will stop monitoring and exit.
21 21
22*-p, --pretty*
23 Use raw output even when not using a tty.
24
22*-q, --quiet* 25*-q, --quiet*
23 Sends the IPC message but does not print the response from sway. 26 Sends the IPC message but does not print the response from sway.
24 27