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/input | |
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/input')
-rw-r--r-- | sway/input/input-manager.c | 22 | ||||
-rw-r--r-- | sway/input/seat.c | 16 |
2 files changed, 29 insertions, 9 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index 243f860b..dc07cbf0 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include "sway/input/cursor.h" | 15 | #include "sway/input/cursor.h" |
16 | #include "sway/ipc-server.h" | 16 | #include "sway/ipc-server.h" |
17 | #include "sway/server.h" | 17 | #include "sway/server.h" |
18 | #include "sway/tree/view.h" | ||
18 | #include "stringop.h" | 19 | #include "stringop.h" |
19 | #include "list.h" | 20 | #include "list.h" |
20 | #include "log.h" | 21 | #include "log.h" |
@@ -333,12 +334,25 @@ static void handle_keyboard_shortcuts_inhibit_new_inhibitor( | |||
333 | struct sway_seat *seat = inhibitor->seat->data; | 334 | struct sway_seat *seat = inhibitor->seat->data; |
334 | wl_list_insert(&seat->keyboard_shortcuts_inhibitors, &sway_inhibitor->link); | 335 | wl_list_insert(&seat->keyboard_shortcuts_inhibitors, &sway_inhibitor->link); |
335 | 336 | ||
336 | struct seat_config *config = seat_get_config(seat); | 337 | // per-view, seat-agnostic config via criteria |
337 | if (!config) { | 338 | struct sway_view *view = view_from_wlr_surface(inhibitor->surface); |
338 | config = seat_get_config_by_name("*"); | 339 | enum seat_config_shortcuts_inhibit inhibit = SHORTCUTS_INHIBIT_DEFAULT; |
340 | if (view) { | ||
341 | inhibit = view->shortcuts_inhibit; | ||
339 | } | 342 | } |
340 | 343 | ||
341 | if (config && config->shortcuts_inhibit == SHORTCUTS_INHIBIT_DISABLE) { | 344 | if (inhibit == SHORTCUTS_INHIBIT_DEFAULT) { |
345 | struct seat_config *config = seat_get_config(seat); | ||
346 | if (!config) { | ||
347 | config = seat_get_config_by_name("*"); | ||
348 | } | ||
349 | |||
350 | if (config) { | ||
351 | inhibit = config->shortcuts_inhibit; | ||
352 | } | ||
353 | } | ||
354 | |||
355 | if (inhibit == SHORTCUTS_INHIBIT_DISABLE) { | ||
342 | /** | 356 | /** |
343 | * Here we deny to honour the inhibitor by never sending the | 357 | * Here we deny to honour the inhibitor by never sending the |
344 | * activate signal. We can not, however, destroy the inhibitor | 358 | * activate signal. We can not, however, destroy the inhibitor |
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) { | |||
1499 | } | 1499 | } |
1500 | 1500 | ||
1501 | struct sway_keyboard_shortcuts_inhibitor * | 1501 | struct sway_keyboard_shortcuts_inhibitor * |
1502 | keyboard_shortcuts_inhibitor_get_for_focused_surface( | 1502 | keyboard_shortcuts_inhibitor_get_for_surface( |
1503 | const struct sway_seat *seat) { | 1503 | const struct sway_seat *seat, |
1504 | struct wlr_surface *focused_surface = | 1504 | const struct wlr_surface *surface) { |
1505 | seat->wlr_seat->keyboard_state.focused_surface; | ||
1506 | struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor = NULL; | 1505 | struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor = NULL; |
1507 | wl_list_for_each(sway_inhibitor, &seat->keyboard_shortcuts_inhibitors, link) { | 1506 | wl_list_for_each(sway_inhibitor, &seat->keyboard_shortcuts_inhibitors, link) { |
1508 | if (sway_inhibitor->inhibitor->surface == focused_surface) { | 1507 | if (sway_inhibitor->inhibitor->surface == surface) { |
1509 | return sway_inhibitor; | 1508 | return sway_inhibitor; |
1510 | } | 1509 | } |
1511 | } | 1510 | } |
1512 | 1511 | ||
1513 | return NULL; | 1512 | return NULL; |
1514 | } | 1513 | } |
1514 | |||
1515 | struct sway_keyboard_shortcuts_inhibitor * | ||
1516 | keyboard_shortcuts_inhibitor_get_for_focused_surface( | ||
1517 | const struct sway_seat *seat) { | ||
1518 | return keyboard_shortcuts_inhibitor_get_for_surface(seat, | ||
1519 | seat->wlr_seat->keyboard_state.focused_surface); | ||
1520 | } | ||