diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-07-25 12:07:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-25 12:07:35 -0400 |
commit | c8dc9b3b3094c9b2778309855114b9495518c2d4 (patch) | |
tree | fbe2ecd9c36e7e1d954853f76d813ecdcd1a2e57 /sway/config/input.c | |
parent | 6a8d1e5044086a8dce121bd1f405b342e17a1301 (diff) | |
parent | 76ece5788bffe27b32c85968886f3738d244abf9 (diff) | |
download | sway-c8dc9b3b3094c9b2778309855114b9495518c2d4.tar.xz |
Merge pull request #2330 from progandy/set-modifier-locks
Configure initial state for numlock/capslock
Diffstat (limited to 'sway/config/input.c')
-rw-r--r-- | sway/config/input.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sway/config/input.c b/sway/config/input.c index 8d687a6d..9885e85c 100644 --- a/sway/config/input.c +++ b/sway/config/input.c @@ -33,6 +33,8 @@ struct input_config *new_input_config(const char* identifier) { input->left_handed = INT_MIN; input->repeat_delay = INT_MIN; input->repeat_rate = INT_MIN; + input->xkb_numlock = INT_MIN; + input->xkb_capslock = INT_MIN; return input; } @@ -104,6 +106,12 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { free(dst->xkb_variant); dst->xkb_variant = strdup(src->xkb_variant); } + if (src->xkb_numlock != INT_MIN) { + dst->xkb_numlock = src->xkb_numlock; + } + if (src->xkb_capslock != INT_MIN) { + dst->xkb_capslock = src->xkb_capslock; + } if (src->mapped_from_region) { free(dst->mapped_from_region); dst->mapped_from_region = |