diff options
Diffstat (limited to 'swaybar/i3bar.c')
-rw-r--r-- | swaybar/i3bar.c | 205 |
1 files changed, 127 insertions, 78 deletions
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c index 0becae5d..88404703 100644 --- a/swaybar/i3bar.c +++ b/swaybar/i3bar.c | |||
@@ -1,6 +1,7 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #include <json-c/json.h> | 2 | #include <json-c/json.h> |
3 | #include <linux/input-event-codes.h> | 3 | #include <linux/input-event-codes.h> |
4 | #include <ctype.h> | ||
4 | #include <stdlib.h> | 5 | #include <stdlib.h> |
5 | #include <string.h> | 6 | #include <string.h> |
6 | #include <unistd.h> | 7 | #include <unistd.h> |
@@ -24,24 +25,19 @@ void i3bar_block_unref(struct i3bar_block *block) { | |||
24 | } | 25 | } |
25 | } | 26 | } |
26 | 27 | ||
27 | static bool i3bar_parse_json(struct status_line *status, const char *text) { | 28 | static void i3bar_parse_json(struct status_line *status, |
29 | struct json_object *json_array) { | ||
28 | struct i3bar_block *block, *tmp; | 30 | struct i3bar_block *block, *tmp; |
29 | wl_list_for_each_safe(block, tmp, &status->blocks, link) { | 31 | wl_list_for_each_safe(block, tmp, &status->blocks, link) { |
30 | wl_list_remove(&block->link); | 32 | wl_list_remove(&block->link); |
31 | i3bar_block_unref(block); | 33 | i3bar_block_unref(block); |
32 | } | 34 | } |
33 | json_object *results = json_tokener_parse(text); | 35 | for (size_t i = 0; i < json_object_array_length(json_array); ++i) { |
34 | if (!results) { | ||
35 | status_error(status, "[failed to parse i3bar json]"); | ||
36 | return false; | ||
37 | } | ||
38 | wlr_log(WLR_DEBUG, "Got i3bar json: '%s'", text); | ||
39 | for (size_t i = 0; i < json_object_array_length(results); ++i) { | ||
40 | json_object *full_text, *short_text, *color, *min_width, *align, *urgent; | 36 | json_object *full_text, *short_text, *color, *min_width, *align, *urgent; |
41 | json_object *name, *instance, *separator, *separator_block_width; | 37 | json_object *name, *instance, *separator, *separator_block_width; |
42 | json_object *background, *border, *border_top, *border_bottom; | 38 | json_object *background, *border, *border_top, *border_bottom; |
43 | json_object *border_left, *border_right, *markup; | 39 | json_object *border_left, *border_right, *markup; |
44 | json_object *json = json_object_array_get_idx(results, i); | 40 | json_object *json = json_object_array_get_idx(json_array, i); |
45 | if (!json) { | 41 | if (!json) { |
46 | continue; | 42 | continue; |
47 | } | 43 | } |
@@ -110,96 +106,149 @@ static bool i3bar_parse_json(struct status_line *status, const char *text) { | |||
110 | json_object_get_int(border_right) : 1; | 106 | json_object_get_int(border_right) : 1; |
111 | wl_list_insert(&status->blocks, &block->link); | 107 | wl_list_insert(&status->blocks, &block->link); |
112 | } | 108 | } |
113 | json_object_put(results); | ||
114 | return true; | ||
115 | } | 109 | } |
116 | 110 | ||
117 | bool i3bar_handle_readable(struct status_line *status) { | 111 | bool i3bar_handle_readable(struct status_line *status) { |
118 | struct i3bar_protocol_state *state = &status->i3bar_state; | 112 | while (!status->started) { // look for opening bracket |
119 | 113 | for (size_t c = 0; c < status->buffer_index; ++c) { | |
120 | char *cur = &state->buffer[state->buffer_index]; | 114 | if (status->buffer[c] == '[') { |
121 | ssize_t n = read(status->read_fd, cur, | 115 | status->started = true; |
122 | state->buffer_size - state->buffer_index); | 116 | status->buffer_index -= ++c; |
123 | if (n == -1) { | 117 | memmove(status->buffer, &status->buffer[c], status->buffer_index); |
124 | status_error(status, "[failed to read from status command]"); | 118 | break; |
125 | return false; | 119 | } else if (!isspace(status->buffer[c])) { |
126 | } | 120 | status_error(status, "[invalid json]"); |
121 | return true; | ||
122 | } | ||
123 | } | ||
124 | if (status->started) { | ||
125 | break; | ||
126 | } | ||
127 | 127 | ||
128 | if (n == (ssize_t)(state->buffer_size - state->buffer_index)) { | 128 | errno = 0; |
129 | state->buffer_size = state->buffer_size * 2; | 129 | ssize_t read_bytes = read(status->read_fd, status->buffer, status->buffer_size); |
130 | char *new_buffer = realloc(state->buffer, state->buffer_size); | 130 | if (read_bytes > -1) { |
131 | if (!new_buffer) { | 131 | status->buffer_index = read_bytes; |
132 | free(state->buffer); | 132 | } else if (errno == EAGAIN) { |
133 | status_error(status, "[failed to allocate buffer]"); | 133 | return false; |
134 | } else { | ||
135 | status_error(status, "[error reading from status command]"); | ||
134 | return true; | 136 | return true; |
135 | } | 137 | } |
136 | state->current_node += new_buffer - state->buffer; | ||
137 | cur += new_buffer - state->buffer; | ||
138 | state->buffer = new_buffer; | ||
139 | } | 138 | } |
140 | 139 | ||
141 | cur[n] = '\0'; | 140 | struct json_object *last_object = NULL; |
142 | bool redraw = false; | 141 | struct json_object *test_object; |
143 | while (*cur) { | 142 | size_t buffer_pos = 0; |
144 | if (state->nodes[state->depth] == JSON_NODE_STRING) { | 143 | while (true) { |
145 | if (!state->escape && *cur == '"') { | 144 | // since the incoming stream is an infinite array |
146 | --state->depth; | 145 | // parsing is split into two parts |
146 | // first, attempt to parse the current object, reading more if the | ||
147 | // parser indicates that the current object is incomplete, and failing | ||
148 | // if the parser fails | ||
149 | // second, look for separating comma, ignoring whitespace, failing if | ||
150 | // any other characters are encountered | ||
151 | if (status->expecting_comma) { | ||
152 | for (; buffer_pos < status->buffer_index; ++buffer_pos) { | ||
153 | if (status->buffer[buffer_pos] == ',') { | ||
154 | status->expecting_comma = false; | ||
155 | ++buffer_pos; | ||
156 | break; | ||
157 | } else if (!isspace(status->buffer[buffer_pos])) { | ||
158 | status_error(status, "[invalid i3bar json]"); | ||
159 | return true; | ||
160 | } | ||
161 | } | ||
162 | if (buffer_pos < status->buffer_index) { | ||
163 | continue; // look for new object without reading more input | ||
147 | } | 164 | } |
148 | state->escape = !state->escape && *cur == '\\'; | 165 | buffer_pos = status->buffer_index = 0; |
149 | } else { | 166 | } else { |
150 | switch (*cur) { | 167 | test_object = json_tokener_parse_ex(status->tokener, |
151 | case '[': | 168 | &status->buffer[buffer_pos], status->buffer_index - buffer_pos); |
152 | ++state->depth; | 169 | if (json_tokener_get_error(status->tokener) == json_tokener_success) { |
153 | if (state->depth > | 170 | if (json_object_get_type(test_object) == json_type_array) { |
154 | sizeof(state->nodes) / sizeof(state->nodes[0])) { | 171 | if (last_object) { |
155 | status_error(status, "[i3bar json too deep]"); | 172 | json_object_put(last_object); |
156 | return false; | 173 | } |
157 | } | 174 | last_object = test_object; |
158 | state->nodes[state->depth] = JSON_NODE_ARRAY; | 175 | } else { |
159 | if (state->depth == 1) { | 176 | json_object_put(test_object); |
160 | state->current_node = cur; | ||
161 | } | 177 | } |
162 | break; | 178 | |
163 | case ']': | 179 | // in order to print the json for debugging purposes |
164 | if (state->nodes[state->depth] != JSON_NODE_ARRAY) { | 180 | // the last character is temporarily replaced with a null character |
165 | status_error(status, "[failed to parse i3bar json]"); | 181 | // (the last character is used in case the buffer is full) |
166 | return false; | 182 | char *last_char_pos = |
183 | &status->buffer[buffer_pos + status->tokener->char_offset - 1]; | ||
184 | char last_char = *last_char_pos; | ||
185 | while (isspace(last_char)) { | ||
186 | last_char = *--last_char_pos; | ||
167 | } | 187 | } |
168 | --state->depth; | 188 | *last_char_pos = '\0'; |
169 | if (state->depth == 0) { | 189 | size_t offset = strspn(&status->buffer[buffer_pos], " \f\n\r\t\v"); |
170 | // cur[1] is valid since cur[0] != '\0' | 190 | wlr_log(WLR_DEBUG, "Received i3bar json: '%s%c'", |
171 | char p = cur[1]; | 191 | &status->buffer[buffer_pos + offset], last_char); |
172 | cur[1] = '\0'; | 192 | *last_char_pos = last_char; |
173 | redraw = i3bar_parse_json( | 193 | |
174 | status, state->current_node) || redraw; | 194 | buffer_pos += status->tokener->char_offset; |
175 | cur[1] = p; | 195 | status->expecting_comma = true; |
176 | memmove(state->buffer, cur, | 196 | |
177 | state->buffer_size - (cur - state->buffer)); | 197 | if (buffer_pos < status->buffer_index) { |
178 | cur = state->buffer; | 198 | continue; // look for comma without reading more input |
179 | state->current_node = cur + 1; | ||
180 | } | 199 | } |
181 | break; | 200 | buffer_pos = status->buffer_index = 0; |
182 | case '"': | 201 | } else if (json_tokener_get_error(status->tokener) == json_tokener_continue) { |
183 | ++state->depth; | 202 | if (status->buffer_index < status->buffer_size) { |
184 | if (state->depth > | 203 | // move the object to the start of the buffer |
185 | sizeof(state->nodes) / sizeof(state->nodes[0])) { | 204 | status->buffer_index -= buffer_pos; |
186 | status_error(status, "[i3bar json too deep]"); | 205 | memmove(status->buffer, &status->buffer[buffer_pos], |
187 | return false; | 206 | status->buffer_index); |
207 | } else { | ||
208 | // expand buffer | ||
209 | status->buffer_size *= 2; | ||
210 | char *new_buffer = realloc(status->buffer, status->buffer_size); | ||
211 | if (new_buffer) { | ||
212 | status->buffer = new_buffer; | ||
213 | } else { | ||
214 | free(status->buffer); | ||
215 | status_error(status, "[failed to allocate buffer]"); | ||
216 | return true; | ||
217 | } | ||
188 | } | 218 | } |
189 | state->nodes[state->depth] = JSON_NODE_STRING; | 219 | } else { |
190 | break; | 220 | status_error(status, "[failed to parse i3bar json]"); |
221 | return true; | ||
191 | } | 222 | } |
192 | } | 223 | } |
193 | ++cur; | 224 | |
225 | errno = 0; | ||
226 | ssize_t read_bytes = read(status->read_fd, &status->buffer[status->buffer_index], | ||
227 | status->buffer_size - status->buffer_index); | ||
228 | if (read_bytes > -1) { | ||
229 | status->buffer_index += read_bytes; | ||
230 | } else if (errno == EAGAIN) { | ||
231 | break; | ||
232 | } else { | ||
233 | status_error(status, "[error reading from status command]"); | ||
234 | return true; | ||
235 | } | ||
236 | } | ||
237 | |||
238 | if (last_object) { | ||
239 | wlr_log(WLR_DEBUG, "Rendering last received json"); | ||
240 | i3bar_parse_json(status, last_object); | ||
241 | json_object_put(last_object); | ||
242 | return true; | ||
243 | } else { | ||
244 | return false; | ||
194 | } | 245 | } |
195 | state->buffer_index = cur - state->buffer; | ||
196 | return redraw; | ||
197 | } | 246 | } |
198 | 247 | ||
199 | enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, | 248 | enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, |
200 | struct i3bar_block *block, int x, int y, enum x11_button button) { | 249 | struct i3bar_block *block, int x, int y, enum x11_button button) { |
201 | wlr_log(WLR_DEBUG, "block %s clicked", block->name ? block->name : "(nil)"); | 250 | wlr_log(WLR_DEBUG, "block %s clicked", block->name ? block->name : "(nil)"); |
202 | if (!block->name || !status->i3bar_state.click_events) { | 251 | if (!block->name || !status->click_events) { |
203 | return HOTSPOT_PROCESS; | 252 | return HOTSPOT_PROCESS; |
204 | } | 253 | } |
205 | 254 | ||
@@ -214,7 +263,7 @@ enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, | |||
214 | json_object_object_add(event_json, "button", json_object_new_int(button)); | 263 | json_object_object_add(event_json, "button", json_object_new_int(button)); |
215 | json_object_object_add(event_json, "x", json_object_new_int(x)); | 264 | json_object_object_add(event_json, "x", json_object_new_int(x)); |
216 | json_object_object_add(event_json, "y", json_object_new_int(y)); | 265 | json_object_object_add(event_json, "y", json_object_new_int(y)); |
217 | if (dprintf(status->write_fd, "%s\n", | 266 | if (dprintf(status->write_fd, "%s,\n", |
218 | json_object_to_json_string(event_json)) < 0) { | 267 | json_object_to_json_string(event_json)) < 0) { |
219 | status_error(status, "[failed to write click event]"); | 268 | status_error(status, "[failed to write click event]"); |
220 | } | 269 | } |