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

i3bar: Send mouse wheel events to child too 

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2014-03-13 13:58:15 +01:00 committed by Michael Stapelberg
parent 0c3735fc23
commit eb7537e53d
3 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3bar/include/child.h
View File

@ -73,6 +73,12 @@ void stop_child(void);
*/
void cont_child(void);
/*
* Whether or not the child want click events
*
*/
bool child_want_click_events(void);
/*
* Generates a click event, if enabled.
*

8
i3bar/src/child.c
View File

@ -624,3 +624,11 @@ void cont_child(void) {
killpg(child.pid, child.cont_signal);
}
}
/*
* Whether or not the child want click events
*
*/
bool child_want_click_events(void) {
return child.click_events;
}

75
i3bar/src/xcb.c
View File

@ -330,6 +330,39 @@ void handle_button(xcb_button_press_event_t *event) {
DLOG("Got Button %d\n", event->detail);
if (child_want_click_events()) {
/* If the child asked for click events,
* check if a status block has been clicked. */
/* First calculate width of tray area */
trayclient *trayclient;
int tray_width = 0;
TAILQ_FOREACH_REVERSE(trayclient, walk->trayclients, tc_head, tailq) {
if (!trayclient->mapped)
continue;
tray_width += (font.height + 2);
}
int block_x = 0, last_block_x;
int offset = (walk->rect.w - (statusline_width + tray_width)) - 10;
x = original_x - offset;
if (x >= 0) {
struct status_block *block;
TAILQ_FOREACH(block, &statusline_head, blocks) {
last_block_x = block_x;
block_x += block->width + block->x_offset + block->x_append;
if (x <= block_x && x >= last_block_x) {
send_block_clicked(event->detail, block->name, block->instance, event->root_x, event->root_y);
return;
}
}
}
x = original_x;
}
switch (event->detail) {
case 4:
/* Mouse wheel up. We select the previous ws, if any.
@ -351,7 +384,7 @@ void handle_button(xcb_button_press_event_t *event) {
cur_ws = TAILQ_NEXT(cur_ws, tailq);
break;
default:
case 1:
/* Check if this event regards a workspace button */
TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) {
DLOG("x = %d\n", x);
@ -360,43 +393,11 @@ void handle_button(xcb_button_press_event_t *event) {
}
x -= cur_ws->name_width + 11;
}
if (cur_ws == NULL) {
/* No workspace button was pressed.
* Check if a status block has been clicked.
* This of course only has an effect,
* if the child reported bidirectional protocol usage. */
/* First calculate width of tray area */
trayclient *trayclient;
int tray_width = 0;
TAILQ_FOREACH_REVERSE(trayclient, walk->trayclients, tc_head, tailq) {
if (!trayclient->mapped)
continue;
tray_width += (font.height + 2);
}
int block_x = 0, last_block_x;
int offset = (walk->rect.w - (statusline_width + tray_width)) - 10;
x = original_x - offset;
if (x < 0)
return;
struct status_block *block;
TAILQ_FOREACH(block, &statusline_head, blocks) {
last_block_x = block_x;
block_x += block->width + block->x_offset + block->x_append;
if (x <= block_x && x >= last_block_x) {
send_block_clicked(event->detail, block->name, block->instance, event->root_x, event->root_y);
return;
}
}
return;
}
if (event->detail != 1)
if (cur_ws == NULL)
return;
break;
default:
return;
}
/* To properly handle workspace names with double quotes in them, we need