mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1699 from acrisci/seat-fixes

Browse Source 
Seat fixes and cleanup
This commit is contained in:
emersion 2018-04-02 15:24:25 -04:00 committed by GitHub
commit 0c0cc79282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 248 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/sway/config.h
View File

@ -377,6 +377,7 @@ void free_config(struct sway_config *config);
void config_clear_handler_context(struct sway_config *config); void config_clear_handler_context(struct sway_config *config);
void free_sway_variable(struct sway_variable *var); void free_sway_variable(struct sway_variable *var);
/** /**
* Does variable replacement for a string based on the config's currently loaded variables. * Does variable replacement for a string based on the config's currently loaded variables.
*/ */
@ -385,44 +386,68 @@ char *do_var_replacement(char *str);
struct cmd_results *check_security_config(); struct cmd_results *check_security_config();
int input_identifier_cmp(const void *item, const void *data); int input_identifier_cmp(const void *item, const void *data);
struct input_config *new_input_config(const char* identifier); struct input_config *new_input_config(const char* identifier);
void merge_input_config(struct input_config *dst, struct input_config *src); void merge_input_config(struct input_config *dst, struct input_config *src);
struct input_config *copy_input_config(struct input_config *ic); struct input_config *copy_input_config(struct input_config *ic);
void free_input_config(struct input_config *ic); void free_input_config(struct input_config *ic);
void apply_input_config(struct input_config *input); void apply_input_config(struct input_config *input);
int seat_name_cmp(const void *item, const void *data); int seat_name_cmp(const void *item, const void *data);
struct seat_config *new_seat_config(const char* name); struct seat_config *new_seat_config(const char* name);
void merge_seat_config(struct seat_config *dst, struct seat_config *src); void merge_seat_config(struct seat_config *dst, struct seat_config *src);
struct seat_config *copy_seat_config(struct seat_config *seat); struct seat_config *copy_seat_config(struct seat_config *seat);
void free_seat_config(struct seat_config *ic); void free_seat_config(struct seat_config *ic);
struct seat_attachment_config *seat_attachment_config_new(); struct seat_attachment_config *seat_attachment_config_new();
struct seat_attachment_config *seat_config_get_attachment( struct seat_attachment_config *seat_config_get_attachment(
struct seat_config *seat_config, char *identifier); struct seat_config *seat_config, char *identifier);
void apply_seat_config(struct seat_config *seat); void apply_seat_config(struct seat_config *seat);
int output_name_cmp(const void *item, const void *data); int output_name_cmp(const void *item, const void *data);
void output_get_identifier(char *identifier, size_t len, void output_get_identifier(char *identifier, size_t len,
struct sway_output *output); struct sway_output *output);
struct output_config *new_output_config(const char *name); struct output_config *new_output_config(const char *name);
void merge_output_config(struct output_config *dst, struct output_config *src); void merge_output_config(struct output_config *dst, struct output_config *src);
void apply_output_config(struct output_config *oc, void apply_output_config(struct output_config *oc,
struct sway_container *output); struct sway_container *output);
void free_output_config(struct output_config *oc); void free_output_config(struct output_config *oc);
int workspace_output_cmp_workspace(const void *a, const void *b); int workspace_output_cmp_workspace(const void *a, const void *b);
int sway_binding_cmp(const void *a, const void *b); int sway_binding_cmp(const void *a, const void *b);
int sway_binding_cmp_qsort(const void *a, const void *b); int sway_binding_cmp_qsort(const void *a, const void *b);
int sway_binding_cmp_keys(const void *a, const void *b); int sway_binding_cmp_keys(const void *a, const void *b);
void free_sway_binding(struct sway_binding *sb); void free_sway_binding(struct sway_binding *sb);
struct sway_binding *sway_binding_dup(struct sway_binding *sb); struct sway_binding *sway_binding_dup(struct sway_binding *sb);
/* Bar stuff */
void load_swaybars(); void load_swaybars();
void invoke_swaybar(struct bar_config *bar); void invoke_swaybar(struct bar_config *bar);
void terminate_swaybg(pid_t pid); void terminate_swaybg(pid_t pid);
struct bar_config *default_bar_config(void); struct bar_config *default_bar_config(void);
void free_bar_config(struct bar_config *bar); void free_bar_config(struct bar_config *bar);
/* Global config singleton. */ /* Global config singleton. */

