diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:27:56 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:31:11 -0400 |
commit | f4b882475eee7a81c206c7825616cc4656b2f60b (patch) | |
tree | 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /include/sway/commands.h | |
parent | Implement pid->workspace tracking (diff) | |
parent | Merge pull request #2342 from RyanDwyer/update-cursor (diff) | |
download | sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip |
Merge branch 'master' into pid-workspaces
Diffstat (limited to 'include/sway/commands.h')
-rw-r--r-- | include/sway/commands.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 7ca0bda8..f53d335a 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -79,7 +79,7 @@ void free_cmd_results(struct cmd_results *results); | |||
79 | * | 79 | * |
80 | * Free the JSON string later on. | 80 | * Free the JSON string later on. |
81 | */ | 81 | */ |
82 | const char *cmd_results_to_json(struct cmd_results *results); | 82 | char *cmd_results_to_json(struct cmd_results *results); |
83 | 83 | ||
84 | struct cmd_results *add_color(const char *name, | 84 | struct cmd_results *add_color(const char *name, |
85 | char *buffer, const char *color); | 85 | char *buffer, const char *color); |
@@ -95,7 +95,6 @@ sway_cmd cmd_client_unfocused; | |||
95 | sway_cmd cmd_client_urgent; | 95 | sway_cmd cmd_client_urgent; |
96 | sway_cmd cmd_client_placeholder; | 96 | sway_cmd cmd_client_placeholder; |
97 | sway_cmd cmd_client_background; | 97 | sway_cmd cmd_client_background; |
98 | sway_cmd cmd_clipboard; | ||
99 | sway_cmd cmd_commands; | 98 | sway_cmd cmd_commands; |
100 | sway_cmd cmd_debuglog; | 99 | sway_cmd cmd_debuglog; |
101 | sway_cmd cmd_default_border; | 100 | sway_cmd cmd_default_border; |
@@ -107,13 +106,14 @@ sway_cmd cmd_exit; | |||
107 | sway_cmd cmd_floating; | 106 | sway_cmd cmd_floating; |
108 | sway_cmd cmd_floating_maximum_size; | 107 | sway_cmd cmd_floating_maximum_size; |
109 | sway_cmd cmd_floating_minimum_size; | 108 | sway_cmd cmd_floating_minimum_size; |
110 | sway_cmd cmd_floating_mod; | 109 | sway_cmd cmd_floating_modifier; |
111 | sway_cmd cmd_floating_scroll; | 110 | sway_cmd cmd_floating_scroll; |
112 | sway_cmd cmd_focus; | 111 | sway_cmd cmd_focus; |
113 | sway_cmd cmd_focus_follows_mouse; | 112 | sway_cmd cmd_focus_follows_mouse; |
114 | sway_cmd cmd_focus_wrapping; | 113 | sway_cmd cmd_focus_wrapping; |
115 | sway_cmd cmd_font; | 114 | sway_cmd cmd_font; |
116 | sway_cmd cmd_for_window; | 115 | sway_cmd cmd_for_window; |
116 | sway_cmd cmd_force_display_urgency_hint; | ||
117 | sway_cmd cmd_force_focus_wrapping; | 117 | sway_cmd cmd_force_focus_wrapping; |
118 | sway_cmd cmd_fullscreen; | 118 | sway_cmd cmd_fullscreen; |
119 | sway_cmd cmd_gaps; | 119 | sway_cmd cmd_gaps; |
@@ -153,6 +153,7 @@ sway_cmd cmd_swaybg_command; | |||
153 | sway_cmd cmd_swap; | 153 | sway_cmd cmd_swap; |
154 | sway_cmd cmd_title_format; | 154 | sway_cmd cmd_title_format; |
155 | sway_cmd cmd_unmark; | 155 | sway_cmd cmd_unmark; |
156 | sway_cmd cmd_urgent; | ||
156 | sway_cmd cmd_workspace; | 157 | sway_cmd cmd_workspace; |
157 | sway_cmd cmd_ws_auto_back_and_forth; | 158 | sway_cmd cmd_ws_auto_back_and_forth; |
158 | sway_cmd cmd_workspace_layout; | 159 | sway_cmd cmd_workspace_layout; |
@@ -208,8 +209,10 @@ sway_cmd input_cmd_natural_scroll; | |||
208 | sway_cmd input_cmd_pointer_accel; | 209 | sway_cmd input_cmd_pointer_accel; |
209 | sway_cmd input_cmd_repeat_delay; | 210 | sway_cmd input_cmd_repeat_delay; |
210 | sway_cmd input_cmd_repeat_rate; | 211 | sway_cmd input_cmd_repeat_rate; |
212 | sway_cmd input_cmd_scroll_button; | ||
211 | sway_cmd input_cmd_scroll_method; | 213 | sway_cmd input_cmd_scroll_method; |
212 | sway_cmd input_cmd_tap; | 214 | sway_cmd input_cmd_tap; |
215 | sway_cmd input_cmd_tap_button_map; | ||
213 | sway_cmd input_cmd_xkb_layout; | 216 | sway_cmd input_cmd_xkb_layout; |
214 | sway_cmd input_cmd_xkb_model; | 217 | sway_cmd input_cmd_xkb_model; |
215 | sway_cmd input_cmd_xkb_options; | 218 | sway_cmd input_cmd_xkb_options; |