mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-30 03:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename seat functions

Browse source
This commit is contained in:
Tony Crisci 2018-04-02 08:45:37 -04:00
parent 122b96abed
commit e677c5b204
17 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/sway/input/seat.h
View file

@ -38,28 +38,28 @@ struct sway_seat {
struct wl_list link; // input_manager::seats struct wl_list link; // input_manager::seats
}; };
struct sway_seat *sway_seat_create(struct sway_input_manager *input, struct sway_seat *seat_create(struct sway_input_manager *input,
const char *seat_name); const char *seat_name);
void sway_seat_destroy(struct sway_seat *seat); void seat_destroy(struct sway_seat *seat);
void sway_seat_add_device(struct sway_seat *seat, void seat_add_device(struct sway_seat *seat,
struct sway_input_device *device); struct sway_input_device *device);
void sway_seat_configure_device(struct sway_seat *seat, void seat_configure_device(struct sway_seat *seat,
struct sway_input_device *device); struct sway_input_device *device);
void sway_seat_remove_device(struct sway_seat *seat, void seat_remove_device(struct sway_seat *seat,
struct sway_input_device *device); struct sway_input_device *device);
void sway_seat_configure_xcursor(struct sway_seat *seat); void seat_configure_xcursor(struct sway_seat *seat);
void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container); void seat_set_focus(struct sway_seat *seat, struct sway_container *container);
void sway_seat_set_focus_warp(struct sway_seat *seat, void seat_set_focus_warp(struct sway_seat *seat,
struct sway_container *container, bool warp); struct sway_container *container, bool warp);
struct sway_container *sway_seat_get_focus(struct sway_seat *seat); struct sway_container *seat_get_focus(struct sway_seat *seat);
/** /**
* Return the last container to be focused for the seat (or the most recently * Return the last container to be focused for the seat (or the most recently
@ -70,12 +70,12 @@ struct sway_container *sway_seat_get_focus(struct sway_seat *seat);
* is destroyed, or focus moves to a container with children and we need to * is destroyed, or focus moves to a container with children and we need to
* descend into the next leaf in focus order. * descend into the next leaf in focus order.
*/ */
struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
struct sway_container *container); struct sway_container *container);
struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat, struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
enum sway_container_type type); enum sway_container_type type);
void sway_seat_set_config(struct sway_seat *seat, struct seat_config *seat_config); void seat_set_config(struct sway_seat *seat, struct seat_config *seat_config);
#endif #endif

2
sway/commands.c
View file

@ -340,7 +340,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
// without criteria, the command acts upon the focused // without criteria, the command acts upon the focused
// container // container
config->handler_context.current_container = config->handler_context.current_container =
sway_seat_get_focus_inactive(seat, &root_container); seat_get_focus_inactive(seat, &root_container);
if (!sway_assert(config->handler_context.current_container, if (!sway_assert(config->handler_context.current_container,
"could not get focus-inactive for root container")) { "could not get focus-inactive for root container")) {
return NULL; return NULL;

4
sway/commands/focus.c
View file

@ -40,7 +40,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
} }
if (argc == 0) { if (argc == 0) {
sway_seat_set_focus(seat, con); seat_set_focus(seat, con);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
@ -53,7 +53,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
struct sway_container *next_focus = container_get_in_direction(con, seat, direction); struct sway_container *next_focus = container_get_in_direction(con, seat, direction);
if (next_focus) { if (next_focus) {
sway_seat_set_focus(seat, next_focus); seat_set_focus(seat, next_focus);
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

2
sway/commands/workspace.c
View file

@ -91,7 +91,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
} }
workspace_switch(ws); workspace_switch(ws);
current_container = current_container =
sway_seat_get_focus(config->handler_context.seat); seat_get_focus(config->handler_context.seat);
struct sway_container *new_output = container_parent(current_container, C_OUTPUT); struct sway_container *new_output = container_parent(current_container, C_OUTPUT);
if (config->mouse_warping && old_output != new_output) { if (config->mouse_warping && old_output != new_output) {

2
sway/config.c
View file

@ -125,7 +125,7 @@ static void destroy_removed_seats(struct sway_config *old_config,
seat_name_cmp, seat_config->name) < 0) { seat_name_cmp, seat_config->name) < 0) {
seat = input_manager_get_seat(input_manager, seat = input_manager_get_seat(input_manager,
seat_config->name); seat_config->name);
sway_seat_destroy(seat); seat_destroy(seat);
} }
} }
} }