23
include/sway/input/input-manager.h
View File

@ -14,7 +14,6 @@ extern struct sway_input_manager *input_manager;
struct sway_input_device { struct sway_input_device {
char *identifier; char *identifier;
struct wlr_input_device *wlr_device; struct wlr_input_device *wlr_device;
struct input_config *config;
struct wl_list link; struct wl_list link;
struct wl_listener device_destroy; struct wl_listener device_destroy;
}; };
@ -27,30 +26,34 @@ struct sway_input_manager {
struct wl_listener new_input; struct wl_listener new_input;
}; };
struct sway_input_manager *sway_input_manager_create( struct sway_input_manager *input_manager_create(struct sway_server *server);
struct sway_server *server);
bool sway_input_manager_has_focus(struct sway_input_manager *input, bool input_manager_has_focus(struct sway_input_manager *input,
struct sway_container *container); struct sway_container *container);
void sway_input_manager_set_focus(struct sway_input_manager *input, void input_manager_set_focus(struct sway_input_manager *input,
struct sway_container *container); struct sway_container *container);
void sway_input_manager_configure_xcursor(struct sway_input_manager *input); void input_manager_configure_xcursor(struct sway_input_manager *input);
void sway_input_manager_apply_input_config(struct sway_input_manager *input, void input_manager_apply_input_config(struct sway_input_manager *input,
struct input_config *input_config); struct input_config *input_config);
void sway_input_manager_apply_seat_config(struct sway_input_manager *input, void input_manager_apply_seat_config(struct sway_input_manager *input,
struct seat_config *seat_config); struct seat_config *seat_config);
struct sway_seat *sway_input_manager_get_default_seat( struct sway_seat *input_manager_get_default_seat(
struct sway_input_manager *input); struct sway_input_manager *input);
struct sway_seat *input_manager_get_seat(struct sway_input_manager *input, struct sway_seat *input_manager_get_seat(struct sway_input_manager *input,
const char *seat_name); const char *seat_name);
/** Gets the last seat the user interacted with */ /**
* Gets the last seat the user interacted with
*/
struct sway_seat *input_manager_current_seat(struct sway_input_manager *input); struct sway_seat *input_manager_current_seat(struct sway_input_manager *input);
struct input_config *input_device_get_config(struct sway_input_device *device);
#endif #endif

28
include/sway/input/seat.h
View File

