Merge branch 'master' into usr-lib

2 files changed, 30 insertions, 5 deletions

diff --git a/sway/commands/font.c b/sway/commands/font.c
index 38ad8880..8e0b51e3 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "sway/tree/arrange.h"
 #include "log.h"
 #include "stringop.h"
 
@@ -14,9 +13,6 @@ struct cmd_results *cmd_font(int argc, char **argv) {
         char *font = join_args(argv, argc);
         free(config->font);
         config->font = strdup(font);
-        config_find_font_height(true);
-        if (!config->reading) {
-                arrange_root();
-        }
+        config_update_font_height(true);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
new file mode 100644
index 00000000..3d1c578c
--- /dev/null
+++ b/sway/commands/title_format.c
@@ -0,0 +1,29 @@
+#define _POSIX_C_SOURCE 200809L
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/tree/view.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *cmd_title_format(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "title_format", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct sway_container *container =
+                config->handler_context.current_container;
+        if (container->type != C_VIEW) {
+                return cmd_results_new(CMD_INVALID, "title_format",
+                                "Only views can have a title_format");
+        }
+        struct sway_view *view = container->sway_view;
+        char *format = join_args(argv, argc);
+        if (view->title_format) {
+                free(view->title_format);
+        }
+        view->title_format = format;
+        view_update_title(view, true);
+        config_update_font_height(true);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}