merge in latest commits

sway/commands/assign.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "criteria.h"
+#include "sway/criteria.h"
 #include "list.h"
 #include "log.h"
 

sway/commands/bar.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
 #include "log.h"
 #include "util.h"
 

sway/commands/bar/binding_mode_indicator.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) {

sway/commands/bar/bindsym.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"

sway/commands/bar/colors.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_colors(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/bar/font.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/bar/height.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_height(int argc, char **argv) {

sway/commands/bar/hidden_state.c

@@ -1,7 +1,7 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
-#include "ipc-server.h"
+#include "sway/ipc-server.h"
 #include "log.h"
 
 static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, const char *hidden_state) {

sway/commands/bar/id.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_id(int argc, char **argv) {

sway/commands/bar/mode.c

@@ -1,7 +1,7 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
-#include "ipc-server.h"
+#include "sway/ipc-server.h"
 #include "log.h"
 
 static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode) {

sway/commands/bar/modifier.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"

sway/commands/bar/output.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "list.h"
 #include "log.h"
 

sway/commands/bar/pango_markup.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {

sway/commands/bar/position.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_position(int argc, char **argv) {

sway/commands/bar/separator_symbol.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {

sway/commands/bar/status_command.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/bar/strip_workspace_numbers.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) {

sway/commands/bar/swaybar_command.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/bar/tray_output.c

@@ -1,4 +1,4 @@
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {

sway/commands/bar/tray_padding.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {

sway/commands/bar/workspace_buttons.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {

sway/commands/bar/wrap_scroll.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {

sway/commands/bind.c

@@ -1,7 +1,7 @@
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-names.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"

sway/commands/border.c

@@ -1,9 +1,9 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "focus.h"
+#include "sway/focus.h"
 
 struct cmd_results *cmd_border(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/client.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 static struct cmd_results *parse_border_color(struct border_colors *border_colors, const char *cmd_name, int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/debuglog.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *cmd_debuglog(int argc, char **argv) {

sway/commands/exec.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/exec_always.c

@@ -1,8 +1,8 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/exit.c

@@ -1,5 +1,5 @@
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
 
 void sway_terminate(int exit_code);
 

sway/commands/floating.c

@@ -1,8 +1,8 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "ipc-server.h"
+#include "sway/ipc-server.h"
-#include "layout.h"
+#include "sway/layout.h"
 #include "list.h"
 #include "log.h"
 

sway/commands/floating_maximum_size.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *cmd_floating_maximum_size(int argc, char **argv) {

sway/commands/floating_minimum_size.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *cmd_floating_minimum_size(int argc, char **argv) {

sway/commands/floating_mod.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input_state.h"
+#include "sway/input_state.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"

sway/commands/floating_scroll.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/focus.c

@@ -1,11 +1,11 @@
 #include <string.h>
 #include <wlc/wlc.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "focus.h"
+#include "sway/focus.h"
-#include "input_state.h"
+#include "sway/input_state.h"
-#include "output.h"
+#include "sway/output.h"
-#include "workspace.h"
+#include "sway/workspace.h"
 
 struct cmd_results *cmd_focus(int argc, char **argv) {
 	if (config->reading) return cmd_results_new(CMD_FAILURE, "focus", "Can't be used in config file.");

sway/commands/focus_follows_mouse.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_focus_follows_mouse(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/font.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "border.h"
+#include "sway/border.h"
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 

sway/commands/for_window.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "criteria.h"
+#include "sway/criteria.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"

sway/commands/fullscreen.c

@@ -1,11 +1,11 @@
 #include <stdbool.h>
 #include <string.h>
 #include <wlc/wlc.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "focus.h"
+#include "sway/focus.h"
-#include "ipc-server.h"
+#include "sway/ipc-server.h"
-#include "layout.h"
+#include "sway/layout.h"
 
 struct cmd_results *cmd_fullscreen(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/gaps.c

@@ -2,10 +2,10 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "focus.h"
+#include "sway/focus.h"
-#include "layout.h"
+#include "sway/layout.h"
 
 struct cmd_results *cmd_gaps(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/hide_edge_borders.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/include.c

@@ -1,5 +1,5 @@
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
 
 struct cmd_results *cmd_include(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 #include "log.h"
 
 struct cmd_results *cmd_input(int argc, char **argv) {

sway/commands/input/accel_profile.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input/click_method.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_click_method(int argc, char **argv) {

sway/commands/input/drag_lock.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input/dwt.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_dwt(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input/events.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_events(int argc, char **argv) {

sway/commands/input/middle_emulation.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input/natural_scroll.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input/pointer_accel.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input/scroll_method.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/input/tap.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "input.h"
+#include "sway/input.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_tap(int argc, char **argv) {

sway/commands/kill.c

@@ -1,6 +1,6 @@
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "focus.h"
+#include "sway/focus.h"
 
 struct cmd_results *cmd_kill(int argc, char **argv) {
 	if (config->reading) return cmd_results_new(CMD_FAILURE, "kill", "Can't be used in config file.");

sway/commands/layout.c

@@ -1,7 +1,7 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "layout.h"
+#include "sway/layout.h"
 
 struct cmd_results *cmd_layout(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/log_colors.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *cmd_log_colors(int argc, char **argv) {

sway/commands/mode.c

@@ -1,8 +1,8 @@
 #include <stdbool.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
-#include "ipc-server.h"
+#include "sway/ipc-server.h"
 #include "list.h"
 #include "log.h"
 

sway/commands/mouse_warping.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_mouse_warping(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/move.c

@@ -1,11 +1,11 @@
 #include <string.h>
 #include <wlc/wlc.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "layout.h"
+#include "sway/layout.h"
+#include "sway/output.h"
+#include "sway/workspace.h"
 #include "list.h"
-#include "output.h"
-#include "workspace.h"
 
 struct cmd_results *cmd_move(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/new_float.c

@@ -1,7 +1,7 @@
 #include <errno.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
 
 struct cmd_results *cmd_new_float(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/new_window.c

@@ -1,7 +1,7 @@
 #include <errno.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
 
 struct cmd_results *cmd_new_window(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/orientation.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_orientation(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/output.c

@@ -4,8 +4,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <wordexp.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"

sway/commands/reload.c

@@ -1,6 +1,6 @@
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
-#include "layout.h"
+#include "sway/layout.h"
 
 struct cmd_results *cmd_reload(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/resize.c

@@ -2,9 +2,9 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
+#include "sway/resize.h"
 #include "log.h"
-#include "resize.h"
 
 static struct cmd_results *cmd_resize_set(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/scratchpad.c

@@ -1,9 +1,9 @@
 #include <string.h>
 #include <wlc/wlc.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "focus.h"
+#include "sway/focus.h"
-#include "layout.h"
+#include "sway/layout.h"
 
 static swayc_t *fetch_view_from_scratchpad() {
 	if (sp_index >= scratchpad->length) {

sway/commands/seamless_mouse.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_seamless_mouse(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/set.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
 #include "list.h"
 #include "stringop.h"
 

sway/commands/smart_gaps.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_smart_gaps(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/split.c

@@ -1,10 +1,10 @@
 #include <string.h>
 #include <wlc/wlc-render.h>
-#include "border.h"
+#include "sway/border.h"
-#include "commands.h"
+#include "sway/commands.h"
-#include "container.h"
+#include "sway/container.h"
-#include "focus.h"
+#include "sway/focus.h"
-#include "layout.h"
+#include "sway/layout.h"
 #include "log.h"
 
 static struct cmd_results *_do_split(int argc, char **argv, int layout) {

sway/commands/sticky.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "focus.h"
+#include "sway/focus.h"
 
 struct cmd_results *cmd_sticky(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/workspace.c

@@ -1,10 +1,10 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
-#include "config.h"
+#include "sway/config.h"
-#include "input_state.h"
+#include "sway/input_state.h"
+#include "sway/workspace.h"
 #include "list.h"
 #include "log.h"
-#include "workspace.h"
 
 struct cmd_results *cmd_workspace(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/workspace_auto_back_and_forth.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_ws_auto_back_and_forth(int argc, char **argv) {
 	struct cmd_results *error = NULL;

sway/commands/workspace_layout.c

@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *cmd_workspace_layout(int argc, char **argv) {
 	struct cmd_results *error = NULL;