mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2313 from minus7/swaybar-hotspot-input-fix 

swaybar: Fix scroll handling on workspace buttons
This commit is contained in:
Drew DeVault 2018-07-20 11:45:47 -04:00 committed by GitHub
parent 0a0b676f64 bfcfabee2b
commit b642d47c7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/swaybar/bar.h
View File

@ -29,10 +29,15 @@ enum x11_button {
FORWARD,
};
enum hotspot_event_handling {
HOTSPOT_IGNORE,
HOTSPOT_PROCESS,
};
struct swaybar_hotspot {
struct wl_list link;
int x, y, width, height;
void (*callback)(struct swaybar_output *output,
enum hotspot_event_handling (*callback)(struct swaybar_output *output,
int x, int y, enum x11_button button, void *data);
void (*destroy)(void *data);
void *data;

2
include/swaybar/status_line.h
View File

@ -71,7 +71,7 @@ void status_error(struct status_line *status, const char *text);
bool status_handle_readable(struct status_line *status);
void status_line_free(struct status_line *status);
bool i3bar_handle_readable(struct status_line *status);
void 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);
void i3bar_block_free(struct i3bar_block *block);
enum x11_button wl_button_to_x11_button(uint32_t button);

14
swaybar/bar.c
View File

@ -146,8 +146,10 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
&& y >= hotspot->y
&& x < hotspot->x + hotspot->width
&& y < hotspot->y + hotspot->height) {
hotspot->callback(output, pointer->x, pointer->y,
wl_button_to_x11_button(button), hotspot->data);
if (HOTSPOT_IGNORE == hotspot->callback(output, pointer->x, pointer->y,
wl_button_to_x11_button(button), hotspot->data)) {
return;
}
}
}
}
@ -169,9 +171,11 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
&& y >= hotspot->y
&& x < hotspot->x + hotspot->width
&& y < hotspot->y + hotspot->height) {
hotspot->callback(output, pointer->x, pointer->y,
wl_axis_to_x11_button(axis, value), hotspot->data);
return;
if (HOTSPOT_IGNORE == hotspot->callback(
output, pointer->x, pointer->y,
wl_axis_to_x11_button(axis, value), hotspot->data)) {
return;
}
}
}

5
swaybar/i3bar.c
View File

@ -192,11 +192,11 @@ bool i3bar_handle_readable(struct status_line *status) {
return redraw;
}
void 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) {
wlr_log(WLR_DEBUG, "block %s clicked", block->name ? block->name : "(nil)");
if (!block->name || !status->i3bar_state.click_events) {
return;
return HOTSPOT_PROCESS;
}
struct json_object *event_json = json_object_new_object();
@ -215,6 +215,7 @@ void i3bar_block_send_click(struct status_line *status,
status_error(status, "[failed to write click event]");
}
json_object_put(event_json);
return HOTSPOT_IGNORE;
}
enum x11_button wl_button_to_x11_button(uint32_t button) {

10
swaybar/render.c
View File

@ -108,11 +108,11 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
}
}
static void block_hotspot_callback(struct swaybar_output *output,
static enum hotspot_event_handling block_hotspot_callback(struct swaybar_output *output,
int x, int y, enum x11_button button, void *data) {
struct i3bar_block *block = data;
struct status_line *status = output->bar->status;
i3bar_block_send_click(status, block, x, y, button);
return i3bar_block_send_click(status, block, x, y, button);
}
static uint32_t render_status_block(cairo_t *cairo,
@ -348,9 +348,13 @@ static const char *strip_workspace_number(const char *ws_name) {
return ws_name;
}
static void workspace_hotspot_callback(struct swaybar_output *output,
static enum hotspot_event_handling workspace_hotspot_callback(struct swaybar_output *output,
int x, int y, enum x11_button button, void *data) {
if (button != LEFT) {
return HOTSPOT_PROCESS;
}
ipc_send_workspace_command(output->bar, (const char *)data);
return HOTSPOT_IGNORE;
}
static uint32_t render_workspace_button(cairo_t *cairo,