alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaybar: add multiseat support

Browse source 
This just adds multiseat support to swaybar
This commit is contained in:
Brian Ashworth 2019-04-23 23:40:00 -04:00 committed by Drew DeVault
parent 583ceff6f6
commit dc7a3930a7
4 changed files with 131 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/swaybar/bar.h
View file

@ -31,11 +31,8 @@ struct swaybar {
struct zwlr_layer_shell_v1 *layer_shell; struct zwlr_layer_shell_v1 *layer_shell;
struct zxdg_output_manager_v1 *xdg_output_manager; struct zxdg_output_manager_v1 *xdg_output_manager;
struct wl_shm *shm; struct wl_shm *shm;
struct wl_seat *seat;
struct swaybar_config *config; struct swaybar_config *config;
struct swaybar_pointer pointer;
struct swaybar_touch touch;
struct status_line *status; struct status_line *status;
struct loop *eventloop; struct loop *eventloop;
@ -44,6 +41,7 @@ struct swaybar {
int ipc_socketfd; int ipc_socketfd;
struct wl_list outputs; // swaybar_output::link struct wl_list outputs; // swaybar_output::link
struct wl_list seats; // swaybar_seat::link
#if HAVE_TRAY #if HAVE_TRAY
struct swaybar_tray *tray; struct swaybar_tray *tray;

13
include/swaybar/input.h
View file

@ -50,12 +50,23 @@ struct swaybar_hotspot {
void *data; void *data;
}; };
struct swaybar_seat {
struct swaybar *bar;
uint32_t wl_name;
struct wl_seat *wl_seat;
struct swaybar_pointer pointer;
struct swaybar_touch touch;
struct wl_list link; // swaybar_seat:link
};
extern const struct wl_seat_listener seat_listener; extern const struct wl_seat_listener seat_listener;
void update_cursor(struct swaybar *bar); void update_cursor(struct swaybar_seat *seat);
uint32_t event_to_x11_button(uint32_t event); uint32_t event_to_x11_button(uint32_t event);
void free_hotspots(struct wl_list *list); void free_hotspots(struct wl_list *list);
void swaybar_seat_free(struct swaybar_seat *seat);
#endif #endif

56
swaybar/bar.c
View file

@ -216,8 +216,16 @@ static void output_scale(void *data, struct wl_output *wl_output,
int32_t factor) { int32_t factor) {
struct swaybar_output *output = data; struct swaybar_output *output = data;
output->scale = factor; output->scale = factor;
if (output == output->bar->pointer.current) {
update_cursor(output->bar); bool render = false;
struct swaybar_seat *seat;
wl_list_for_each(seat, &output->bar->seats, link) {
if (output == seat->pointer.current) {
update_cursor(seat);
render = true;
}
};
if (render) {
render_frame(output); render_frame(output);
} }
} }
@ -318,9 +326,16 @@ static void handle_global(void *data, struct wl_registry *registry,
bar->compositor = wl_registry_bind(registry, name, bar->compositor = wl_registry_bind(registry, name,
&wl_compositor_interface, 4); &wl_compositor_interface, 4);
} else if (strcmp(interface, wl_seat_interface.name) == 0) { } else if (strcmp(interface, wl_seat_interface.name) == 0) {
bar->seat = wl_registry_bind(registry, name, struct swaybar_seat *seat = calloc(1, sizeof(struct swaybar_seat));
&wl_seat_interface, 3); if (!seat) {
wl_seat_add_listener(bar->seat, &seat_listener, bar); sway_abort("Failed to allocate swaybar_seat");
return;
}
seat->bar = bar;
seat->wl_name = name;
seat->wl_seat = wl_registry_bind(registry, name, &wl_seat_interface, 3);
wl_seat_add_listener(seat->wl_seat, &seat_listener, seat);
wl_list_insert(&bar->seats, &seat->link);
} else if (strcmp(interface, wl_shm_interface.name) == 0) { } else if (strcmp(interface, wl_shm_interface.name) == 0) {
bar->shm = wl_registry_bind(registry, name, bar->shm = wl_registry_bind(registry, name,
&wl_shm_interface, 1); &wl_shm_interface, 1);
@ -355,7 +370,14 @@ static void handle_global_remove(void *data, struct wl_registry *registry,
wl_list_for_each_safe(output, tmp, &bar->outputs, link) { wl_list_for_each_safe(output, tmp, &bar->outputs, link) {
if (output->wl_name == name) { if (output->wl_name == name) {
swaybar_output_free(output); swaybar_output_free(output);
break; return;
}
}
struct swaybar_seat *seat, *tmp_seat;
wl_list_for_each_safe(seat, tmp_seat, &bar->seats, link) {
if (seat->wl_name == name) {
swaybar_seat_free(seat);
return;
} }
} }
} }
@ -369,6 +391,7 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
bar->visible = true; bar->visible = true;
bar->config = init_config(); bar->config = init_config();
wl_list_init(&bar->outputs); wl_list_init(&bar->outputs);
wl_list_init(&bar->seats);
bar->eventloop = loop_create(); bar->eventloop = loop_create();
bar->ipc_socketfd = ipc_open_socket(socket_path); bar->ipc_socketfd = ipc_open_socket(socket_path);
@ -397,9 +420,16 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
// Second roundtrip for xdg-output // Second roundtrip for xdg-output
wl_display_roundtrip(bar->display); wl_display_roundtrip(bar->display);
struct swaybar_pointer *pointer = &bar->pointer; struct swaybar_seat *seat;
pointer->cursor_surface = wl_compositor_create_surface(bar->compositor); wl_list_for_each(seat, &bar->seats, link) {
assert(pointer->cursor_surface); struct swaybar_pointer *pointer = &seat->pointer;
if (!pointer) {
continue;
}
pointer->cursor_surface =
wl_compositor_create_surface(bar->compositor);
assert(pointer->cursor_surface);
}
#if HAVE_TRAY #if HAVE_TRAY
if (!bar->config->tray_hidden) { if (!bar->config->tray_hidden) {
@ -468,11 +498,19 @@ static void free_outputs(struct wl_list *list) {
} }
} }
static void free_seats(struct wl_list *list) {
struct swaybar_seat *seat, *tmp;
wl_list_for_each_safe(seat, tmp, list, link) {
swaybar_seat_free(seat);
}
}
void bar_teardown(struct swaybar *bar) { void bar_teardown(struct swaybar *bar) {
#if HAVE_TRAY #if HAVE_TRAY
destroy_tray(bar->tray); destroy_tray(bar->tray);
#endif #endif
free_outputs(&bar->outputs); free_outputs(&bar->outputs);
free_seats(&bar->seats);
if (bar->config) { if (bar->config) {
free_config(bar->config); free_config(bar->config);
} }

115
swaybar/input.c
View file

@ -59,13 +59,17 @@ static uint32_t wl_axis_to_button(uint32_t axis, wl_fixed_t value) {
} }
} }
void update_cursor(struct swaybar *bar) { void update_cursor(struct swaybar_seat *seat) {
struct swaybar_pointer *pointer = &bar->pointer; struct swaybar_pointer *pointer = &seat->pointer;
if (!pointer || !pointer->cursor_surface) {
return;
}
if (pointer->cursor_theme) { if (pointer->cursor_theme) {
wl_cursor_theme_destroy(pointer->cursor_theme); wl_cursor_theme_destroy(pointer->cursor_theme);
} }
int scale = pointer->current ? pointer->current->scale : 1; int scale = pointer->current ? pointer->current->scale : 1;
pointer->cursor_theme = wl_cursor_theme_load(NULL, 24 * scale, bar->shm); pointer->cursor_theme = wl_cursor_theme_load(NULL, 24 * scale,
seat->bar->shm);
struct wl_cursor *cursor; struct wl_cursor *cursor;
cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr");
pointer->cursor_image = cursor->images[0]; pointer->cursor_image = cursor->images[0];
@ -84,30 +88,30 @@ void update_cursor(struct swaybar *bar) {
static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, struct wl_surface *surface, uint32_t serial, struct wl_surface *surface,
wl_fixed_t surface_x, wl_fixed_t surface_y) { wl_fixed_t surface_x, wl_fixed_t surface_y) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
struct swaybar_pointer *pointer = &bar->pointer; struct swaybar_pointer *pointer = &seat->pointer;
pointer->serial = serial; pointer->serial = serial;
struct swaybar_output *output; struct swaybar_output *output;
wl_list_for_each(output, &bar->outputs, link) { wl_list_for_each(output, &seat->bar->outputs, link) {
if (output->surface == surface) { if (output->surface == surface) {
pointer->current = output; pointer->current = output;
break; break;
} }
} }
update_cursor(bar); update_cursor(seat);
} }
static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, struct wl_surface *surface) { uint32_t serial, struct wl_surface *surface) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
bar->pointer.current = NULL; seat->pointer.current = NULL;
} }
static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) { uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
bar->pointer.x = wl_fixed_to_int(surface_x); seat->pointer.x = wl_fixed_to_int(surface_x);
bar->pointer.y = wl_fixed_to_int(surface_y); seat->pointer.y = wl_fixed_to_int(surface_y);
} }
static bool check_bindings(struct swaybar *bar, uint32_t button, static bool check_bindings(struct swaybar *bar, uint32_t button,
@ -142,14 +146,14 @@ static void process_hotspots(struct swaybar_output *output,
static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
struct swaybar_pointer *pointer = &bar->pointer; struct swaybar_pointer *pointer = &seat->pointer;
struct swaybar_output *output = pointer->current; struct swaybar_output *output = pointer->current;
if (!sway_assert(output, "button with no active output")) { if (!sway_assert(output, "button with no active output")) {
return; return;
} }
if (check_bindings(bar, button, state)) { if (check_bindings(seat->bar, button, state)) {
return; return;
} }
@ -199,8 +203,8 @@ static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer, static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
uint32_t time, uint32_t axis, wl_fixed_t value) { uint32_t time, uint32_t axis, wl_fixed_t value) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
struct swaybar_pointer *pointer = &bar->pointer; struct swaybar_pointer *pointer = &seat->pointer;
struct swaybar_output *output = pointer->current; struct swaybar_output *output = pointer->current;
if (!sway_assert(output, "axis with no active output")) { if (!sway_assert(output, "axis with no active output")) {
return; return;
@ -209,8 +213,8 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
// If there is a button press binding, execute it, skip default behavior, // If there is a button press binding, execute it, skip default behavior,
// and check button release bindings // and check button release bindings
uint32_t button = wl_axis_to_button(axis, value); uint32_t button = wl_axis_to_button(axis, value);
if (check_bindings(bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) { if (check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
check_bindings(bar, button, WL_POINTER_BUTTON_STATE_RELEASED); check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
return; return;
} }
@ -229,10 +233,10 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
} }
} }
struct swaybar_config *config = bar->config; struct swaybar_config *config = seat->bar->config;
double amt = wl_fixed_to_double(value); double amt = wl_fixed_to_double(value);
if (amt == 0.0 || !config->workspace_buttons) { if (amt == 0.0 || !config->workspace_buttons) {
check_bindings(bar, button, WL_POINTER_BUTTON_STATE_RELEASED); check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
return; return;
} }
@ -240,10 +244,10 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
return; return;
} }
workspace_next(bar, output, amt < 0.0); workspace_next(seat->bar, output, amt < 0.0);
// Check button release bindings // Check button release bindings
check_bindings(bar, button, WL_POINTER_BUTTON_STATE_RELEASED); check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
} }
static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) { static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
@ -297,9 +301,9 @@ static struct touch_slot *get_touch_slot(struct swaybar_touch *touch, int32_t id
static void wl_touch_down(void *data, struct wl_touch *wl_touch, static void wl_touch_down(void *data, struct wl_touch *wl_touch,
uint32_t serial, uint32_t time, struct wl_surface *surface, uint32_t serial, uint32_t time, struct wl_surface *surface,
int32_t id, wl_fixed_t _x, wl_fixed_t _y) { int32_t id, wl_fixed_t _x, wl_fixed_t _y) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
struct swaybar_output *_output = NULL, *output = NULL; struct swaybar_output *_output = NULL, *output = NULL;
wl_list_for_each(_output, &bar->outputs, link) { wl_list_for_each(_output, &seat->bar->outputs, link) {
if (_output->surface == surface) { if (_output->surface == surface) {
output = _output; output = _output;
break; break;
@ -309,7 +313,7 @@ static void wl_touch_down(void *data, struct wl_touch *wl_touch,
sway_log(SWAY_DEBUG, "Got touch event for unknown surface"); sway_log(SWAY_DEBUG, "Got touch event for unknown surface");
return; return;
} }
struct touch_slot *slot = get_touch_slot(&bar->touch, id); struct touch_slot *slot = get_touch_slot(&seat->touch, id);
if (!slot) { if (!slot) {
return; return;
} }
@ -322,8 +326,8 @@ static void wl_touch_down(void *data, struct wl_touch *wl_touch,
static void wl_touch_up(void *data, struct wl_touch *wl_touch, static void wl_touch_up(void *data, struct wl_touch *wl_touch,
uint32_t serial, uint32_t time, int32_t id) { uint32_t serial, uint32_t time, int32_t id) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
struct touch_slot *slot = get_touch_slot(&bar->touch, id); struct touch_slot *slot = get_touch_slot(&seat->touch, id);
if (!slot) { if (!slot) {
return; return;
} }
@ -336,8 +340,8 @@ static void wl_touch_up(void *data, struct wl_touch *wl_touch,
static void wl_touch_motion(void *data, struct wl_touch *wl_touch, static void wl_touch_motion(void *data, struct wl_touch *wl_touch,
uint32_t time, int32_t id, wl_fixed_t x, wl_fixed_t y) { uint32_t time, int32_t id, wl_fixed_t x, wl_fixed_t y) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
struct touch_slot *slot = get_touch_slot(&bar->touch, id); struct touch_slot *slot = get_touch_slot(&seat->touch, id);
if (!slot) { if (!slot) {
return; return;
} }
@ -351,7 +355,7 @@ static void wl_touch_motion(void *data, struct wl_touch *wl_touch,
int progress = (int)((slot->x - slot->start_x) int progress = (int)((slot->x - slot->start_x)
/ slot->output->width * 100); / slot->output->width * 100);
if (abs(progress) / 20 != abs(prev_progress) / 20) { if (abs(progress) / 20 != abs(prev_progress) / 20) {
workspace_next(bar, slot->output, progress - prev_progress < 0); workspace_next(seat->bar, slot->output, progress - prev_progress < 0);
} }
} }
@ -360,8 +364,8 @@ static void wl_touch_frame(void *data, struct wl_touch *wl_touch) {
} }
static void wl_touch_cancel(void *data, struct wl_touch *wl_touch) { static void wl_touch_cancel(void *data, struct wl_touch *wl_touch) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
struct swaybar_touch *touch = &bar->touch; struct swaybar_touch *touch = &seat->touch;
for (size_t i = 0; i < sizeof(touch->slots) / sizeof(*touch->slots); ++i) { for (size_t i = 0; i < sizeof(touch->slots) / sizeof(*touch->slots); ++i) {
touch->slots[i].output = NULL; touch->slots[i].output = NULL;
} }
@ -389,22 +393,27 @@ static const struct wl_touch_listener touch_listener = {
static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
enum wl_seat_capability caps) { enum wl_seat_capability caps) {
struct swaybar *bar = data; struct swaybar_seat *seat = data;
if (bar->pointer.pointer != NULL) { if (seat->pointer.pointer != NULL) {
wl_pointer_release(bar->pointer.pointer); wl_pointer_release(seat->pointer.pointer);
bar->pointer.pointer = NULL; seat->pointer.pointer = NULL;
} }
if (bar->touch.touch != NULL) { if (seat->touch.touch != NULL) {
wl_touch_release(bar->touch.touch); wl_touch_release(seat->touch.touch);
bar->touch.touch = NULL; seat->touch.touch = NULL;
} }
if ((caps & WL_SEAT_CAPABILITY_POINTER)) { if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
bar->pointer.pointer = wl_seat_get_pointer(wl_seat); seat->pointer.pointer = wl_seat_get_pointer(wl_seat);
wl_pointer_add_listener(bar->pointer.pointer, &pointer_listener, bar); if (seat->bar->running && !seat->pointer.cursor_surface) {
seat->pointer.cursor_surface =
wl_compositor_create_surface(seat->bar->compositor);
assert(seat->pointer.cursor_surface);
}
wl_pointer_add_listener(seat->pointer.pointer, &pointer_listener, seat);
} }
if ((caps & WL_SEAT_CAPABILITY_TOUCH)) { if ((caps & WL_SEAT_CAPABILITY_TOUCH)) {
bar->touch.touch = wl_seat_get_touch(wl_seat); seat->touch.touch = wl_seat_get_touch(wl_seat);
wl_touch_add_listener(bar->touch.touch, &touch_listener, bar); wl_touch_add_listener(seat->touch.touch, &touch_listener, seat);
} }
} }
@ -417,3 +426,21 @@ const struct wl_seat_listener seat_listener = {
.capabilities = seat_handle_capabilities, .capabilities = seat_handle_capabilities,
.name = seat_handle_name, .name = seat_handle_name,
}; };
void swaybar_seat_free(struct swaybar_seat *seat) {
if (!seat) {
return;
}
if (seat->pointer.pointer != NULL) {
wl_pointer_release(seat->pointer.pointer);
}
if (seat->pointer.cursor_surface != NULL) {
wl_surface_destroy(seat->pointer.cursor_surface);
}
if (seat->touch.touch != NULL) {
wl_touch_release(seat->touch.touch);
}
wl_seat_destroy(seat->wl_seat);
wl_list_remove(&seat->link);
free(seat);
}