aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-11-04 23:30:57 +0100
committerLibravatar GitHub <noreply@github.com>2018-11-04 23:30:57 +0100
commitbcbd0a9b45ea7d8969b58183a12240e74e90f9f0 (patch)
tree0596ad56206b54e30c9323c81d326abac2216d6d
parentMerge pull request #3061 from colemickens/output-current-mode (diff)
parentdocument swaymessage type for get_seats (diff)
downloadsway-bcbd0a9b45ea7d8969b58183a12240e74e90f9f0.tar.gz
sway-bcbd0a9b45ea7d8969b58183a12240e74e90f9f0.tar.zst
sway-bcbd0a9b45ea7d8969b58183a12240e74e90f9f0.zip
Merge pull request #3067 from madblobfish/three-trivial-fixes
Improve documentation and remove dead code
-rw-r--r--completions/fish/swaymsg.fish1
-rw-r--r--sway/input/seat.c3
-rw-r--r--sway/sway.5.scd1
-rw-r--r--swaymsg/swaymsg.1.scd4
4 files changed, 6 insertions, 3 deletions
diff --git a/completions/fish/swaymsg.fish b/completions/fish/swaymsg.fish
index 1e5bf3da..fd577413 100644
--- a/completions/fish/swaymsg.fish
+++ b/completions/fish/swaymsg.fish
@@ -16,4 +16,5 @@ complete -c swaymsg -s t -l type -fra 'get_bar_config' --description "Get a JSON
16complete -c swaymsg -s t -l type -fra 'get_version' --description "Get JSON-encoded version information for the running instance of sway." 16complete -c swaymsg -s t -l type -fra 'get_version' --description "Get JSON-encoded version information for the running instance of sway."
17complete -c swaymsg -s t -l type -fra 'get_binding_modes' --description "Gets a JSON-encoded list of currently configured binding modes." 17complete -c swaymsg -s t -l type -fra 'get_binding_modes' --description "Gets a JSON-encoded list of currently configured binding modes."
18complete -c swaymsg -s t -l type -fra 'get_config' --description "Gets a JSON-encoded copy of the current configuration." 18complete -c swaymsg -s t -l type -fra 'get_config' --description "Gets a JSON-encoded copy of the current configuration."
19complete -c swaymsg -s t -l type -fra 'get_seats' --description "Gets a JSON-encoded list of all seats, its properties and all assigned devices."
19complete -c swaymsg -s t -l type -fra 'send_tick' --description "Sends a tick event to all subscribed clients." 20complete -c swaymsg -s t -l type -fra 'send_tick' --description "Sends a tick event to all subscribed clients."
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 64419afa..54fdf40b 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -55,9 +55,6 @@ void seat_destroy(struct sway_seat *seat) {
55 free(seat); 55 free(seat);
56} 56}
57 57
58static struct sway_seat_node *seat_node_from_node(
59 struct sway_seat *seat, struct sway_node *node);
60
61static void seat_node_destroy(struct sway_seat_node *seat_node) { 58static void seat_node_destroy(struct sway_seat_node *seat_node) {
62 wl_list_remove(&seat_node->destroy.link); 59 wl_list_remove(&seat_node->destroy.link);
63 wl_list_remove(&seat_node->link); 60 wl_list_remove(&seat_node->link);
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index b3d696f2..f7ca00d6 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -364,6 +364,7 @@ The default colors are:
364: #000000 364: #000000
365: #0c0c0c 365: #0c0c0c
366 366
367
367*debuglog* on|off|toggle 368*debuglog* on|off|toggle
368 Enables, disables or toggles debug logging. _toggle_ cannot be used in the 369 Enables, disables or toggles debug logging. _toggle_ cannot be used in the
369 configuration file. 370 configuration file.
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