mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove WLR_SWITCH_STATE_TOGGLE usage 

Ref [1].

[1]: 4792446ee8
This commit is contained in:
Simon Ser 2022-03-08 16:24:27 +01:00 committed by Simon Zeni
parent 9f98c38d3e
commit 04676936e7
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sway/config.h
View File

@ -70,12 +70,18 @@ struct sway_mouse_binding {
char *command; char *command;
}; };
enum sway_switch_trigger {
SWAY_SWITCH_TRIGGER_OFF,
SWAY_SWITCH_TRIGGER_ON,
SWAY_SWITCH_TRIGGER_TOGGLE,
};
/** /**
* A laptop switch binding and an associated command. * A laptop switch binding and an associated command.
*/ */
struct sway_switch_binding { struct sway_switch_binding {
enum wlr_switch_type type; enum wlr_switch_type type;
enum wlr_switch_state state; enum sway_switch_trigger trigger;
uint32_t flags; uint32_t flags;
char *command; char *command;
}; };

8
sway/commands/bind.c
View File

@ -47,7 +47,7 @@ static bool binding_switch_compare(struct sway_switch_binding *binding_a,
if (binding_a->type != binding_b->type) { if (binding_a->type != binding_b->type) {
return false; return false;
} }
if (binding_a->state != binding_b->state) { if (binding_a->trigger != binding_b->trigger) {
return false; return false;
} }
if ((binding_a->flags & BINDING_LOCKED) != if ((binding_a->flags & BINDING_LOCKED) !=
@ -551,11 +551,11 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
"unknown switch %s)", bindtype, split->items[0]); "unknown switch %s)", bindtype, split->items[0]);
} }
if (strcmp(split->items[1], "on") == 0) { if (strcmp(split->items[1], "on") == 0) {
binding->state = WLR_SWITCH_STATE_ON; binding->trigger = SWAY_SWITCH_TRIGGER_ON;
} else if (strcmp(split->items[1], "off") == 0) { } else if (strcmp(split->items[1], "off") == 0) {
binding->state = WLR_SWITCH_STATE_OFF; binding->trigger = SWAY_SWITCH_TRIGGER_OFF;
} else if (strcmp(split->items[1], "toggle") == 0) { } else if (strcmp(split->items[1], "toggle") == 0) {
binding->state = WLR_SWITCH_STATE_TOGGLE; binding->trigger = SWAY_SWITCH_TRIGGER_TOGGLE;
} else { } else {
free_switch_binding(binding); free_switch_binding(binding);
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,

18
sway/input/switch.c
View File

@ -19,6 +19,19 @@ struct sway_switch *sway_switch_create(struct sway_seat *seat,
return switch_device; return switch_device;
} }
static bool sway_switch_trigger_test(enum sway_switch_trigger trigger,
enum wlr_switch_state state) {
switch (trigger) {
case SWAY_SWITCH_TRIGGER_ON:
return state == WLR_SWITCH_STATE_ON;
case SWAY_SWITCH_TRIGGER_OFF:
return state == WLR_SWITCH_STATE_OFF;
case SWAY_SWITCH_TRIGGER_TOGGLE:
return true;
}
abort(); // unreachable
}
static void execute_binding(struct sway_switch *sway_switch) { static void execute_binding(struct sway_switch *sway_switch) {
struct sway_seat* seat = sway_switch->seat_device->sway_seat; struct sway_seat* seat = sway_switch->seat_device->sway_seat;
bool input_inhibited = seat->exclusive_client != NULL; bool input_inhibited = seat->exclusive_client != NULL;
@ -30,11 +43,10 @@ static void execute_binding(struct sway_switch *sway_switch) {
if (binding->type != sway_switch->type) { if (binding->type != sway_switch->type) {
continue; continue;
} }
if (binding->state != WLR_SWITCH_STATE_TOGGLE && if (!sway_switch_trigger_test(binding->trigger, sway_switch->state)) {
binding->state != sway_switch->state) {
continue; continue;
} }
if (config->reloading && (binding->state == WLR_SWITCH_STATE_TOGGLE if (config->reloading && (binding->trigger == SWAY_SWITCH_TRIGGER_TOGGLE
|| (binding->flags & BINDING_RELOAD) == 0)) { || (binding->flags & BINDING_RELOAD) == 0)) {
continue; continue;
} }