diff options
| author | emersion <contact@emersion.fr> | 2018-09-24 10:43:18 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 10:43:18 +0200 | 
| commit | a032925ae7667e917f2bd8d1b77de97b400b3bf7 (patch) | |
| tree | d5a6fffc3470b3fbbb18a6ae01851451bea1dbb2 /sway/commands/input/xkb_rules.c | |
| parent | 4a4f07ac25d18dfeffc6a1ff55e175ba01abc290 (diff) | |
| parent | baeb28ea6230ef9aa409ee52abe208720120e45c (diff) | |
| download | sway-a032925ae7667e917f2bd8d1b77de97b400b3bf7.tar.xz | |
Merge pull request #2701 from RedSoxFan/input-wildcard
Implement support for input wildcard
Diffstat (limited to 'sway/commands/input/xkb_rules.c')
| -rw-r--r-- | sway/commands/input/xkb_rules.c | 17 | 
1 files changed, 7 insertions, 10 deletions
| diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c index 560f088e..257c3288 100644 --- a/sway/commands/input/xkb_rules.c +++ b/sway/commands/input/xkb_rules.c @@ -9,18 +9,15 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {  	if ((error = checkarg(argc, "xkb_rules", EXPECTED_EQUAL_TO, 1))) {  		return error;  	} -	struct input_config *current_input_config = -		config->handler_context.input_config; -	if (!current_input_config) { -		return cmd_results_new(CMD_FAILURE, "xkb_rules", "No input device defined."); +	struct input_config *ic = config->handler_context.input_config; +	if (!ic) { +		return cmd_results_new(CMD_FAILURE, "xkb_rules", +				"No input device defined.");  	} -	struct input_config *new_config = -		new_input_config(current_input_config->identifier); -	new_config->xkb_rules = strdup(argv[0]); +	ic->xkb_rules = strdup(argv[0]); -	wlr_log(WLR_DEBUG, "apply-xkb_rules for device: %s rules: %s", -		current_input_config->identifier, new_config->xkb_rules); -	apply_input_config(new_config); +	wlr_log(WLR_DEBUG, "set-xkb_rules for config: %s rules: %s", +			ic->identifier, ic->xkb_rules);  	return cmd_results_new(CMD_SUCCESS, NULL, NULL);  } | 
