aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/input-manager.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-02-03 13:56:05 -0500
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-02-03 14:01:29 -0500
commit7299b9a6ca3658852f2ff41b05f6aaa86ff90d81 (patch)
tree8e54c4ee9dd0ffceecf5a99f91a341fd1d714c5e /sway/input/input-manager.c
parentMerge pull request #3563 from vilhalmer/fix-wildcard-seat-constrain-crashes-d... (diff)
downloadsway-7299b9a6ca3658852f2ff41b05f6aaa86ff90d81.tar.gz
sway-7299b9a6ca3658852f2ff41b05f6aaa86ff90d81.tar.zst
sway-7299b9a6ca3658852f2ff41b05f6aaa86ff90d81.zip
seat_cmd_cursor: do not create non-existing seat
If a seat does not exist in seat_cmd_cursor, do not create it. A seat without any attachments is useless since it will have no capabilities. This changes `input_manager_get_seat` to have an additional argument that dictates whether or not to create the seat if it does not exist.
Diffstat (limited to 'sway/input/input-manager.c')
-rw-r--r--sway/input/input-manager.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 8d263e06..f99fc395 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -31,10 +31,10 @@ struct sway_seat *input_manager_current_seat(void) {
31} 31}
32 32
33struct sway_seat *input_manager_get_default_seat(void) { 33struct sway_seat *input_manager_get_default_seat(void) {
34 return input_manager_get_seat(DEFAULT_SEAT); 34 return input_manager_get_seat(DEFAULT_SEAT, true);
35} 35}
36 36
37struct sway_seat *input_manager_get_seat(const char *seat_name) { 37struct sway_seat *input_manager_get_seat(const char *seat_name, bool create) {
38 struct sway_seat *seat = NULL; 38 struct sway_seat *seat = NULL;
39 wl_list_for_each(seat, &server.input->seats, link) { 39 wl_list_for_each(seat, &server.input->seats, link) {
40 if (strcmp(seat->wlr_seat->name, seat_name) == 0) { 40 if (strcmp(seat->wlr_seat->name, seat_name) == 0) {
@@ -42,7 +42,7 @@ struct sway_seat *input_manager_get_seat(const char *seat_name) {
42 } 42 }
43 } 43 }
44 44
45 return seat_create(seat_name); 45 return create ? seat_create(seat_name) : NULL;
46} 46}
47 47
48char *input_device_get_identifier(struct wlr_input_device *device) { 48char *input_device_get_identifier(struct wlr_input_device *device) {
@@ -674,7 +674,8 @@ void input_manager_apply_seat_config(struct seat_config *seat_config) {
674 seat_apply_config(seat, sc); 674 seat_apply_config(seat, sc);
675 } 675 }
676 } else { 676 } else {
677 struct sway_seat *seat = input_manager_get_seat(seat_config->name); 677 struct sway_seat *seat =
678 input_manager_get_seat(seat_config->name, true);
678 if (!seat) { 679 if (!seat) {
679 return; 680 return;
680 } 681 }