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

This commit is contained in:
sghctoma 2018-09-03 08:57:17 +02:00
commit df730a8891
22 changed files with 173 additions and 34 deletions

View file

@ -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 },