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

Merge 964e0e2301 into 020a572ed6

Browse source
This commit is contained in:
Krzysztof Małysa 2023-11-11 18:09:07 -06:00 • committed by GitHub
commit 997f461c0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sway/input/switch.c
View file

@ -19,7 +19,12 @@ struct sway_switch *sway_switch_create(struct sway_seat *seat,
return switch_device;
}
static bool sway_switch_trigger_test(enum sway_switch_trigger trigger,
static bool sway_switch_trigger_is_toggle(enum sway_switch_trigger trigger,
enum wlr_switch_state /*state*/) {
return trigger == SWAY_SWITCH_TRIGGER_TOGGLE;
}
static bool sway_switch_trigger_equals_state(enum sway_switch_trigger trigger,
enum wlr_switch_state state) {
switch (trigger) {
case SWAY_SWITCH_TRIGGER_ON:
@ -27,12 +32,13 @@ static bool sway_switch_trigger_test(enum sway_switch_trigger trigger,
case SWAY_SWITCH_TRIGGER_OFF:
return state == WLR_SWITCH_STATE_OFF;
case SWAY_SWITCH_TRIGGER_TOGGLE:
return true;
return false;
}
abort(); // unreachable
}
static void execute_binding(struct sway_switch *sway_switch) {
static void execute_binding_matching(struct sway_switch* sway_switch,
bool (*sway_switch_trigger_test)(enum sway_switch_trigger, enum wlr_switch_state)) {
struct sway_seat* seat = sway_switch->seat_device->sway_seat;
bool input_inhibited = seat->exclusive_client != NULL ||
server.session_lock.locked;
@ -75,6 +81,11 @@ static void execute_binding(struct sway_switch *sway_switch) {
}
}
static void execute_bindings(struct sway_switch *sway_switch) {
execute_binding_matching(sway_switch, sway_switch_trigger_is_toggle);
execute_binding_matching(sway_switch, sway_switch_trigger_equals_state);
}
static void handle_switch_toggle(struct wl_listener *listener, void *data) {
struct sway_switch *sway_switch =
wl_container_of(listener, sway_switch, switch_toggle);
@ -91,7 +102,7 @@ static void handle_switch_toggle(struct wl_listener *listener, void *data) {
sway_switch->type = event->switch_type;
sway_switch->state = event->switch_state;
execute_binding(sway_switch);
execute_bindings(sway_switch);
}
void sway_switch_configure(struct sway_switch *sway_switch) {
@ -119,7 +130,7 @@ void sway_switch_retrigger_bindings_for_all(void) {
if (input_device->wlr_device->type != WLR_INPUT_DEVICE_SWITCH) {
continue;
}
execute_binding(seat_device->switch_device);
execute_bindings(seat_device->switch_device);
};
}
}

3
sway/sway.5.scd
View file

@ -464,7 +464,8 @@ runtime.
switches. Valid values for _state_ are _on_, _off_ and _toggle_. These
switches are on when the device lid is shut and when tablet mode is active
respectively. _toggle_ is also supported to run a command both when the
switch is toggled on or off.
switch is toggled on or off. _toggle_ is always dispatched before
dispatching _on_ and _off_.
Unless the flag _--locked_ is set, the command will not be run when a
screen locking program is active. If there is a matching binding with