diff options
author | Michael Weiser <[email protected]> | 2020-03-12 22:10:04 +0100 |
---|---|---|
committer | Brian Ashworth <[email protected]> | 2020-05-13 21:22:16 -0400 |
commit | 0f11aa037ad8765abf66e0c90052f9e4c37d56db (patch) | |
tree | e78523c566a1a96d53098bfc7c1d1f104043d373 /sway/input/seat.c | |
parent | 2473cac32c9a062ddaee9d5495a72317bdd1f9ff (diff) |
commands: Add per-view shortcuts_inhibitor command
Add a separate per-view shortcuts_inhibitor command that can be used
with criteria to override the per-seat defaults. This allows to e.g.
disable shortcuts inhibiting globally but enable it for specific,
known-good virtualization and remote desktop software or, alternatively,
to blacklist that one slightly broken piece of software that just
doesn't seem to get it right but insists on trying.
Add a flag to sway_view and handling logic in the input manager that
respects that flag if configured but falls back to per-seat config
otherwise. Add the actual command but with just enable and disable
subcommands since there's no value in duplicating the per-seat
activate/deactivate/toggle logic here. Split the inhibitor retrieval
helper in two so we can use the backend half in the command to retrieve
inhibitors for a specific surface and not just the currently focused
one. Extend the manual page with documentation of the command and
references to its per-seat sibling and usefulness with criteria.
Signed-off-by: Michael Weiser <[email protected]>
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index aa46940d..a4e06c57 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -1499,16 +1499,22 @@ bool seatop_allows_set_cursor(struct sway_seat *seat) { } struct sway_keyboard_shortcuts_inhibitor * -keyboard_shortcuts_inhibitor_get_for_focused_surface( - const struct sway_seat *seat) { - struct wlr_surface *focused_surface = - seat->wlr_seat->keyboard_state.focused_surface; +keyboard_shortcuts_inhibitor_get_for_surface( + const struct sway_seat *seat, + const struct wlr_surface *surface) { struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor = NULL; wl_list_for_each(sway_inhibitor, &seat->keyboard_shortcuts_inhibitors, link) { - if (sway_inhibitor->inhibitor->surface == focused_surface) { + if (sway_inhibitor->inhibitor->surface == surface) { return sway_inhibitor; } } return NULL; } + +struct sway_keyboard_shortcuts_inhibitor * +keyboard_shortcuts_inhibitor_get_for_focused_surface( + const struct sway_seat *seat) { + return keyboard_shortcuts_inhibitor_get_for_surface(seat, + seat->wlr_seat->keyboard_state.focused_surface); +} |