aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/config.c1
-rw-r--r--sway/input/input-manager.c21
2 files changed, 14 insertions, 8 deletions
diff --git a/sway/config.c b/sway/config.c
index bb18c739..303774b4 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -465,6 +465,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
if (config->swaynag_config_errors.pid > 0) {
swaynag_show(&config->swaynag_config_errors);
}
+ input_manager_verify_fallback_seat();
}
if (old_config) {
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 055f6752..9aaeb4d6 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -95,6 +95,17 @@ static bool input_has_seat_fallback_configuration(void) {
return false;
}
+void input_manager_verify_fallback_seat(void) {
+ struct sway_seat *seat = NULL;
+ if (!input_has_seat_fallback_configuration()) {
+ wlr_log(WLR_DEBUG, "no fallback seat config - creating default");
+ seat = input_manager_get_default_seat();
+ struct seat_config *sc = new_seat_config(seat->wlr_seat->name);
+ sc->fallback = true;
+ store_seat_config(sc);
+ }
+}
+
static void input_manager_libinput_config_keyboard(
struct sway_input_device *input_device) {
struct wlr_input_device *wlr_device = input_device->wlr_device;
@@ -296,16 +307,10 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
wl_signal_add(&device->events.destroy, &input_device->device_destroy);
input_device->device_destroy.notify = handle_device_destroy;
- struct sway_seat *seat = NULL;
- if (!input_has_seat_fallback_configuration()) {
- wlr_log(WLR_DEBUG, "no seat config - creating default seat config");
- seat = input_manager_get_default_seat();
- struct seat_config *sc = new_seat_config(seat->wlr_seat->name);
- sc->fallback = true;
- store_seat_config(sc);
- }
+ input_manager_verify_fallback_seat();
bool added = false;
+ struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) {
struct seat_config *seat_config = seat_get_config(seat);
bool has_attachment = seat_config &&