diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-05-30 03:30:08 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2019-05-30 10:47:42 +0300 |
commit | 6afb392823d27ec69bedc8fd74263c3d072cca29 (patch) | |
tree | a1a72a233a2ef8e89240b7702d7c9eabb3444bf0 /sway/commands/bar.c | |
parent | 2c6a10c4ba8e1ab97db81677e32ca1580e4f0430 (diff) |
bindings: allow unlocked and locked bindings
This changes the behavior of bindings to make the `BINDING_LOCKED` flag
conflicting, which will allow for both unlocked and locked bindings.
If there are two matching bindings and one has `--locked` and the other
does not, the one with `--locked` will be preferred when locked and
the one without will be preferred when unlocked.
If there are two matching bindings and one has both a matching
`--input-device=<input>` and `--locked` and the other has neither, the
former will be preferred for both unlocked and locked.
This also refactors `get_active_binding` in `sway/input/keyboard.c`
to make it easier to read.
Diffstat (limited to 'sway/commands/bar.c')
0 files changed, 0 insertions, 0 deletions