summaryrefslogtreecommitdiffstats
path: root/swaymsg/swaymsg.1.scd
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-11-05 21:21:47 +0100
committerLibravatar GitHub <noreply@github.com>2018-11-05 21:21:47 +0100
commit25bea8f6a538edf47ab7e0625f24cdf31e28473f (patch)
tree96296f5d755a728e8999b072bfd5ce8ee9c4d79e /swaymsg/swaymsg.1.scd
parentUse wlr_surface_get_effective_damage (diff)
parentMerge pull request #3078 from Emantor/fix/exec_always_double_load (diff)
downloadsway-25bea8f6a538edf47ab7e0625f24cdf31e28473f.tar.gz
sway-25bea8f6a538edf47ab7e0625f24cdf31e28473f.tar.zst
sway-25bea8f6a538edf47ab7e0625f24cdf31e28473f.zip
Merge branch 'master' into effective-damage
Diffstat (limited to 'swaymsg/swaymsg.1.scd')
-rw-r--r--swaymsg/swaymsg.1.scd4
1 files changed, 4 insertions, 0 deletions
diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd
index 8cf1b222..eaac8105 100644
--- a/swaymsg/swaymsg.1.scd
+++ b/swaymsg/swaymsg.1.scd
@@ -50,6 +50,10 @@ _swaymsg_ [options...] [message]
50 Gets a JSON-encoded layout tree of all open windows, containers, outputs, 50 Gets a JSON-encoded layout tree of all open windows, containers, outputs,
51 workspaces, and so on. 51 workspaces, and so on.
52 52
53*get\_seats*
54 Gets a JSON-encoded list of all seats,
55 its properties and all assigned devices.
56
53*get\_marks* 57*get\_marks*
54 Get a JSON-encoded list of marks. 58 Get a JSON-encoded list of marks.
55 59