mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unused attachment config

Browse source
This commit is contained in:
Tony Crisci 2018-04-02 12:16:00 -04:00
parent a82c107c76
commit 35445b40a2
3 changed files with 26 additions and 12 deletions
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. */

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

10
sway/input/seat.c
View file

@ -202,13 +202,6 @@ void seat_configure_device(struct sway_seat *seat,
return; 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) { 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);
@ -426,9 +419,6 @@ struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
void seat_apply_config(struct sway_seat *seat, void seat_apply_config(struct sway_seat *seat,
struct seat_config *seat_config) { struct seat_config *seat_config) {
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;