Merge remote-tracking branch 'upstream/master' into fix-freebsd-build

1 files changed, 3 insertions, 0 deletions

diff --git a/sway/commands.c b/sway/commands.c
index f321a874..9e0fda55 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -106,6 +106,7 @@ static struct cmd_handler handlers[] = {
         { "floating_modifier", cmd_floating_modifier },
         { "focus", cmd_focus },
         { "focus_follows_mouse", cmd_focus_follows_mouse },
+        { "focus_on_window_activation", cmd_focus_on_window_activation },
         { "focus_wrapping", cmd_focus_wrapping },
         { "font", cmd_font },
         { "for_window", cmd_for_window },
@@ -118,6 +119,8 @@ static struct cmd_handler handlers[] = {
         { "input", cmd_input },
         { "mode", cmd_mode },
         { "mouse_warping", cmd_mouse_warping },
+        { "new_float", cmd_default_floating_border },
+        { "new_window", cmd_default_border },
         { "no_focus", cmd_no_focus },
         { "output", cmd_output },
         { "seat", cmd_seat },