@ -8,7 +8,6 @@ struct sway_seat_device {
struct sway_seat *sway_seat; struct sway_seat *sway_seat;
struct sway_input_device *input_device; struct sway_input_device *input_device;
struct sway_keyboard *keyboard; struct sway_keyboard *keyboard;
struct seat_attachment_config *attachment_config;
struct wl_list link; // sway_seat::devices struct wl_list link; // sway_seat::devices
}; };
@ -23,7 +22,6 @@ struct sway_seat_container {
struct sway_seat { struct sway_seat {
struct wlr_seat *wlr_seat; struct wlr_seat *wlr_seat;
struct seat_config *config;
struct sway_cursor *cursor; struct sway_cursor *cursor;
struct sway_input_manager *input; struct sway_input_manager *input;
@ -38,28 +36,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 +68,14 @@ 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_apply_config(struct sway_seat *seat, struct seat_config *seat_config);
struct seat_config *seat_get_config(struct sway_seat *seat);
#endif #endif

20
sway/commands.c
View File

@ -72,23 +72,23 @@ void apply_input_config(struct input_config *input) {
list_add(config->input_configs, input); list_add(config->input_configs, input);
} }
sway_input_manager_apply_input_config(input_manager, input); input_manager_apply_input_config(input_manager, input);
} }
void apply_seat_config(struct seat_config *seat) { void apply_seat_config(struct seat_config *seat_config) {
int i; int i;
i = list_seq_find(config->seat_configs, seat_name_cmp, seat->name); i = list_seq_find(config->seat_configs, seat_name_cmp, seat_config->name);
if (i >= 0) { if (i >= 0) {
// merge existing config // merge existing config
struct seat_config *sc = config->seat_configs->items[i]; struct seat_config *sc = config->seat_configs->items[i];
merge_seat_config(sc, seat); merge_seat_config(sc, seat_config);
free_seat_config(seat); free_seat_config(seat_config);
seat = sc; seat_config = sc;
} else { } else {
list_add(config->seat_configs, seat); list_add(config->seat_configs, seat_config);
} }
sway_input_manager_apply_seat_config(input_manager, seat); input_manager_apply_seat_config(input_manager, seat_config);
} }
/* Keep alphabetized */ /* Keep alphabetized */
@ -263,7 +263,7 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
if (seat == NULL) { if (seat == NULL) {
// passing a NULL seat means we just pick the default seat // passing a NULL seat means we just pick the default seat
seat = sway_input_manager_get_default_seat(input_manager); seat = input_manager_get_default_seat(input_manager);
if (!sway_assert(seat, "could not find a seat to run the command on")) { if (!sway_assert(seat, "could not find a seat to run the command on")) {
return NULL; return NULL;
} }
@ -341,7 +341,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

@ -36,7 +36,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);
} }
@ -50,7 +50,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
struct sway_container *next_focus = container_get_in_direction( struct sway_container *next_focus = container_get_in_direction(
con, seat, 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);

8
sway/commands/move.c
View File

@ -78,10 +78,10 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
} }
free(ws_name); free(ws_name);
struct sway_container *old_parent = current->parent; struct sway_container *old_parent = current->parent;
struct sway_container *focus = sway_seat_get_focus_inactive( struct sway_container *focus = seat_get_focus_inactive(
config->handler_context.seat, ws); config->handler_context.seat, ws);
container_move_to(current, focus); container_move_to(current, focus);
sway_seat_set_focus(config->handler_context.seat, old_parent); seat_set_focus(config->handler_context.seat, old_parent);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} else if (strcasecmp(argv[1], "to") == 0 } else if (strcasecmp(argv[1], "to") == 0
&& strcasecmp(argv[2], "output") == 0) { && strcasecmp(argv[2], "output") == 0) {
@ -100,7 +100,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
return cmd_results_new(CMD_FAILURE, "move workspace", return cmd_results_new(CMD_FAILURE, "move workspace",
"Can't find output with name/direction '%s'", argv[3]); "Can't find output with name/direction '%s'", argv[3]);
} }
struct sway_container *focus = sway_seat_get_focus_inactive( struct sway_container *focus = seat_get_focus_inactive(
config->handler_context.seat, destination); config->handler_context.seat, destination);
if (!focus) { if (!focus) {
// We've never been to this output before // We've never been to this output before
@ -108,7 +108,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
} }
struct sway_container *old_parent = current->parent; struct sway_container *old_parent = current->parent;
container_move_to(current, focus); container_move_to(current, focus);
sway_seat_set_focus(config->handler_context.seat, old_parent); seat_set_focus(config->handler_context.seat, old_parent);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
return cmd_results_new(CMD_INVALID, "move", expected_syntax); return cmd_results_new(CMD_INVALID, "move", expected_syntax);

11
sway/commands/seat.c
View File