2
sway/desktop/output.c
View file

@ -228,7 +228,7 @@ static void render_output(struct sway_output *output, struct timespec *when,
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = struct sway_container *focus =
sway_seat_get_focus_inactive(seat, output->swayc); seat_get_focus_inactive(seat, output->swayc);
struct sway_container *workspace = (focus->type == C_WORKSPACE ? struct sway_container *workspace = (focus->type == C_WORKSPACE ?
focus : focus :
container_parent(focus, C_WORKSPACE)); container_parent(focus, C_WORKSPACE));

2
sway/desktop/wl_shell.c
View file

@ -133,7 +133,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy); wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy);
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = container_view_create(focus, sway_view); struct sway_container *cont = container_view_create(focus, sway_view);
sway_view->swayc = cont; sway_view->swayc = cont;

2
sway/desktop/xdg_shell_v6.c
View file

@ -98,7 +98,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
container_view_destroy(view->swayc); container_view_destroy(view->swayc);
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = container_view_create(focus, view); struct sway_container *cont = container_view_create(focus, view);
view->swayc = cont; view->swayc = cont;
arrange_windows(cont->parent, -1, -1); arrange_windows(cont->parent, -1, -1);

2
sway/desktop/xwayland.c
View file

@ -143,7 +143,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
wlr_xwayland_surface_set_maximized(xsurface, true); wlr_xwayland_surface_set_maximized(xsurface, true);
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, struct sway_container *focus = seat_get_focus_inactive(seat,
&root_container); &root_container);
struct sway_container *cont = container_view_create(focus, view); struct sway_container *cont = container_view_create(focus, view);
view->swayc = cont; view->swayc = cont;

10
sway/input/cursor.c
View file

@ -84,7 +84,7 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
// find the focused workspace on the output for this seat // find the focused workspace on the output for this seat
struct sway_container *ws = struct sway_container *ws =
sway_seat_get_focus_inactive(cursor->seat, output->swayc); seat_get_focus_inactive(cursor->seat, output->swayc);
if (ws && ws->type != C_WORKSPACE) { if (ws && ws->type != C_WORKSPACE) {
ws = container_parent(ws, C_WORKSPACE); ws = container_parent(ws, C_WORKSPACE);
} }
@ -129,7 +129,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
double sx, sy; double sx, sy;
struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy); struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy);
if (c && config->focus_follows_mouse) { if (c && config->focus_follows_mouse) {
sway_seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} }
// reset cursor if switching between clients // reset cursor if switching between clients
@ -191,15 +191,15 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
if (new_ws && new_ws->type != C_WORKSPACE) { if (new_ws && new_ws->type != C_WORKSPACE) {
new_ws = container_parent(new_ws, C_WORKSPACE); new_ws = container_parent(new_ws, C_WORKSPACE);
} }
struct sway_container *old_ws = sway_seat_get_focus(cursor->seat); struct sway_container *old_ws = seat_get_focus(cursor->seat);
if (old_ws && old_ws->type != C_WORKSPACE) { if (old_ws && old_ws->type != C_WORKSPACE) {
old_ws = container_parent(old_ws, C_WORKSPACE); old_ws = container_parent(old_ws, C_WORKSPACE);
} }
if (new_ws != old_ws) { if (new_ws != old_ws) {
sway_seat_set_focus(cursor->seat, cont); seat_set_focus(cursor->seat, cont);
} }
} else { } else {
sway_seat_set_focus(cursor->seat, cont); seat_set_focus(cursor->seat, cont);
} }
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec, wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec,

28
sway/input/input-manager.c
View file

