7 files changed, 19 insertions, 0 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 7d0ff838..04f93ba9 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -198,6 +198,8 @@ sway_cmd bar_cmd_id;
 sway_cmd bar_cmd_position;
 sway_cmd bar_cmd_separator_symbol;
 sway_cmd bar_cmd_status_command;
+sway_cmd bar_cmd_status_edge_padding;
+sway_cmd bar_cmd_status_padding;
 sway_cmd bar_cmd_pango_markup;
 sway_cmd bar_cmd_strip_workspace_numbers;
 sway_cmd bar_cmd_strip_workspace_name;
diff --git a/include/sway/config.h b/include/sway/config.h
index 29c21afe..a667984d 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -232,6 +232,8 @@ struct bar_config {
         bool verbose;
         struct side_gaps gaps;
         pid_t pid;
+        int status_padding;
+        int status_edge_padding;
         struct {
                 char *background;
                 char *statusline;
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 08e749dc..8e8bf1f2 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -37,6 +37,10 @@ void input_manager_configure_xcursor(void);
 
 void input_manager_apply_input_config(struct input_config *input_config);
 
+void input_manager_reset_input(struct sway_input_device *input_device);
+
+void input_manager_reset_all_inputs();
+
 void input_manager_apply_seat_config(struct seat_config *seat_config);
 
 struct sway_seat *input_manager_get_default_seat(void);
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index ce8abde9..d2f14895 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -92,6 +92,9 @@ void seat_add_device(struct sway_seat *seat,
 void seat_configure_device(struct sway_seat *seat,
                 struct sway_input_device *device);
 
+void seat_reset_device(struct sway_seat *seat,
+                struct sway_input_device *input_device);
+
 void seat_remove_device(struct sway_seat *seat,
                 struct sway_input_device *device);
 
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index e377b8de..2d9ba0d9 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -61,6 +61,7 @@ struct swaybar_output {
         struct wl_list hotspots; // swaybar_hotspot::link
 
         char *name;
+        char *identifier;
         bool focused;
 
         uint32_t width, height;
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 1f6577bd..add0a1cf 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -43,6 +43,8 @@ struct swaybar_config {
         struct wl_list outputs; // config_output::link
         bool all_outputs;
         int height;
+        int status_padding;
+        int status_edge_padding;
         struct {
                 int top;
                 int right;
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h
index 18af7ab4..516a56f4 100644
--- a/include/swaylock/swaylock.h
+++ b/include/swaylock/swaylock.h
@@ -22,6 +22,7 @@ enum auth_state {
 struct swaylock_colorset {
         uint32_t input;
         uint32_t cleared;
+        uint32_t caps_lock;
         uint32_t verifying;
         uint32_t wrong;
 };
@@ -30,6 +31,8 @@ struct swaylock_colors {
         uint32_t background;
         uint32_t bs_highlight;
         uint32_t key_highlight;
+        uint32_t caps_lock_bs_highlight;
+        uint32_t caps_lock_key_highlight;
         uint32_t separator;
         struct swaylock_colorset inside;
         struct swaylock_colorset line;
@@ -45,6 +48,8 @@ struct swaylock_args {
         uint32_t thickness;
         bool ignore_empty;
         bool show_indicator;
+        bool show_caps_lock_text;
+        bool show_caps_lock_indicator;
         bool daemonize;
 };