@ -14,7 +14,8 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
free_seat_config(config->handler_context.seat_config); free_seat_config(config->handler_context.seat_config);
config->handler_context.seat_config = new_seat_config(argv[0]); config->handler_context.seat_config = new_seat_config(argv[0]);
if (!config->handler_context.seat_config) { if (!config->handler_context.seat_config) {
return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config"); return cmd_results_new(CMD_FAILURE, NULL,
"Couldn't allocate config");
} }
wlr_log(L_DEBUG, "entering seat block: %s", argv[0]); wlr_log(L_DEBUG, "entering seat block: %s", argv[0]);
return cmd_results_new(CMD_BLOCK_SEAT, NULL, NULL); return cmd_results_new(CMD_BLOCK_SEAT, NULL, NULL);
@ -28,7 +29,8 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
if (!has_context) { if (!has_context) {
config->handler_context.seat_config = new_seat_config(argv[0]); config->handler_context.seat_config = new_seat_config(argv[0]);
if (!config->handler_context.seat_config) { if (!config->handler_context.seat_config) {
return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config"); return cmd_results_new(CMD_FAILURE, NULL,
"Couldn't allocate config");
} }
} }
@ -41,7 +43,10 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
} else if (strcasecmp("fallback", argv[1]) == 0) { } else if (strcasecmp("fallback", argv[1]) == 0) {
res = seat_cmd_fallback(argc_new, argv_new); res = seat_cmd_fallback(argc_new, argv_new);
} else { } else {
res = cmd_results_new(CMD_INVALID, "seat <name>", "Unknown command %s", argv[1]); res =
cmd_results_new(CMD_INVALID,
"seat <name>", "Unknown command %s",
argv[1]);
} }
if (!has_context) { if (!has_context) {

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);
} }
} }
} }

4
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);
if (!focus) { if (!focus) {
// We've never been to this output before // We've never been to this output before
focus = output->swayc->children->items[0]; focus = output->swayc->children->items[0];
@ -373,7 +373,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wl_list_init(&output->layers[i]); wl_list_init(&output->layers[i]);
} }
sway_input_manager_configure_xcursor(input_manager); input_manager_configure_xcursor(input_manager);
wl_signal_add(&wlr_output->events.destroy, &output->destroy); wl_signal_add(&wlr_output->events.destroy, &output->destroy);
output->destroy.notify = handle_destroy; output->destroy.notify = handle_destroy;

4
sway/desktop/wl_shell.c
View File

@ -133,10 +133,10 @@ 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;
arrange_windows(cont->parent, -1, -1); arrange_windows(cont->parent, -1, -1);
sway_input_manager_set_focus(input_manager, cont); input_manager_set_focus(input_manager, cont);
} }

4
sway/desktop/xdg_shell_v6.c
View File

@ -98,11 +98,11 @@ 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);
sway_input_manager_set_focus(input_manager, cont); input_manager_set_focus(input_manager, cont);
view_damage_whole(sway_surface->view); view_damage_whole(sway_surface->view);
} }

4
sway/desktop/xwayland.c
View File

@ -143,12 +143,12 @@ 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;
arrange_windows(cont->parent, -1, -1); arrange_windows(cont->parent, -1, -1);
sway_input_manager_set_focus(input_manager, cont); input_manager_set_focus(input_manager, cont);
} }
view_damage_whole(sway_surface->view); view_damage_whole(sway_surface->view);

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,

144
sway/input/input-manager.c
View File

