mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-25 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement input type configs (#3784)

Browse source 
Add support for configurations that apply to a type of inputs
(i.e. natural scrolling on all touchpads). A type config is
differentiated by a `type:` prefix followed by the type it
corresponds to.

When new devices appear, the device config is merged on top of its
type config (if it exists). New type configs are applied on top of
existing configs.
This commit is contained in:
Benjamin Cheng 2019-03-25 22:05:49 -04:00 • committed by Brian Ashworth
parent 6737b90cb9
commit bd3720585e
5 changed files with 109 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
sway/config/input.c
View file

@ -18,6 +18,7 @@ struct input_config *new_input_config(const char* identifier) {
return NULL;
}
input->input_type = NULL;
input->tap = INT_MIN;
input->tap_button_map = INT_MIN;
input->drag = INT_MIN;
@ -140,6 +141,30 @@ static void merge_wildcard_on_all(struct input_config *wildcard) {
merge_input_config(ic, wildcard);
}
}
for (int i = 0; i < config->input_type_configs->length; i++) {
struct input_config *ic = config->input_type_configs->items[i];
if (strcmp(wildcard->identifier, ic->identifier) != 0) {
sway_log(SWAY_DEBUG, "Merging input * config on %s", ic->identifier);
merge_input_config(ic, wildcard);
}
}
}
static void merge_type_on_existing(struct input_config *type_wildcard) {
for (int i = 0; i < config->input_configs->length; i++) {
struct input_config *ic = config->input_configs->items[i];
if (ic->input_type == NULL) {
continue;
}
if (strcmp(ic->input_type, type_wildcard->identifier + 5) == 0) {
sway_log(SWAY_DEBUG, "Merging %s top of %s",
type_wildcard->identifier,
ic->identifier);
merge_input_config(ic, type_wildcard);
}
}
}
struct input_config *store_input_config(struct input_config *ic) {
@ -148,11 +173,19 @@ struct input_config *store_input_config(struct input_config *ic) {
merge_wildcard_on_all(ic);
}
int i = list_seq_find(config->input_configs, input_identifier_cmp,
list_t *config_list = NULL;
if (strncmp(ic->identifier, "type:", 5) == 0) {
config_list = config->input_type_configs;
merge_type_on_existing(ic);
} else {
config_list = config->input_configs;
}
int i = list_seq_find(config_list, input_identifier_cmp,
ic->identifier);
if (i >= 0) {
sway_log(SWAY_DEBUG, "Merging on top of existing input config");
struct input_config *current = config->input_configs->items[i];
struct input_config *current = config_list->items[i];
merge_input_config(current, ic);
free_input_config(ic);
ic = current;
@ -167,7 +200,7 @@ struct input_config *store_input_config(struct input_config *ic) {
free_input_config(ic);
ic = current;
}
list_add(config->input_configs, ic);
list_add(config_list, ic);
} else {
// New wildcard config. Just add it
sway_log(SWAY_DEBUG, "Adding input * config");