Merge branch 'master' into criteria-commands

5 files changed, 7 insertions, 1 deletions

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 0037190b..af478f33 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -79,4 +79,6 @@ void bar_setup(struct swaybar *bar,
 void bar_run(struct swaybar *bar);
 void bar_teardown(struct swaybar *bar);
 
+void free_workspaces(struct wl_list *list);
+
 #endif
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 7f321df8..6739c28a 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -29,7 +29,7 @@ struct swaybar_config {
         bool binding_mode_indicator;
         bool wrap_scroll;
         bool workspace_buttons;
-        struct wl_list outputs;
+        struct wl_list outputs; // config_output::link
         bool all_outputs;
         int height;
 
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 3538f49c..bf12a842 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -73,5 +73,6 @@ void status_line_free(struct status_line *status);
 bool i3bar_handle_readable(struct status_line *status);
 void i3bar_block_send_click(struct status_line *status,
                 struct i3bar_block *block, int x, int y, uint32_t button);
+void i3bar_block_free(struct i3bar_block *block);
 
 #endif
diff --git a/include/swaylock/seat.h b/include/swaylock/seat.h
index 44bc37d5..180ea7a0 100644
--- a/include/swaylock/seat.h
+++ b/include/swaylock/seat.h
@@ -27,6 +27,7 @@ enum mask {
 
 struct swaylock_xkb {
         uint32_t modifiers;
+        bool caps_lock;
         struct xkb_state *state;
         struct xkb_context *context;
         struct xkb_keymap *keymap;
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h
index ed9fea19..07b908d7 100644
--- a/include/swaylock/swaylock.h
+++ b/include/swaylock/swaylock.h
@@ -11,7 +11,9 @@
 
 enum auth_state {
     AUTH_STATE_IDLE,
+    AUTH_STATE_CLEAR,
     AUTH_STATE_INPUT,
+    AUTH_STATE_INPUT_NOP,
     AUTH_STATE_BACKSPACE,
     AUTH_STATE_VALIDATING,
     AUTH_STATE_INVALID,