diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-02 17:00:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 17:00:33 +0200 |
| commit | 4e4d0c519140ae9c7c90e358d18bd6cd75413e30 (patch) | |
| tree | c2c92b7a400a669b7232b825bb73ddbe980f2802 | |
| parent | 90352986e0e0e527e048f9a920b222a53320be2d (diff) | |
| parent | 65593f49bc1e9061e93b6ca1bb9ca5b8b9314721 (diff) | |
Merge pull request #2749 from ianyfan/swaybar
swaybar: add leading comma to click event JSON
| -rw-r--r-- | include/swaybar/status_line.h | 1 | ||||
| -rw-r--r-- | swaybar/i3bar.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h index e6c7dac2..ca88b0c5 100644 --- a/include/swaybar/status_line.h +++ b/include/swaybar/status_line.h @@ -23,6 +23,7 @@ struct status_line { struct wl_list blocks; // i3bar_block::link bool click_events; + bool clicked; char *buffer; size_t buffer_size; size_t buffer_index; diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c index 8e9b038b..1d754808 100644 --- a/swaybar/i3bar.c +++ b/swaybar/i3bar.c @@ -260,7 +260,7 @@ bool i3bar_handle_readable(struct status_line *status) { enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, struct i3bar_block *block, int x, int y, enum x11_button button) { - wlr_log(WLR_DEBUG, "block %s clicked", block->name ? block->name : "(nil)"); + wlr_log(WLR_DEBUG, "block %s clicked", block->name); if (!block->name || !status->click_events) { return HOTSPOT_PROCESS; } @@ -276,10 +276,11 @@ enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, json_object_object_add(event_json, "button", json_object_new_int(button)); json_object_object_add(event_json, "x", json_object_new_int(x)); json_object_object_add(event_json, "y", json_object_new_int(y)); - if (dprintf(status->write_fd, "%s,\n", + if (dprintf(status->write_fd, "%s%s\n", status->clicked ? "," : "", json_object_to_json_string(event_json)) < 0) { status_error(status, "[failed to write click event]"); } + status->clicked = true; json_object_put(event_json); return HOTSPOT_IGNORE; } |