nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add relative coordinates in JSON for i3bar click events (fixes #2767) 

Add support for relative coordinates in i3bar click events

Rename {x,y}_rel to relative_{x,y}

Update i3bar-protocol doc to mention the added fields in click events
This commit is contained in:
Pallav Agarwal 2017-12-20 17:49:38 +05:30
parent eb227c2332
commit 161db6f17d
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/i3bar-protocol
View File

@ -236,6 +236,11 @@ x, y::
X11 root window coordinates where the click occurred X11 root window coordinates where the click occurred
button:: button::
X11 button ID (for example 1 to 3 for left/middle/right mouse button) X11 button ID (for example 1 to 3 for left/middle/right mouse button)
relative_x, relative_y::
Coordinates where the click occurred, with respect to the top left corner
of the block
width, height::
Width and height (in px) of the block
*Example*: *Example*:
------------------------------------------ ------------------------------------------
@ -244,6 +249,10 @@ button::
"instance": "eth0", "instance": "eth0",
"button": 1, "button": 1,
"x": 1320, "x": 1320,
"y": 1400 "y": 1400,
"relative_x": 12,
"relative_y": 8,
"width": 50,
"height": 22
} }
------------------------------------------ ------------------------------------------

2
i3bar/include/child.h
View File

@ -85,4 +85,4 @@ bool child_want_click_events(void);
* Generates a click event, if enabled. * Generates a click event, if enabled.
* *
*/ */
void send_block_clicked(int button, const char *name, const char *instance, int x, int y); void send_block_clicked(int button, const char *name, const char *instance, int x, int y, int x_rel, int y_rel, int width, int height);

14
i3bar/src/child.c
View File

@ -596,7 +596,7 @@ void child_click_events_key(const char *key) {
* Generates a click event, if enabled. * Generates a click event, if enabled.
* *
*/ */
void send_block_clicked(int button, const char *name, const char *instance, int x, int y) { void send_block_clicked(int button, const char *name, const char *instance, int x, int y, int x_rel, int y_rel, int width, int height) {
if (!child.click_events) { if (!child.click_events) {
return; return;
} }
@ -624,6 +624,18 @@ void send_block_clicked(int button, const char *name, const char *instance, int
child_click_events_key("y"); child_click_events_key("y");
yajl_gen_integer(gen, y); yajl_gen_integer(gen, y);
child_click_events_key("relative_x");
yajl_gen_integer(gen, x_rel);
child_click_events_key("relative_y");
yajl_gen_integer(gen, y_rel);
child_click_events_key("width");
yajl_gen_integer(gen, width);
child_click_events_key("height");
yajl_gen_integer(gen, height);
yajl_gen_map_close(gen); yajl_gen_map_close(gen);
child_write_output(); child_write_output();
} }

3
i3bar/src/xcb.c
View File

@ -523,7 +523,8 @@ void handle_button(xcb_button_press_event_t *event) {
block_x += render->width + render->x_offset + render->x_append + get_sep_offset(block) + sep_offset_remainder; block_x += render->width + render->x_offset + render->x_append + get_sep_offset(block) + sep_offset_remainder;
if (statusline_x <= block_x && statusline_x >= last_block_x) { if (statusline_x <= block_x && statusline_x >= last_block_x) {
send_block_clicked(event->detail, block->name, block->instance, event->root_x, event->root_y); send_block_clicked(event->detail, block->name, block->instance,
event->root_x, event->root_y, statusline_x - last_block_x, event->event_y, block_x - last_block_x, bar_height);
return; return;
} }