deprecate new_window and new_float commands

4 files changed, 95 insertions, 78 deletions

diff --git a/sway/commands/default_border.c b/sway/commands/default_border.c
new file mode 100644
index 00000000..f7710b03
--- /dev/null
+++ b/sway/commands/default_border.c
@@ -0,0 +1,43 @@
+#include <errno.h>
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/container.h"
+
+struct cmd_results *cmd_default_border(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "default_border", EXPECTED_AT_LEAST, 1))) {
+		return error;
+	}
+
+	if (argc > 2) {
+		return cmd_results_new(CMD_INVALID, "default_border",
+			"Expected 'default_border <normal|none|pixel> [<n>]");
+	}
+
+	enum swayc_border_types border = config->border;
+	int thickness = config->border_thickness;
+
+	if (strcasecmp(argv[0], "none") == 0) {
+		border = B_NONE;
+	} else if (strcasecmp(argv[0], "normal") == 0) {
+		border = B_NORMAL;
+	} else if (strcasecmp(argv[0], "pixel") == 0) {
+		border = B_PIXEL;
+	} else {
+		return cmd_results_new(CMD_INVALID, "default_border",
+			"Expected 'default_border <normal|none|pixel> [<n>]");
+	}
+
+	if (argc == 2 && (border == B_NORMAL || border == B_PIXEL)) {
+		thickness = (int)strtol(argv[1], NULL, 10);
+		if (errno == ERANGE || thickness < 0) {
+			errno = 0;
+			return cmd_results_new(CMD_INVALID, "default_border", "Number is out out of range.");
+		}
+	}
+
+	config->border = border;
+	config->border_thickness = thickness;
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/default_floating_border.c b/sway/commands/default_floating_border.c
new file mode 100644
index 00000000..bbd9b0e0
--- /dev/null
+++ b/sway/commands/default_floating_border.c
@@ -0,0 +1,44 @@
+#include <errno.h>
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/container.h"
+
+struct cmd_results *cmd_default_floating_border(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "default_floating_border", EXPECTED_AT_LEAST, 1))) {
+		return error;
+	}
+
+	if (argc > 2) {
+		return cmd_results_new(CMD_INVALID, "default_floating_border",
+			"Expected 'default_floating_border <normal|none|pixel> [<n>]");
+	}
+
+	enum swayc_border_types border = config->floating_border;
+	int thickness = config->floating_border_thickness;
+
+	if (strcasecmp(argv[0], "none") == 0) {
+		border = B_NONE;
+	} else if (strcasecmp(argv[0], "normal") == 0) {
+		border = B_NORMAL;
+	} else if (strcasecmp(argv[0], "pixel") == 0) {
+		border = B_PIXEL;
+	} else {
+		return cmd_results_new(CMD_INVALID, "default_floating_border",
+			"Expected 'default_floating_border <normal|none|pixel> [<n>]");
+	}
+
+	if (argc == 2 && (border == B_NORMAL || border == B_PIXEL)) {
+		thickness = (int)strtol(argv[1], NULL, 10);
+		if (errno == ERANGE || thickness < 0) {
+			errno = 0;
+			return cmd_results_new(CMD_INVALID, "default_floating_border",
+				"Number is out out of range.");
+		}
+	}
+
+	config->floating_border = border;
+	config->floating_border_thickness = thickness;
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/new_float.c b/sway/commands/new_float.c
index 8e4e354f..d0f96093 100644
--- a/sway/commands/new_float.c
+++ b/sway/commands/new_float.c
@@ -1,43 +1,8 @@
-#include <errno.h>
-#include <string.h>
+#include "log.h"
 #include "sway/commands.h"
-#include "sway/container.h"
 
 struct cmd_results *cmd_new_float(int argc, char **argv) {
-	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "new_float", EXPECTED_AT_LEAST, 1))) {
-		return error;
-	}
-
-	if (argc > 2) {
-		return cmd_results_new(CMD_INVALID, "new_float",
-			"Expected 'new_float <normal|none|pixel> [<n>]");
-	}
-
-	enum swayc_border_types border = config->floating_border;
-	int thickness = config->floating_border_thickness;
-
-	if (strcasecmp(argv[0], "none") == 0) {
-		border = B_NONE;
-	} else if (strcasecmp(argv[0], "normal") == 0) {
-		border = B_NORMAL;
-	} else if (strcasecmp(argv[0], "pixel") == 0) {
-		border = B_PIXEL;
-	} else {
-		return cmd_results_new(CMD_INVALID, "new_float",
-			"Expected 'border <normal|none|pixel>");
-	}
-
-	if (argc == 2 && (border == B_NORMAL || border == B_PIXEL)) {
-		thickness = (int)strtol(argv[1], NULL, 10);
-		if (errno == ERANGE || thickness < 0) {
-			errno = 0;
-			return cmd_results_new(CMD_INVALID, "new_float", "Number is out out of range.");
-		}
-	}
-
-	config->floating_border = border;
-	config->floating_border_thickness = thickness;
-
-	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+	sway_log(L_INFO, "`new_float` is deprecated and will be removed in the future. "
+		"Please use `default_floating_border` instead.");
+	return cmd_default_floating_border(argc, argv);
 }
diff --git a/sway/commands/new_window.c b/sway/commands/new_window.c
index 423b5af0..574a4527 100644
--- a/sway/commands/new_window.c
+++ b/sway/commands/new_window.c
@@ -1,43 +1,8 @@
-#include <errno.h>
-#include <string.h>
+#include "log.h"
 #include "sway/commands.h"
-#include "sway/container.h"
 
 struct cmd_results *cmd_new_window(int argc, char **argv) {
-	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "new_window", EXPECTED_AT_LEAST, 1))) {
-		return error;
-	}
-
-	if (argc > 2) {
-		return cmd_results_new(CMD_INVALID, "new_window",
-			"Expected 'new_window <normal|none|pixel> [<n>]");
-	}
-
-	enum swayc_border_types border = config->border;
-	int thickness = config->border_thickness;
-
-	if (strcasecmp(argv[0], "none") == 0) {
-		border = B_NONE;
-	} else if (strcasecmp(argv[0], "normal") == 0) {
-		border = B_NORMAL;
-	} else if (strcasecmp(argv[0], "pixel") == 0) {
-		border = B_PIXEL;
-	} else {
-		return cmd_results_new(CMD_INVALID, "new_window",
-			"Expected 'border <normal|none|pixel>");
-	}
-
-	if (argc == 2 && (border == B_NORMAL || border == B_PIXEL)) {
-		thickness = (int)strtol(argv[1], NULL, 10);
-		if (errno == ERANGE || thickness < 0) {
-			errno = 0;
-			return cmd_results_new(CMD_INVALID, "new_window", "Number is out out of range.");
-		}
-	}
-
-	config->border = border;
-	config->border_thickness = thickness;
-
-	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+	sway_log(L_INFO, "`new_window` is deprecated and will be removed in the future. "
+		"Please use `default_border` instead.");
+	return cmd_default_border(argc, argv);
 }