Demarcate i3bar JSON into individual updates

1 files changed, 47 insertions, 2 deletions

diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 6c595df0..3b93e28f 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -7,10 +7,52 @@
 
 enum status_protocol {
         PROTOCOL_UNDEF,
+        PROTOCOL_ERROR,
         PROTOCOL_TEXT,
         PROTOCOL_I3BAR,
 };
 
+struct text_protocol_state {
+        char *buffer;
+        size_t buffer_size;
+};
+
+enum json_node_type {
+        JSON_NODE_UNKNOWN,
+        JSON_NODE_ARRAY,
+        JSON_NODE_STRING,
+};
+
+struct i3bar_protocol_state {
+        bool click_events;
+        char *buffer;
+        size_t buffer_size;
+        size_t buffer_index;
+        const char *current_node;
+        bool escape;
+        size_t depth;
+        enum json_node_type nodes[16];
+};
+
+struct i3bar_block {
+        struct wl_list link;
+        char *full_text, *short_text, *align;
+        bool urgent;
+        uint32_t color;
+        int min_width;
+        char *name, *instance;
+        bool separator;
+        int separator_block_width;
+        bool markup;
+        // Airblader features
+        uint32_t background;
+        uint32_t border;
+        int border_top;
+        int border_bottom;
+        int border_left;
+        int border_right;
+};
+
 struct status_line {
         pid_t pid;
         int read_fd, write_fd;
@@ -18,13 +60,16 @@ struct status_line {
 
         enum status_protocol protocol;
         const char *text;
+        struct wl_list blocks; // i3bar_block::link
 
-        char *buffer;
-        size_t buffer_size;
+        struct text_protocol_state text_state;
+        struct i3bar_protocol_state i3bar_state;
 };
 
 struct status_line *status_line_init(char *cmd);
 void status_line_free(struct status_line *status);
 bool handle_status_readable(struct status_line *status);
+int i3bar_readable(struct status_line *status);
+void status_error(struct status_line *status, const char *text);
 
 #endif