mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

commands: Add per-view shortcuts_inhibitor command

Browse source 
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>
This commit is contained in:
Michael Weiser 2020-03-12 22:10:04 +01:00 • committed by Brian Ashworth
parent 2473cac32c
commit 0f11aa037a
10 changed files with 103 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sway/input/input-manager.c
View file

@ -15,6 +15,7 @@
#include "sway/input/cursor.h"
#include "sway/ipc-server.h"
#include "sway/server.h"
#include "sway/tree/view.h"
#include "stringop.h"
#include "list.h"
#include "log.h"
@ -333,12 +334,25 @@ static void handle_keyboard_shortcuts_inhibit_new_inhibitor(
struct sway_seat *seat = inhibitor->seat->data;
wl_list_insert(&seat->keyboard_shortcuts_inhibitors, &sway_inhibitor->link);
struct seat_config *config = seat_get_config(seat);
if (!config) {
config = seat_get_config_by_name("*");
// per-view, seat-agnostic config via criteria
struct sway_view *view = view_from_wlr_surface(inhibitor->surface);
enum seat_config_shortcuts_inhibit inhibit = SHORTCUTS_INHIBIT_DEFAULT;
if (view) {
inhibit = view->shortcuts_inhibit;
}
if (config && config->shortcuts_inhibit == SHORTCUTS_INHIBIT_DISABLE) {
if (inhibit == SHORTCUTS_INHIBIT_DEFAULT) {
struct seat_config *config = seat_get_config(seat);
if (!config) {
config = seat_get_config_by_name("*");
}
if (config) {
inhibit = config->shortcuts_inhibit;
}
}
if (inhibit == SHORTCUTS_INHIBIT_DISABLE) {
/**
* Here we deny to honour the inhibitor by never sending the
* activate signal. We can not, however, destroy the inhibitor

16
sway/input/seat.c
View file

@ -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);
}