@ -40,7 +40,7 @@ struct sway_seat *input_manager_get_seat(
} }
} }
return sway_seat_create(input, seat_name); return seat_create(input, seat_name);
} }
static char *get_device_identifier(struct wlr_input_device *device) { static char *get_device_identifier(struct wlr_input_device *device) {
@ -175,7 +175,7 @@ static void handle_device_destroy(struct wl_listener *listener, void *data) {
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input_manager->seats, link) { wl_list_for_each(seat, &input_manager->seats, link) {
sway_seat_remove_device(seat, input_device); seat_remove_device(seat, input_device);
} }
wl_list_remove(&input_device->link); wl_list_remove(&input_device->link);
@ -221,7 +221,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
if (!input_has_seat_configuration(input)) { if (!input_has_seat_configuration(input)) {
wlr_log(L_DEBUG, "no seat configuration, using default seat"); wlr_log(L_DEBUG, "no seat configuration, using default seat");
seat = input_manager_get_seat(input, default_seat); seat = input_manager_get_seat(input, default_seat);
sway_seat_add_device(seat, input_device); seat_add_device(seat, input_device);
return; return;
} }
@ -232,7 +232,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
seat_config_get_attachment(seat->config, "*")); seat_config_get_attachment(seat->config, "*"));
if (has_attachment) { if (has_attachment) {
sway_seat_add_device(seat, input_device); seat_add_device(seat, input_device);
added = true; added = true;
} }
} }
@ -240,7 +240,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
if (!added) { if (!added) {
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
if (seat->config && seat->config->fallback == 1) { if (seat->config && seat->config->fallback == 1) {
sway_seat_add_device(seat, input_device); seat_add_device(seat, input_device);
added = true; added = true;
} }
} }
@ -281,7 +281,7 @@ bool sway_input_manager_has_focus(struct sway_input_manager *input,
struct sway_container *container) { struct sway_container *container) {
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
if (sway_seat_get_focus(seat) == container) { if (seat_get_focus(seat) == container) {
return true; return true;
} }
} }
@ -293,7 +293,7 @@ void sway_input_manager_set_focus(struct sway_input_manager *input,
struct sway_container *container) { struct sway_container *container) {
struct sway_seat *seat ; struct sway_seat *seat ;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
sway_seat_set_focus(seat, container); seat_set_focus(seat, container);
} }
} }
@ -311,7 +311,7 @@ void sway_input_manager_apply_input_config(struct sway_input_manager *input,
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
sway_seat_configure_device(seat, input_device); seat_configure_device(seat, input_device);
} }
} }
} }
@ -326,7 +326,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
return; return;
} }
sway_seat_set_config(seat, seat_config); seat_set_config(seat, seat_config);
// for every device, try to add it to a seat and if no seat has it // for every device, try to add it to a seat and if no seat has it
// attached, add it to the fallback seats. // attached, add it to the fallback seats.
@ -355,17 +355,17 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
} }
} }
if (attached) { if (attached) {
sway_seat_add_device(seat, input_device); seat_add_device(seat, input_device);
} else { } else {
sway_seat_remove_device(seat, input_device); seat_remove_device(seat, input_device);
} }
} }
} else { } else {
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
if (seat->config && seat->config->fallback == 1) { if (seat->config && seat->config->fallback == 1) {
sway_seat_add_device(seat, input_device); seat_add_device(seat, input_device);
} else { } else {
sway_seat_remove_device(seat, input_device); seat_remove_device(seat, input_device);
} }
} }
} }
@ -376,7 +376,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
void sway_input_manager_configure_xcursor(struct sway_input_manager *input) { void sway_input_manager_configure_xcursor(struct sway_input_manager *input) {
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
sway_seat_configure_xcursor(seat); seat_configure_xcursor(seat);
} }
} }

58
sway/input/seat.c
View file

