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

Merge pull request #1570 from acrisci/config-references

Browse source 
Copy input config references
This commit is contained in:
Drew DeVault 2018-01-21 11:17:07 -05:00 • committed by GitHub
commit c933781fac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/config.h
View file

@ -386,12 +386,14 @@ 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);
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);
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(

5
sway/config.c
View file

@ -84,7 +84,12 @@ void free_config(struct sway_config *config) {
} }
list_free(config->input_configs); list_free(config->input_configs);
} }
if (config->seat_configs) {
for (i = 0; i < config->seat_configs->length; i++) {
free_seat_config(config->seat_configs->items[i]);
}
list_free(config->seat_configs); list_free(config->seat_configs);
}
list_free(config->criteria); list_free(config->criteria);
list_free(config->no_focus); list_free(config->no_focus);
list_free(config->active_bar_modifiers); list_free(config->active_bar_modifiers);

10
sway/config/input.c
View file

@ -90,6 +90,16 @@ 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 = calloc(1, sizeof(struct input_config));
if (copy == NULL) {
wlr_log(L_ERROR, "could not allocate input config");
return NULL;
}
merge_input_config(copy, ic);
return copy;
}
void free_input_config(struct input_config *ic) { void free_input_config(struct input_config *ic) {
if (!ic) { if (!ic) {
return; return;

11
sway/config/seat.c
View file

@ -99,6 +99,17 @@ void merge_seat_config(struct seat_config *dest, struct seat_config *source) {
} }
} }
struct seat_config *copy_seat_config(struct seat_config *seat) {
struct seat_config *copy = new_seat_config(seat->name);
if (copy == NULL) {
return NULL;
}
merge_seat_config(copy, seat);
return copy;
}
void free_seat_config(struct seat_config *seat) { void free_seat_config(struct seat_config *seat) {
if (!seat) { if (!seat) {
return; return;

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

@ -174,7 +174,8 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
for (int i = 0; i < config->input_configs->length; ++i) { for (int i = 0; i < config->input_configs->length; ++i) {
struct input_config *input_config = config->input_configs->items[i]; struct input_config *input_config = config->input_configs->items[i];
if (strcmp(input_config->identifier, input_device->identifier) == 0) { if (strcmp(input_config->identifier, input_device->identifier) == 0) {
input_device->config = input_config; free_input_config(input_device->config);
input_device->config = copy_input_config(input_config);
break; break;
} }
} }
@ -240,6 +241,7 @@ static void input_remove_notify(struct wl_listener *listener, void *data) {
} }
wl_list_remove(&input_device->link); wl_list_remove(&input_device->link);
free_input_config(input_device->config);
free(input_device->identifier); free(input_device->identifier);
free(input_device); free(input_device);
} }
@ -293,7 +295,8 @@ void sway_input_manager_apply_input_config(struct sway_input_manager *input,
struct sway_input_device *input_device = NULL; struct sway_input_device *input_device = NULL;
wl_list_for_each(input_device, &input->devices, link) { wl_list_for_each(input_device, &input->devices, link) {
if (strcmp(input_device->identifier, input_config->identifier) == 0) { if (strcmp(input_device->identifier, input_config->identifier) == 0) {
input_device->config = input_config; free_input_config(input_device->config);
input_device->config = copy_input_config(input_config);
if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) { if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
sway_input_manager_libinput_config_pointer(input_device); sway_input_manager_libinput_config_pointer(input_device);

7
sway/input/seat.c
View file

@ -242,6 +242,7 @@ void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) {
void sway_seat_set_config(struct sway_seat *seat, void sway_seat_set_config(struct sway_seat *seat,
struct seat_config *seat_config) { struct seat_config *seat_config) {
// clear configs // clear configs
free_seat_config(seat->config);
seat->config = NULL; seat->config = NULL;
struct sway_seat_device *seat_device = NULL; struct sway_seat_device *seat_device = NULL;
@ -254,11 +255,9 @@ void sway_seat_set_config(struct sway_seat *seat,
} }
// add configs // add configs
seat->config = seat_config; seat->config = copy_seat_config(seat_config);
wl_list_for_each(seat_device, &seat->devices, link) { wl_list_for_each(seat_device, &seat->devices, link) {
seat_device->attachment_config = sway_seat_configure_device(seat, seat_device->input_device);
seat_config_get_attachment(seat_config,
seat_device->input_device->identifier);
} }
} }