diff options
author | Michael Weiser <michael.weiser@gmx.de> | 2020-03-12 22:10:04 +0100 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2020-05-13 21:22:16 -0400 |
commit | 0f11aa037ad8765abf66e0c90052f9e4c37d56db (patch) | |
tree | e78523c566a1a96d53098bfc7c1d1f104043d373 /sway/commands/shortcuts_inhibitor.c | |
parent | Implement pointer simulation if client hasn't bound to touch (diff) | |
download | sway-0f11aa037ad8765abf66e0c90052f9e4c37d56db.tar.gz sway-0f11aa037ad8765abf66e0c90052f9e4c37d56db.tar.zst sway-0f11aa037ad8765abf66e0c90052f9e4c37d56db.zip |
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 <michael.weiser@gmx.de>
Diffstat (limited to 'sway/commands/shortcuts_inhibitor.c')
-rw-r--r-- | sway/commands/shortcuts_inhibitor.c | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/sway/commands/shortcuts_inhibitor.c b/sway/commands/shortcuts_inhibitor.c new file mode 100644 index 00000000..ffa1a5c9 --- /dev/null +++ b/sway/commands/shortcuts_inhibitor.c | |||
@@ -0,0 +1,49 @@ | |||
1 | #include <string.h> | ||
2 | #include "log.h" | ||
3 | #include "sway/commands.h" | ||
4 | #include "sway/config.h" | ||
5 | #include "sway/input/seat.h" | ||
6 | #include "sway/tree/container.h" | ||
7 | #include "sway/tree/view.h" | ||
8 | |||
9 | struct cmd_results *cmd_shortcuts_inhibitor(int argc, char **argv) { | ||
10 | struct cmd_results *error = NULL; | ||
11 | if ((error = checkarg(argc, "shortcuts_inhibitor", EXPECTED_EQUAL_TO, 1))) { | ||
12 | return error; | ||
13 | } | ||
14 | |||
15 | struct sway_container *con = config->handler_context.container; | ||
16 | if (!con || !con->view) { | ||
17 | return cmd_results_new(CMD_INVALID, | ||
18 | "Only views can have shortcuts inhibitors"); | ||
19 | } | ||
20 | |||
21 | struct sway_view *view = con->view; | ||
22 | if (strcmp(argv[0], "enable") == 0) { | ||
23 | view->shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE; | ||
24 | } else if (strcmp(argv[0], "disable") == 0) { | ||
25 | view->shortcuts_inhibit = SHORTCUTS_INHIBIT_DISABLE; | ||
26 | |||
27 | struct sway_seat *seat = NULL; | ||
28 | wl_list_for_each(seat, &server.input->seats, link) { | ||
29 | struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor = | ||
30 | keyboard_shortcuts_inhibitor_get_for_surface( | ||
31 | seat, view->surface); | ||
32 | if (!sway_inhibitor) { | ||
33 | continue; | ||
34 | } | ||
35 | |||
36 | wlr_keyboard_shortcuts_inhibitor_v1_deactivate( | ||
37 | sway_inhibitor->inhibitor); | ||
38 | sway_log(SWAY_DEBUG, "Deactivated keyboard shortcuts " | ||
39 | "inhibitor for seat %s on view", | ||
40 | seat->wlr_seat->name); | ||
41 | |||
42 | } | ||
43 | } else { | ||
44 | return cmd_results_new(CMD_INVALID, | ||
45 | "Expected `shortcuts_inhibitor enable|disable`"); | ||
46 | } | ||
47 | |||
48 | return cmd_results_new(CMD_SUCCESS, NULL); | ||
49 | } | ||