@ -25,7 +25,7 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
free(seat_device); free(seat_device);
} }
void sway_seat_destroy(struct sway_seat *seat) { void seat_destroy(struct sway_seat *seat) {
struct sway_seat_device *seat_device, *next; struct sway_seat_device *seat_device, *next;
wl_list_for_each_safe(seat_device, next, &seat->devices, link) { wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
seat_device_destroy(seat_device); seat_device_destroy(seat_device);
@ -42,18 +42,18 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
struct sway_seat *seat = seat_con->seat; struct sway_seat *seat = seat_con->seat;
struct sway_container *con = seat_con->container; struct sway_container *con = seat_con->container;
bool is_focus = (sway_seat_get_focus(seat) == con); bool is_focus = (seat_get_focus(seat) == con);
wl_list_remove(&seat_con->link); wl_list_remove(&seat_con->link);
if (is_focus) { if (is_focus) {
// pick next focus // pick next focus
sway_seat_set_focus(seat, NULL); seat_set_focus(seat, NULL);
struct sway_container *next = sway_seat_get_focus_inactive(seat, con->parent); struct sway_container *next = seat_get_focus_inactive(seat, con->parent);
if (next == NULL) { if (next == NULL) {
next = con->parent; next = con->parent;
} }
sway_seat_set_focus(seat, next); seat_set_focus(seat, next);
} }
wl_list_remove(&seat_con->destroy.link); wl_list_remove(&seat_con->destroy.link);
@ -110,7 +110,7 @@ static void collect_focus_iter(struct sway_container *con, void *data) {
wl_list_insert(&seat->focus_stack, &seat_con->link); wl_list_insert(&seat->focus_stack, &seat_con->link);
} }
struct sway_seat *sway_seat_create(struct sway_input_manager *input, struct sway_seat *seat_create(struct sway_input_manager *input,
const char *seat_name) { const char *seat_name) {
struct sway_seat *seat = calloc(1, sizeof(struct sway_seat)); struct sway_seat *seat = calloc(1, sizeof(struct sway_seat));
if (!seat) { if (!seat) {
@ -147,7 +147,7 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_POINTER |
WL_SEAT_CAPABILITY_TOUCH); WL_SEAT_CAPABILITY_TOUCH);
sway_seat_configure_xcursor(seat); seat_configure_xcursor(seat);
wl_list_insert(&input->seats, &seat->link); wl_list_insert(&input->seats, &seat->link);
@ -169,7 +169,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
sway_keyboard_configure(seat_device->keyboard); sway_keyboard_configure(seat_device->keyboard);
wlr_seat_set_keyboard(seat->wlr_seat, wlr_seat_set_keyboard(seat->wlr_seat,
seat_device->input_device->wlr_device); seat_device->input_device->wlr_device);
struct sway_container *focus = sway_seat_get_focus(seat); struct sway_container *focus = seat_get_focus(seat);
if (focus && focus->type == C_VIEW) { if (focus && focus->type == C_VIEW) {
// force notify reenter to pick up the new configuration // force notify reenter to pick up the new configuration
wlr_seat_keyboard_clear_focus(seat->wlr_seat); wlr_seat_keyboard_clear_focus(seat->wlr_seat);
@ -179,7 +179,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
} }
} }
static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat, static struct sway_seat_device *seat_get_device(struct sway_seat *seat,
struct sway_input_device *input_device) { struct sway_input_device *input_device) {
struct sway_seat_device *seat_device = NULL; struct sway_seat_device *seat_device = NULL;
wl_list_for_each(seat_device, &seat->devices, link) { wl_list_for_each(seat_device, &seat->devices, link) {
@ -191,10 +191,10 @@ static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat,
return NULL; return NULL;
} }
void sway_seat_configure_device(struct sway_seat *seat, void seat_configure_device(struct sway_seat *seat,
struct sway_input_device *input_device) { struct sway_input_device *input_device) {
struct sway_seat_device *seat_device = struct sway_seat_device *seat_device =
sway_seat_get_device(seat, input_device); seat_get_device(seat, input_device);
if (!seat_device) { if (!seat_device) {
return; return;
} }
@ -219,10 +219,10 @@ void sway_seat_configure_device(struct sway_seat *seat,
} }
} }
void sway_seat_add_device(struct sway_seat *seat, void seat_add_device(struct sway_seat *seat,
struct sway_input_device *input_device) { struct sway_input_device *input_device) {
if (sway_seat_get_device(seat, input_device)) { if (seat_get_device(seat, input_device)) {
sway_seat_configure_device(seat, input_device); seat_configure_device(seat, input_device);
return; return;
} }
@ -240,13 +240,13 @@ void sway_seat_add_device(struct sway_seat *seat,
seat_device->input_device = input_device; seat_device->input_device = input_device;
wl_list_insert(&seat->devices, &seat_device->link); wl_list_insert(&seat->devices, &seat_device->link);
sway_seat_configure_device(seat, input_device); seat_configure_device(seat, input_device);
} }
void sway_seat_remove_device(struct sway_seat *seat, void seat_remove_device(struct sway_seat *seat,
struct sway_input_device *input_device) { struct sway_input_device *input_device) {
struct sway_seat_device *seat_device = struct sway_seat_device *seat_device =
sway_seat_get_device(seat, input_device); seat_get_device(seat, input_device);
if (!seat_device) { if (!seat_device) {
return; return;
@ -258,7 +258,7 @@ void sway_seat_remove_device(struct sway_seat *seat,
seat_device_destroy(seat_device); seat_device_destroy(seat_device);
} }
void sway_seat_configure_xcursor(struct sway_seat *seat) { void seat_configure_xcursor(struct sway_seat *seat) {
// TODO configure theme and size // TODO configure theme and size
const char *cursor_theme = NULL; const char *cursor_theme = NULL;
@ -292,9 +292,9 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
seat->cursor->cursor->y); seat->cursor->cursor->y);
} }
void sway_seat_set_focus_warp(struct sway_seat *seat, void seat_set_focus_warp(struct sway_seat *seat,
struct sway_container *container, bool warp) { struct sway_container *container, bool warp) {
struct sway_container *last_focus = sway_seat_get_focus(seat); struct sway_container *last_focus = seat_get_focus(seat);
if (container && last_focus == container) { if (container && last_focus == container) {
return; return;
@ -372,12 +372,12 @@ void sway_seat_set_focus_warp(struct sway_seat *seat,
seat->has_focus = (container != NULL); seat->has_focus = (container != NULL);
} }
void sway_seat_set_focus(struct sway_seat *seat, void seat_set_focus(struct sway_seat *seat,
struct sway_container *container) { struct sway_container *container) {
sway_seat_set_focus_warp(seat, container, true); seat_set_focus_warp(seat, container, true);
} }
struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) { struct sway_container *seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) {
struct sway_seat_container *current = NULL; struct sway_seat_container *current = NULL;
struct sway_container *parent = NULL; struct sway_container *parent = NULL;
wl_list_for_each(current, &seat->focus_stack, link) { wl_list_for_each(current, &seat->focus_stack, link) {
@ -398,16 +398,16 @@ struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, stru
return NULL; return NULL;
} }
struct sway_container *sway_seat_get_focus(struct sway_seat *seat) { struct sway_container *seat_get_focus(struct sway_seat *seat) {
if (!seat->has_focus) { if (!seat->has_focus) {
return NULL; return NULL;
} }
return sway_seat_get_focus_inactive(seat, &root_container); return seat_get_focus_inactive(seat, &root_container);
} }
struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat, struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
enum sway_container_type type) { enum sway_container_type type) {
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
if (focus->type == type) { if (focus->type == type) {
return focus; return focus;
} }
@ -415,7 +415,7 @@ struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
return container_parent(focus, type); return container_parent(focus, type);
} }
void sway_seat_set_config(struct sway_seat *seat, void seat_set_config(struct sway_seat *seat,
struct seat_config *seat_config) { struct seat_config *seat_config) {
// clear configs // clear configs
free_seat_config(seat->config); free_seat_config(seat->config);
@ -434,6 +434,6 @@ void sway_seat_set_config(struct sway_seat *seat,
seat->config = copy_seat_config(seat_config); seat->config = copy_seat_config(seat_config);
wl_list_for_each(seat_device, &seat->devices, link) { wl_list_for_each(seat_device, &seat->devices, link) {
sway_seat_configure_device(seat, seat_device->input_device); seat_configure_device(seat, seat_device->input_device);
} }
} }

4
sway/ipc-json.c
View file

@ -92,7 +92,7 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje
const char *ws = NULL; const char *ws = NULL;
if (seat) { if (seat) {
struct sway_container *focus = struct sway_container *focus =
sway_seat_get_focus_inactive(seat, container); seat_get_focus_inactive(seat, container);
if (focus && focus->type != C_WORKSPACE) { if (focus && focus->type != C_WORKSPACE) {
focus = container_parent(focus, C_WORKSPACE); focus = container_parent(focus, C_WORKSPACE);
} }
@ -140,7 +140,7 @@ json_object *ipc_json_describe_container(struct sway_container *c) {
} }
struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager); struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager);
bool focused = sway_seat_get_focus(seat) == c; bool focused = seat_get_focus(seat) == c;
json_object *object = json_object_new_object(); json_object *object = json_object_new_object();

4
sway/ipc-server.c
View file

@ -389,7 +389,7 @@ static void ipc_get_workspaces_callback(struct sway_container *workspace,
// it's set differently for the get_workspaces reply // it's set differently for the get_workspaces reply
struct sway_seat *seat = struct sway_seat *seat =
sway_input_manager_get_default_seat(input_manager); sway_input_manager_get_default_seat(input_manager);
struct sway_container *focused_ws = sway_seat_get_focus(seat); struct sway_container *focused_ws = seat_get_focus(seat);
if (focused_ws != NULL && focused_ws->type != C_WORKSPACE) { if (focused_ws != NULL && focused_ws->type != C_WORKSPACE) {
focused_ws = container_parent(focused_ws, C_WORKSPACE); focused_ws = container_parent(focused_ws, C_WORKSPACE);
} }
@ -399,7 +399,7 @@ static void ipc_get_workspaces_callback(struct sway_container *workspace,
json_object_new_boolean(focused)); json_object_new_boolean(focused));
json_object_array_add((json_object *)data, workspace_json); json_object_array_add((json_object *)data, workspace_json);
focused_ws = sway_seat_get_focus_inactive(seat, workspace->parent); focused_ws = seat_get_focus_inactive(seat, workspace->parent);
if (focused_ws->type != C_WORKSPACE) { if (focused_ws->type != C_WORKSPACE) {
focused_ws = container_parent(focused_ws, C_WORKSPACE); focused_ws = container_parent(focused_ws, C_WORKSPACE);
} }

2
sway/tree/container.c
View file

@ -144,7 +144,7 @@ struct sway_container *container_output_create(
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input_manager->seats, link) { wl_list_for_each(seat, &input_manager->seats, link) {
if (!seat->has_focus) { if (!seat->has_focus) {
sway_seat_set_focus(seat, ws); seat_set_focus(seat, ws);
} }
} }

8
sway/tree/layout.c
View file

@ -404,7 +404,7 @@ static struct sway_container *get_swayc_in_output_direction(
return NULL; return NULL;
} }
struct sway_container *ws = sway_seat_get_focus_inactive(seat, output); struct sway_container *ws = seat_get_focus_inactive(seat, output);
if (ws->type != C_WORKSPACE) { if (ws->type != C_WORKSPACE) {
ws = container_parent(ws, C_WORKSPACE); ws = container_parent(ws, C_WORKSPACE);
} }
@ -425,7 +425,7 @@ static struct sway_container *get_swayc_in_output_direction(
case MOVE_UP: case MOVE_UP:
case MOVE_DOWN: { case MOVE_DOWN: {
struct sway_container *focused = struct sway_container *focused =
sway_seat_get_focus_inactive(seat, ws); seat_get_focus_inactive(seat, ws);
if (focused && focused->parent) { if (focused && focused->parent) {
struct sway_container *parent = focused->parent; struct sway_container *parent = focused->parent;
if (parent->layout == L_VERT) { if (parent->layout == L_VERT) {
@ -509,7 +509,7 @@ static struct sway_container *get_swayc_in_direction_under(
struct sway_container *container, enum movement_direction dir, struct sway_container *container, enum movement_direction dir,
struct sway_seat *seat, struct sway_container *limit) { struct sway_seat *seat, struct sway_container *limit) {
if (dir == MOVE_CHILD) { if (dir == MOVE_CHILD) {
return sway_seat_get_focus_inactive(seat, container); return seat_get_focus_inactive(seat, container);
} }
struct sway_container *parent = container->parent; struct sway_container *parent = container->parent;
@ -589,7 +589,7 @@ static struct sway_container *get_swayc_in_direction_under(
} }
if (next->children && next->children->length) { if (next->children && next->children->length) {
// TODO consider floating children as well // TODO consider floating children as well
return sway_seat_get_focus_inactive(seat, next); return seat_get_focus_inactive(seat, next);
} else { } else {
return next; return next;
} }

14
sway/tree/workspace.c
View file

@ -158,7 +158,7 @@ static bool _workspace_by_name(struct sway_container *view, void *data) {
struct sway_container *workspace_by_name(const char *name) { struct sway_container *workspace_by_name(const char *name) {
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *current_workspace = NULL, *current_output = NULL; struct sway_container *current_workspace = NULL, *current_output = NULL;
struct sway_container *focus = sway_seat_get_focus(seat); struct sway_container *focus = seat_get_focus(seat);
if (focus) { if (focus) {
current_workspace = container_parent(focus, C_WORKSPACE); current_workspace = container_parent(focus, C_WORKSPACE);
current_output = container_parent(focus, C_OUTPUT); current_output = container_parent(focus, C_OUTPUT);
@ -200,7 +200,7 @@ struct sway_container *workspace_create(const char *name) {
// Otherwise create a new one // Otherwise create a new one
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = struct sway_container *focus =
sway_seat_get_focus_inactive(seat, &root_container); seat_get_focus_inactive(seat, &root_container);
parent = focus; parent = focus;
parent = container_parent(parent, C_OUTPUT); parent = container_parent(parent, C_OUTPUT);
struct sway_container *new_ws = container_workspace_create(parent, name); struct sway_container *new_ws = container_workspace_create(parent, name);
@ -260,7 +260,7 @@ struct sway_container *workspace_output_prev_next_impl(
} }
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, output); struct sway_container *focus = seat_get_focus_inactive(seat, output);
struct sway_container *workspace = (focus->type == C_WORKSPACE ? struct sway_container *workspace = (focus->type == C_WORKSPACE ?
focus : focus :
container_parent(focus, C_WORKSPACE)); container_parent(focus, C_WORKSPACE));
@ -345,7 +345,7 @@ bool workspace_switch(struct sway_container *workspace) {
} }
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = struct sway_container *focus =
sway_seat_get_focus_inactive(seat, &root_container); seat_get_focus_inactive(seat, &root_container);
if (!seat || !focus) { if (!seat || !focus) {
return false; return false;
} }
@ -376,11 +376,11 @@ bool workspace_switch(struct sway_container *workspace) {
wlr_log(L_DEBUG, "Switching to workspace %p:%s", wlr_log(L_DEBUG, "Switching to workspace %p:%s",
workspace, workspace->name); workspace, workspace->name);
struct sway_container *next = sway_seat_get_focus_inactive(seat, workspace); struct sway_container *next = seat_get_focus_inactive(seat, workspace);
if (next == NULL) { if (next == NULL) {
next = workspace; next = workspace;
} }
sway_seat_set_focus(seat, next); seat_set_focus(seat, next);
struct sway_container *output = container_parent(workspace, C_OUTPUT); struct sway_container *output = container_parent(workspace, C_OUTPUT);
arrange_windows(output, -1, -1); arrange_windows(output, -1, -1);
return true; return true;
@ -389,7 +389,7 @@ bool workspace_switch(struct sway_container *workspace) {
bool workspace_is_visible(struct sway_container *ws) { bool workspace_is_visible(struct sway_container *ws) {
struct sway_container *output = container_parent(ws, C_OUTPUT); struct sway_container *output = container_parent(ws, C_OUTPUT);
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, output); struct sway_container *focus = seat_get_focus_inactive(seat, output);
if (focus->type != C_WORKSPACE) { if (focus->type != C_WORKSPACE) {
focus = container_parent(focus, C_WORKSPACE); focus = container_parent(focus, C_WORKSPACE);
} }