@ -26,7 +26,7 @@ struct seat_config *current_seat_config = NULL;
struct sway_seat *input_manager_current_seat(struct sway_input_manager *input) { struct sway_seat *input_manager_current_seat(struct sway_input_manager *input) {
struct sway_seat *seat = config->handler_context.seat; struct sway_seat *seat = config->handler_context.seat;
if (!seat) { if (!seat) {
seat = sway_input_manager_get_default_seat(input_manager); seat = input_manager_get_default_seat(input_manager);
} }
return seat; return seat;
} }
@ -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) {
@ -83,7 +83,8 @@ static struct sway_input_device *input_sway_device_from_wlr(
static bool input_has_seat_configuration(struct sway_input_manager *input) { static bool input_has_seat_configuration(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) {
if (seat->config) { struct seat_config *seat_config = seat_get_config(seat);
if (seat_config) {
return true; return true;
} }
} }
@ -91,9 +92,10 @@ static bool input_has_seat_configuration(struct sway_input_manager *input) {
return false; return false;
} }
static void sway_input_manager_libinput_config_pointer(struct sway_input_device *input_device) { static void input_manager_libinput_config_pointer(
struct sway_input_device *input_device) {
struct wlr_input_device *wlr_device = input_device->wlr_device; struct wlr_input_device *wlr_device = input_device->wlr_device;
struct input_config *ic = input_device->config; struct input_config *ic = input_device_get_config(input_device);
struct libinput_device *libinput_device; struct libinput_device *libinput_device;
if (!ic || !wlr_input_device_is_libinput(wlr_device)) { if (!ic || !wlr_input_device_is_libinput(wlr_device)) {
@ -101,22 +103,27 @@ static void sway_input_manager_libinput_config_pointer(struct sway_input_device
} }
libinput_device = wlr_libinput_get_device_handle(wlr_device); libinput_device = wlr_libinput_get_device_handle(wlr_device);
wlr_log(L_DEBUG, "sway_input_manager_libinput_config_pointer(%s)", ic->identifier); wlr_log(L_DEBUG, "input_manager_libinput_config_pointer(%s)",
ic->identifier);
if (ic->accel_profile != INT_MIN) { if (ic->accel_profile != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)", wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
ic->identifier, ic->accel_profile); ic->identifier, ic->accel_profile);
libinput_device_config_accel_set_profile(libinput_device, ic->accel_profile); libinput_device_config_accel_set_profile(libinput_device,
ic->accel_profile);
} }
if (ic->click_method != INT_MIN) { if (ic->click_method != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)", wlr_log(L_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
ic->identifier, ic->click_method); ic->identifier, ic->click_method);
libinput_device_config_click_set_method(libinput_device, ic->click_method); libinput_device_config_click_set_method(libinput_device,
ic->click_method);
} }
if (ic->drag_lock != INT_MIN) { if (ic->drag_lock != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)", wlr_log(L_DEBUG,
"libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
ic->identifier, ic->click_method); ic->identifier, ic->click_method);
libinput_device_config_tap_set_drag_lock_enabled(libinput_device, ic->drag_lock); libinput_device_config_tap_set_drag_lock_enabled(libinput_device,
ic->drag_lock);
} }
if (ic->dwt != INT_MIN) { if (ic->dwt != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)", wlr_log(L_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
@ -124,34 +131,43 @@ static void sway_input_manager_libinput_config_pointer(struct sway_input_device
libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt); libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt);
} }
if (ic->left_handed != INT_MIN) { if (ic->left_handed != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) left_handed_set_enabled(%d)", wlr_log(L_DEBUG,
"libinput_config_pointer(%s) left_handed_set_enabled(%d)",
ic->identifier, ic->left_handed); ic->identifier, ic->left_handed);
libinput_device_config_left_handed_set(libinput_device, ic->left_handed); libinput_device_config_left_handed_set(libinput_device,
ic->left_handed);
} }
if (ic->middle_emulation != INT_MIN) { if (ic->middle_emulation != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) middle_emulation_set_enabled(%d)", wlr_log(L_DEBUG,
"libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
ic->identifier, ic->middle_emulation); ic->identifier, ic->middle_emulation);
libinput_device_config_middle_emulation_set_enabled(libinput_device, ic->middle_emulation); libinput_device_config_middle_emulation_set_enabled(libinput_device,
ic->middle_emulation);
} }
if (ic->natural_scroll != INT_MIN) { if (ic->natural_scroll != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) natural_scroll_set_enabled(%d)", wlr_log(L_DEBUG,
"libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
ic->identifier, ic->natural_scroll); ic->identifier, ic->natural_scroll);
libinput_device_config_scroll_set_natural_scroll_enabled(libinput_device, ic->natural_scroll); libinput_device_config_scroll_set_natural_scroll_enabled(
libinput_device, ic->natural_scroll);
} }
if (ic->pointer_accel != FLT_MIN) { if (ic->pointer_accel != FLT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)", wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
ic->identifier, ic->pointer_accel); ic->identifier, ic->pointer_accel);
libinput_device_config_accel_set_speed(libinput_device, ic->pointer_accel); libinput_device_config_accel_set_speed(libinput_device,
ic->pointer_accel);
} }
if (ic->scroll_method != INT_MIN) { if (ic->scroll_method != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)", wlr_log(L_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
ic->identifier, ic->scroll_method); ic->identifier, ic->scroll_method);
libinput_device_config_scroll_set_method(libinput_device, ic->scroll_method); libinput_device_config_scroll_set_method(libinput_device,
ic->scroll_method);
} }
if (ic->send_events != INT_MIN) { if (ic->send_events != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)", wlr_log(L_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
ic->identifier, ic->send_events); ic->identifier, ic->send_events);
libinput_device_config_send_events_set_mode(libinput_device, ic->send_events); libinput_device_config_send_events_set_mode(libinput_device,
ic->send_events);
} }
if (ic->tap != INT_MIN) { if (ic->tap != INT_MIN) {
wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)", wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
@ -175,12 +191,11 @@ 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);
wl_list_remove(&input_device->device_destroy.link); wl_list_remove(&input_device->device_destroy.link);
free_input_config(input_device->config);
free(input_device->identifier); free(input_device->identifier);
free(input_device); free(input_device);
} }
@ -203,44 +218,36 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
wlr_log(L_DEBUG, "adding device: '%s'", wlr_log(L_DEBUG, "adding device: '%s'",
input_device->identifier); input_device->identifier);
// find config
for (int i = 0; i < config->input_configs->length; ++i) {
struct input_config *input_config = config->input_configs->items[i];
if (strcmp(input_config->identifier, input_device->identifier) == 0) {
free_input_config(input_device->config);
input_device->config = copy_input_config(input_config);
break;
}
}
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) { if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
sway_input_manager_libinput_config_pointer(input_device); input_manager_libinput_config_pointer(input_device);
} }
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
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;
} }
bool added = false; bool added = false;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
bool has_attachment = seat->config && struct seat_config *seat_config = seat_get_config(seat);
(seat_config_get_attachment(seat->config, input_device->identifier) || bool has_attachment = seat_config &&
seat_config_get_attachment(seat->config, "*")); (seat_config_get_attachment(seat_config, input_device->identifier) ||
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;
} }
} }
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) { struct seat_config *seat_config = seat_get_config(seat);
sway_seat_add_device(seat, input_device); if (seat_config && seat_config->fallback == 1) {
seat_add_device(seat, input_device);
added = true; added = true;
} }
} }
@ -256,7 +263,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
input_device->device_destroy.notify = handle_device_destroy; input_device->device_destroy.notify = handle_device_destroy;
} }
struct sway_input_manager *sway_input_manager_create( struct sway_input_manager *input_manager_create(
struct sway_server *server) { struct sway_server *server) {
struct sway_input_manager *input = struct sway_input_manager *input =
calloc(1, sizeof(struct sway_input_manager)); calloc(1, sizeof(struct sway_input_manager));
@ -277,11 +284,11 @@ struct sway_input_manager *sway_input_manager_create(
return input; return input;
} }
bool sway_input_manager_has_focus(struct sway_input_manager *input, bool 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;
} }
} }
@ -289,35 +296,32 @@ bool sway_input_manager_has_focus(struct sway_input_manager *input,
return false; return false;
} }
void sway_input_manager_set_focus(struct sway_input_manager *input, void 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);
} }
} }
void sway_input_manager_apply_input_config(struct sway_input_manager *input, void input_manager_apply_input_config(struct sway_input_manager *input,
struct input_config *input_config) { struct input_config *input_config) {
struct sway_input_device *input_device = NULL; struct sway_input_device *input_device = NULL;
wl_list_for_each(input_device, &input->devices, link) { wl_list_for_each(input_device, &input->devices, link) {
if (strcmp(input_device->identifier, input_config->identifier) == 0) { if (strcmp(input_device->identifier, input_config->identifier) == 0) {
free_input_config(input_device->config);
input_device->config = copy_input_config(input_config);
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) { if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
sway_input_manager_libinput_config_pointer(input_device); input_manager_libinput_config_pointer(input_device);
} }
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);
} }
} }
} }
} }
void sway_input_manager_apply_seat_config(struct sway_input_manager *input, void input_manager_apply_seat_config(struct sway_input_manager *input,
struct seat_config *seat_config) { struct seat_config *seat_config) {
wlr_log(L_DEBUG, "applying new seat config for seat %s", wlr_log(L_DEBUG, "applying new seat config for seat %s",
seat_config->name); seat_config->name);
@ -326,7 +330,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
return; return;
} }
sway_seat_set_config(seat, seat_config); seat_apply_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.
@ -335,11 +339,12 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
list_t *seat_list = create_list(); list_t *seat_list = create_list();
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 (!seat->config) { struct seat_config *seat_config = seat_get_config(seat);
if (!seat_config) {
continue; continue;
} }
if (seat_config_get_attachment(seat->config, "*") || if (seat_config_get_attachment(seat_config, "*") ||
seat_config_get_attachment(seat->config, seat_config_get_attachment(seat_config,
input_device->identifier)) { input_device->identifier)) {
list_add(seat_list, seat); list_add(seat_list, seat);
} }
@ -355,17 +360,18 @@ 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) { struct seat_config *seat_config = seat_get_config(seat);
sway_seat_add_device(seat, input_device); if (seat_config && seat_config->fallback == 1) {
seat_add_device(seat, input_device);
} else { } else {
sway_seat_remove_device(seat, input_device); seat_remove_device(seat, input_device);
} }
} }
} }
@ -373,14 +379,14 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
} }
} }
void sway_input_manager_configure_xcursor(struct sway_input_manager *input) { void 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);
} }
} }
struct sway_seat *sway_input_manager_get_default_seat( struct sway_seat *input_manager_get_default_seat(
struct sway_input_manager *input) { 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) {
@ -390,3 +396,15 @@ struct sway_seat *sway_input_manager_get_default_seat(
} }
return seat; return seat;
} }
struct input_config *input_device_get_config(struct sway_input_device *device) {
struct input_config *input_config = NULL;
for (int i = 0; i < config->input_configs->length; ++i) {
input_config = config->input_configs->items[i];
if (strcmp(input_config->identifier, device->identifier) == 0) {
return input_config;
}
}
return NULL;
}

