itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2749 from ianyfan/swaybar

Browse Source 
swaybar: add leading comma to click event JSON
master
Drew DeVault 6 years ago committed by GitHub
parent 90352986e0 65593f49bc
commit 4e4d0c5191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

1
include/swaybar/status_line.h
Unescape View File

@ -23,6 +23,7 @@ struct status_line {
struct wl_list blocks; // i3bar_block::link struct wl_list blocks; // i3bar_block::link
bool click_events; bool click_events;
bool clicked;
char *buffer; char *buffer;
size_t buffer_size; size_t buffer_size;
size_t buffer_index; size_t buffer_index;

5
swaybar/i3bar.c
Unescape View File

@ -260,7 +260,7 @@ bool i3bar_handle_readable(struct status_line *status) {
enum hotspot_event_handling i3bar_block_send_click(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) { 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) { if (!block->name || !status->click_events) {
return HOTSPOT_PROCESS; 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, "button", json_object_new_int(button));
json_object_object_add(event_json, "x", json_object_new_int(x)); json_object_object_add(event_json, "x", json_object_new_int(x));
json_object_object_add(event_json, "y", json_object_new_int(y)); 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) { json_object_to_json_string(event_json)) < 0) {
status_error(status, "[failed to write click event]"); status_error(status, "[failed to write click event]");
} }
status->clicked = true;
json_object_put(event_json); json_object_put(event_json);
return HOTSPOT_IGNORE; return HOTSPOT_IGNORE;
} }

Write Preview
Loading…
Cancel
Save