5 files changed, 16 insertions, 1 deletions

diff --git a/include/sway/input_state.h b/include/sway/input_state.h
index 903301fb..fd5a3a25 100644
--- a/include/sway/input_state.h
+++ b/include/sway/input_state.h
@@ -69,7 +69,7 @@ enum modifier_state {
         MOD_STATE_RELEASED = 2
 };
 
-void pointer_position_set(struct wlc_origin *new_origin, bool force_focus);
+void pointer_position_set(double new_x, double new_y, bool force_focus);
 void center_pointer_on(swayc_t *view);
 
 // on button release unset mode depending on the button.
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 010e1f84..50d36e76 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -14,6 +14,7 @@ struct bar {
         int ipc_event_socketfd;
         int ipc_socketfd;
         int status_read_fd;
+        int status_write_fd;
         pid_t status_command_pid;
 };
 
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 9b77e8a7..0664ddee 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -13,6 +13,7 @@ struct status_line {
         list_t *block_line;
         const char *text_line;
         command_protocol protocol;
+        bool click_events;
 };
 
 struct status_block {
@@ -31,6 +32,10 @@ struct status_block {
         int border_bottom;
         int border_left;
         int border_right;
+
+        // Set during rendering
+        int x;
+        int width;
 };
 
 /**
@@ -44,6 +49,11 @@ struct status_line *init_status_line();
 bool handle_status_line(struct bar *bar);
 
 /**
+ * Handle mouse clicks.
+ */
+bool status_line_mouse_event(struct bar *bar, int x, int y, uint32_t button);
+
+/**
  * Free status line struct.
  */
 void free_status_line(struct status_line *line);
diff --git a/include/swaybar/tray/sni.h b/include/swaybar/tray/sni.h
index 83809b2d..c2544e2a 100644
--- a/include/swaybar/tray/sni.h
+++ b/include/swaybar/tray/sni.h
@@ -28,6 +28,7 @@ void sni_icon_ref_free(struct sni_icon_ref *sni_ref);
 
 /**
  * Will return a new item and get its icon. (see warning below)
+ * May return `NULL` if `name` is not valid.
  */
 struct StatusNotifierItem *sni_create(const char *name);
 
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h
index 06533108..eeed094e 100644
--- a/include/swaylock/swaylock.h
+++ b/include/swaylock/swaylock.h
@@ -56,6 +56,9 @@ struct lock_config {
                 struct lock_colors validating;
                 struct lock_colors invalid;
         } colors;
+
+        int radius;
+        int thickness;
 };
 
 void render(struct render_data* render_data, struct lock_config *config);