2
sway/input/keyboard.c
View File

@ -428,7 +428,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
struct xkb_rule_names rules; struct xkb_rule_names rules;
memset(&rules, 0, sizeof(rules)); memset(&rules, 0, sizeof(rules));
struct input_config *input_config = struct input_config *input_config =
keyboard->seat_device->input_device->config; input_device_get_config(keyboard->seat_device->input_device);
struct wlr_input_device *wlr_device = struct wlr_input_device *wlr_device =
keyboard->seat_device->input_device->wlr_device; keyboard->seat_device->input_device->wlr_device;

99
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,19 @@ 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 +111,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) {
@ -133,7 +134,8 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
// init the focus stack // init the focus stack
wl_list_init(&seat->focus_stack); wl_list_init(&seat->focus_stack);
container_for_each_descendant_dfs(&root_container, collect_focus_iter, seat); container_for_each_descendant_dfs(&root_container,
collect_focus_iter, seat);
wl_signal_add(&root_container.sway_root->events.new_container, wl_signal_add(&root_container.sway_root->events.new_container,
&seat->new_container); &seat->new_container);
@ -147,7 +149,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);
@ -165,11 +167,12 @@ static void seat_configure_keyboard(struct sway_seat *seat,
if (!seat_device->keyboard) { if (!seat_device->keyboard) {
sway_keyboard_create(seat, seat_device); sway_keyboard_create(seat, seat_device);
} }
struct wlr_keyboard *wlr_keyboard = seat_device->input_device->wlr_device->keyboard; struct wlr_keyboard *wlr_keyboard =
seat_device->input_device->wlr_device->keyboard;
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 +182,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,19 +194,14 @@ 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;
} }
if (seat->config) {
seat_device->attachment_config =
seat_config_get_attachment(seat->config, input_device->identifier);
}
switch (input_device->wlr_device->type) { switch (input_device->wlr_device->type) {
case WLR_INPUT_DEVICE_POINTER: case WLR_INPUT_DEVICE_POINTER:
seat_configure_pointer(seat, seat_device); seat_configure_pointer(seat, seat_device);
@ -219,10 +217,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 +238,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 +256,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;
@ -273,7 +271,8 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
} }
for (int i = 0; i < root_container.children->length; ++i) { for (int i = 0; i < root_container.children->length; ++i) {
struct sway_container *output_container = root_container.children->items[i]; struct sway_container *output_container =
root_container.children->items[i];
struct wlr_output *output = struct wlr_output *output =
output_container->sway_output->wlr_output; output_container->sway_output->wlr_output;
bool result = bool result =
@ -292,9 +291,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;
@ -364,7 +363,7 @@ void sway_seat_set_focus_warp(struct sway_seat *seat,
} }
if (last_focus && last_focus->type == C_VIEW && if (last_focus && last_focus->type == C_VIEW &&
!sway_input_manager_has_focus(seat->input, last_focus)) { !input_manager_has_focus(seat->input, last_focus)) {
struct sway_view *view = last_focus->sway_view; struct sway_view *view = last_focus->sway_view;
view_set_activated(view, false); view_set_activated(view, false);
} }
@ -372,12 +371,13 @@ 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,17 @@ 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,25 +416,27 @@ 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_apply_config(struct sway_seat *seat,
struct seat_config *seat_config) { struct seat_config *seat_config) {
// clear configs
free_seat_config(seat->config);
seat->config = NULL;
struct sway_seat_device *seat_device = NULL; struct sway_seat_device *seat_device = NULL;
wl_list_for_each(seat_device, &seat->devices, link) {
seat_device->attachment_config = NULL;
}
if (!seat_config) { if (!seat_config) {
return; return;
} }
// add configs
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);
} }
} }
struct seat_config *seat_get_config(struct sway_seat *seat) {
struct seat_config *seat_config = NULL;
for (int i = 0; i < config->seat_configs->length; ++i ) {
seat_config = config->seat_configs->items[i];
if (strcmp(seat->wlr_seat->name, seat_config->name) == 0) {
return seat_config;
}
}
return NULL;
}

