diff options
| author | emersion <contact@emersion.fr> | 2018-08-02 08:11:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 08:11:10 +0100 |
| commit | 47bf4ed0cbf104d09bba7f39acbf2ceb84c2c694 (patch) | |
| tree | 8f0085c1829ab97a920acd9d5116732779177631 /swaymsg | |
| parent | d10ccc1eb144e4de2477398f6b11753f6b7df70b (diff) | |
| parent | 9564c73c0ddca9d7b45f0476fcaee8bd878d8345 (diff) | |
| download | sway-47bf4ed0cbf104d09bba7f39acbf2ceb84c2c694.tar.xz | |
Merge branch 'master' into fix-resize-wiggle
Diffstat (limited to 'swaymsg')
| -rw-r--r-- | swaymsg/main.c | 8 | ||||
| -rw-r--r-- | swaymsg/swaymsg.1.scd | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c index c4141ca5..3767daf3 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -250,12 +250,16 @@ static void pretty_print(int type, json_object *resp) { if (type != IPC_COMMAND && type != IPC_GET_WORKSPACES && type != IPC_GET_INPUTS && type != IPC_GET_OUTPUTS && type != IPC_GET_VERSION && type != IPC_GET_SEATS && - type != IPC_GET_CONFIG) { + type != IPC_GET_CONFIG && type != IPC_SEND_TICK) { printf("%s\n", json_object_to_json_string_ext(resp, JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED)); return; } + if (type == IPC_SEND_TICK) { + return; + } + if (type == IPC_GET_VERSION) { pretty_print_version(resp); return; @@ -384,6 +388,8 @@ int main(int argc, char **argv) { type = IPC_GET_BINDING_MODES; } else if (strcasecmp(cmdtype, "get_config") == 0) { type = IPC_GET_CONFIG; + } else if (strcasecmp(cmdtype, "send_tick") == 0) { + type = IPC_SEND_TICK; } else { sway_abort("Unknown message type %s", cmdtype); } diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd index a6e279da..8cf1b222 100644 --- a/swaymsg/swaymsg.1.scd +++ b/swaymsg/swaymsg.1.scd @@ -64,3 +64,6 @@ _swaymsg_ [options...] [message] *get\_config* Gets a JSON-encoded copy of the current configuration. + +*send\_tick* + Sends a tick event to all subscribed clients. |