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

Merge pull request #3564 from RedSoxFan/seat-cursor-do-not-create

Browse source 
seat_cmd_cursor: do not create non-existing seat
This commit is contained in:
Drew DeVault 2019-02-03 20:14:45 +01:00 committed by GitHub
parent 8e60efe0bf 7299b9a6ca
commit 4ef5b49906
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/input/input-manager.h
View file

@ -45,7 +45,7 @@ void input_manager_apply_seat_config(struct seat_config *seat_config);
struct sway_seat *input_manager_get_default_seat(void); struct sway_seat *input_manager_get_default_seat(void);
struct sway_seat *input_manager_get_seat(const char *seat_name); struct sway_seat *input_manager_get_seat(const char *seat_name, bool create);
/** /**
* If none of the seat configs have a fallback setting (either true or false), * If none of the seat configs have a fallback setting (either true or false),

5
sway/commands/seat/cursor.c
View file

@ -61,9 +61,10 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
} }
if (strcmp(sc->name, "*") != 0) { if (strcmp(sc->name, "*") != 0) {
struct sway_seat *seat = input_manager_get_seat(sc->name); struct sway_seat *seat = input_manager_get_seat(sc->name, false);
if (!seat) { if (!seat) {
return cmd_results_new(CMD_FAILURE, "Failed to get seat"); return cmd_results_new(CMD_FAILURE,
"Seat %s does not exist", sc->name);
} }
error = handle_command(seat->cursor, argc, argv); error = handle_command(seat->cursor, argc, argv);
} else { } else {

4
sway/config.c
View file

@ -149,11 +149,13 @@ static void destroy_removed_seats(struct sway_config *old_config,
/* Also destroy seats that aren't present in new config */ /* Also destroy seats that aren't present in new config */
if (new_config && list_seq_find(new_config->seat_configs, if (new_config && list_seq_find(new_config->seat_configs,
seat_name_cmp, seat_config->name) < 0) { seat_name_cmp, seat_config->name) < 0) {
seat = input_manager_get_seat(seat_config->name); seat = input_manager_get_seat(seat_config->name, false);
if (seat) {
seat_destroy(seat); seat_destroy(seat);
} }
} }
} }
}
static void set_color(float dest[static 4], uint32_t color) { static void set_color(float dest[static 4], uint32_t color) {
dest[0] = ((color >> 16) & 0xff) / 255.0; dest[0] = ((color >> 16) & 0xff) / 255.0;

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

@ -31,10 +31,10 @@ struct sway_seat *input_manager_current_seat(void) {
} }
struct sway_seat *input_manager_get_default_seat(void) { struct sway_seat *input_manager_get_default_seat(void) {
return input_manager_get_seat(DEFAULT_SEAT); return input_manager_get_seat(DEFAULT_SEAT, true);
} }
struct sway_seat *input_manager_get_seat(const char *seat_name) { struct sway_seat *input_manager_get_seat(const char *seat_name, bool create) {
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &server.input->seats, link) { wl_list_for_each(seat, &server.input->seats, link) {
if (strcmp(seat->wlr_seat->name, seat_name) == 0) { if (strcmp(seat->wlr_seat->name, seat_name) == 0) {
@ -42,7 +42,7 @@ struct sway_seat *input_manager_get_seat(const char *seat_name) {
} }
} }
return seat_create(seat_name); return create ? seat_create(seat_name) : NULL;
} }
char *input_device_get_identifier(struct wlr_input_device *device) { char *input_device_get_identifier(struct wlr_input_device *device) {
@ -674,7 +674,8 @@ void input_manager_apply_seat_config(struct seat_config *seat_config) {
seat_apply_config(seat, sc); seat_apply_config(seat, sc);
} }
} else { } else {
struct sway_seat *seat = input_manager_get_seat(seat_config->name); struct sway_seat *seat =
input_manager_get_seat(seat_config->name, true);
if (!seat) { if (!seat) {
return; return;
} }