3 files changed, 13 insertions, 6 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index b0339313..eb446eae 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -172,7 +172,10 @@ sway_cmd cmd_swaybg_command;
 sway_cmd cmd_swaynag_command;
 sway_cmd cmd_swap;
 sway_cmd cmd_tiling_drag;
+sway_cmd cmd_title_align;
 sway_cmd cmd_title_format;
+sway_cmd cmd_titlebar_border_thickness;
+sway_cmd cmd_titlebar_padding;
 sway_cmd cmd_unmark;
 sway_cmd cmd_urgent;
 sway_cmd cmd_workspace;
diff --git a/include/sway/config.h b/include/sway/config.h
index 4927b8e0..1ff9a104 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -357,6 +357,12 @@ enum mouse_warping_mode {
         WARP_CONTAINER
 };
 
+enum alignment {
+        ALIGN_LEFT,
+        ALIGN_CENTER,
+        ALIGN_RIGHT
+};
+
 /**
  * The configuration struct. The result of loading a config file.
  */
@@ -391,6 +397,9 @@ struct sway_config {
         size_t font_height;
         size_t font_baseline;
         bool pango_markup;
+        int titlebar_border_thickness;
+        int titlebar_h_padding;
+        int titlebar_v_padding;
         size_t urgent_timeout;
         enum sway_fowa focus_on_window_activation;
         enum sway_popup_during_fullscreen popup_during_fullscreen;
@@ -406,6 +415,7 @@ struct sway_config {
         bool validating;
         bool auto_back_and_forth;
         bool show_marks;
+        enum alignment title_align;
         bool tiling_drag;
 
         bool smart_gaps;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index f907aad2..1d0a0ad1 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -10,12 +10,6 @@
 struct sway_view;
 struct sway_seat;
 
-#define TITLEBAR_BORDER_THICKNESS 1
-
-// Padding includes titlebar border
-#define TITLEBAR_H_PADDING 3
-#define TITLEBAR_V_PADDING 4
-
 enum sway_container_layout {
         L_NONE,
         L_HORIZ,