8
sway/ipc-json.c
View File

@ -88,11 +88,11 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje
json_object_new_string( json_object_new_string(
ipc_json_get_output_transform(wlr_output->transform))); ipc_json_get_output_transform(wlr_output->transform)));
struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager); struct sway_seat *seat = input_manager_get_default_seat(input_manager);
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);
} }
@ -139,8 +139,8 @@ json_object *ipc_json_describe_container(struct sway_container *c) {
return NULL; return NULL;
} }
struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager); struct sway_seat *seat = 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();

6
sway/ipc-server.c
View File

@ -388,8 +388,8 @@ static void ipc_get_workspaces_callback(struct sway_container *workspace,
// override the default focused indicator because // override the default focused indicator because
// 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); 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/server.c
View File

@ -109,7 +109,7 @@ bool server_init(struct sway_server *server) {
return false; return false;
} }
input_manager = sway_input_manager_create(server); input_manager = input_manager_create(server);
return true; return true;
} }

2
sway/tree/container.c
View File

@ -162,7 +162,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);
} }
} }

14
sway/tree/layout.c
View File

@ -157,17 +157,17 @@ void container_move_to(struct sway_container *container,
} }
wl_signal_emit(&container->events.reparent, old_parent); wl_signal_emit(&container->events.reparent, old_parent);
if (container->type == C_WORKSPACE) { if (container->type == C_WORKSPACE) {
struct sway_seat *seat = sway_input_manager_get_default_seat( struct sway_seat *seat = input_manager_get_default_seat(
input_manager); input_manager);
if (old_parent->children->length == 0) { if (old_parent->children->length == 0) {
char *ws_name = workspace_next_name(old_parent->name); char *ws_name = workspace_next_name(old_parent->name);
struct sway_container *ws = struct sway_container *ws =
container_workspace_create(old_parent, ws_name); container_workspace_create(old_parent, ws_name);
free(ws_name); free(ws_name);
sway_seat_set_focus(seat, ws); seat_set_focus(seat, ws);
} }
container_sort_workspaces(new_parent); container_sort_workspaces(new_parent);
sway_seat_set_focus(seat, new_parent); seat_set_focus(seat, new_parent);
} }
if (old_parent) { if (old_parent) {
arrange_windows(old_parent, -1, -1); arrange_windows(old_parent, -1, -1);
@ -430,7 +430,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);
} }
@ -451,7 +451,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) {
@ -535,7 +535,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;
@ -595,7 +595,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);
} }