mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

make hotspot callback take an x11 button id

Browse source
This commit is contained in:
Peter Rice 2018-07-15 20:16:37 -04:00
parent b314a8f2cc
commit 79a998849b
5 changed files with 51 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/swaybar/bar.h
View file

@ -16,11 +16,24 @@ struct swaybar_pointer {
int x, y;
};
enum x11_button {
NONE,
LEFT,
MIDDLE,
RIGHT,
SCROLL_UP,
SCROLL_DOWN,
SCROLL_LEFT,
SCROLL_RIGHT,
BACK,
FORWARD,
};
struct swaybar_hotspot {
struct wl_list link;
int x, y, width, height;
void (*callback)(struct swaybar_output *output,
int x, int y, uint32_t button, void *data);
int x, int y, enum x11_button button, void *data);
void (*destroy)(void *data);
void *data;
};

4
include/swaybar/status_line.h
View file

@ -72,7 +72,9 @@ 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,
struct i3bar_block *block, int x, int y, uint32_t button);
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);
enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value);
#endif

2
swaybar/bar.c
View file

@ -147,7 +147,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
&& x < hotspot->x + hotspot->width
&& y < hotspot->y + hotspot->height) {
hotspot->callback(output, pointer->x, pointer->y,
button, hotspot->data);
wl_button_to_x11_button(button), hotspot->data);
}
}
}

32
swaybar/i3bar.c
View file

@ -1,5 +1,6 @@
#define _POSIX_C_SOURCE 200809L
#include <json-c/json.h>
#include <linux/input-event-codes.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@ -192,7 +193,7 @@ bool i3bar_handle_readable(struct status_line *status) {
}
void i3bar_block_send_click(struct status_line *status,
struct i3bar_block *block, int x, int y, uint32_t 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)");
if (!block->name || !status->i3bar_state.click_events) {
return;
@ -215,3 +216,32 @@ void i3bar_block_send_click(struct status_line *status,
}
json_object_put(event_json);
}
enum x11_button wl_button_to_x11_button(uint32_t button) {
switch (button) {
case (BTN_LEFT):
return LEFT;
case (BTN_MIDDLE):
return MIDDLE;
case (BTN_RIGHT):
return RIGHT;
case (BTN_SIDE):
return BACK;
case (BTN_EXTRA):
return FORWARD;
default:
return NONE;
}
}
enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value) {
switch (axis) {
case WL_POINTER_AXIS_VERTICAL_SCROLL:
return wl_fixed_to_double(value) < 0 ? SCROLL_UP : SCROLL_DOWN;
case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
return wl_fixed_to_double(value) < 0 ? SCROLL_LEFT : SCROLL_RIGHT;
default:
wlr_log(WLR_DEBUG, "Unexpected axis value on mouse scroll");
return NONE;
}
}

4
swaybar/render.c
View file

@ -109,7 +109,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
}
static void block_hotspot_callback(struct swaybar_output *output,
int x, int y, uint32_t button, void *data) {
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);
@ -349,7 +349,7 @@ static const char *strip_workspace_number(const char *ws_name) {
}
static void workspace_hotspot_callback(struct swaybar_output *output,
int x, int y, uint32_t button, void *data) {
int x, int y, enum x11_button button, void *data) {
ipc_send_workspace_command(output->bar, (const char *)data);
}