Merge branch 'master' into bar-bindsym

1 files changed, 5 insertions, 3 deletions

diff --git a/sway/commands/mouse_warping.c b/sway/commands/mouse_warping.c
index eef32ce7..d067bc65 100644
--- a/sway/commands/mouse_warping.c
+++ b/sway/commands/mouse_warping.c
@@ -6,13 +6,15 @@ struct cmd_results *cmd_mouse_warping(int argc, char **argv) {
 	struct cmd_results *error = NULL;
 	if ((error = checkarg(argc, "mouse_warping", EXPECTED_EQUAL_TO, 1))) {
 		return error;
+	} else if (strcasecmp(argv[0], "container") == 0) {
+		config->mouse_warping = WARP_CONTAINER;
 	} else if (strcasecmp(argv[0], "output") == 0) {
-		config->mouse_warping = true;
+		config->mouse_warping = WARP_OUTPUT;
 	} else if (strcasecmp(argv[0], "none") == 0) {
-		config->mouse_warping = false;
+		config->mouse_warping = WARP_NO;
 	} else {
 		return cmd_results_new(CMD_FAILURE, "mouse_warping",
-				"Expected 'mouse_warping output|none'");
+				"Expected 'mouse_warping output|container|none'");
 	}
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }