remove unused attachment config

3 files changed, 26 insertions, 12 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 03b51948..91f772b5 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -377,6 +377,7 @@ void free_config(struct sway_config *config);
 void config_clear_handler_context(struct sway_config *config);
 
 void free_sway_variable(struct sway_variable *var);
+
 /**
  * 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();
 
 int input_identifier_cmp(const void *item, const void *data);
+
 struct input_config *new_input_config(const char* identifier);
+
 void merge_input_config(struct input_config *dst, struct input_config *src);
+
 struct input_config *copy_input_config(struct input_config *ic);
+
 void free_input_config(struct input_config *ic);
+
 void apply_input_config(struct input_config *input);
 
 int seat_name_cmp(const void *item, const void *data);
+
 struct seat_config *new_seat_config(const char* name);
+
 void merge_seat_config(struct seat_config *dst, struct seat_config *src);
+
 struct seat_config *copy_seat_config(struct seat_config *seat);
+
 void free_seat_config(struct seat_config *ic);
+
 struct seat_attachment_config *seat_attachment_config_new();
+
 struct seat_attachment_config *seat_config_get_attachment(
                 struct seat_config *seat_config, char *identifier);
+
 void apply_seat_config(struct seat_config *seat);
 
 int output_name_cmp(const void *item, const void *data);
+
 void output_get_identifier(char *identifier, size_t len,
         struct sway_output *output);
+
 struct output_config *new_output_config(const char *name);
+
 void merge_output_config(struct output_config *dst, struct output_config *src);
+
 void apply_output_config(struct output_config *oc,
                 struct sway_container *output);
+
 void free_output_config(struct output_config *oc);
 
 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_qsort(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);
+
 struct sway_binding *sway_binding_dup(struct sway_binding *sb);
 
-/* Bar stuff */
 void load_swaybars();
+
 void invoke_swaybar(struct bar_config *bar);
+
 void terminate_swaybg(pid_t pid);
+
 struct bar_config *default_bar_config(void);
+
 void free_bar_config(struct bar_config *bar);
 
 /* Global config singleton. */
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 3a1cf350..5c3c2c4f 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -8,7 +8,6 @@ struct sway_seat_device {
         struct sway_seat *sway_seat;
         struct sway_input_device *input_device;
         struct sway_keyboard *keyboard;
-        struct seat_attachment_config *attachment_config;
         struct wl_list link; // sway_seat::devices
 };
 
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 38b617b7..27636c1e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -202,13 +202,6 @@ void seat_configure_device(struct sway_seat *seat,
                 return;
         }
 
-        struct seat_config *seat_config = seat_get_config(seat);
-
-        if (seat_config) {
-                seat_device->attachment_config =
-                        seat_config_get_attachment(seat_config, input_device->identifier);
-        }
-
         switch (input_device->wlr_device->type) {
                 case WLR_INPUT_DEVICE_POINTER:
                         seat_configure_pointer(seat, seat_device);
@@ -426,9 +419,6 @@ struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
 void seat_apply_config(struct sway_seat *seat,
                 struct seat_config *seat_config) {
         struct sway_seat_device *seat_device = NULL;
-        wl_list_for_each(seat_device, &seat->devices, link) {
-                seat_device->attachment_config = NULL;
-        }
 
         if (!seat_config) {
                 return;