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

fix multikey modifier for floating_modifier

Browse source 
Allows using key combinations as the modifier key used for floating_modifier.
Example:
floating_modifier Shift+Alt normal

will work, whereas before it would throw an "Invalid modifier" error.
This commit is contained in:
carpetoctopus 2026-04-30 17:23:32 +02:00 • committed by GitHub
parent c857ca3a97
commit f295f9085b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
sway/input/keyboard.c
View file

@ -39,14 +39,28 @@ static struct modifier_key {
};
uint32_t get_modifier_mask_by_name(const char *name) {
int i;
for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
if (strcasecmp(modifiers[i].name, name) == 0) {
return modifiers[i].mod;
}
}
uint32_t mod = 0;
const char *p = name;
return 0;
while (*p) {
const char *start = p;
const char *end = p;
while (*end && *end != '+') end++;
size_t len = (size_t)(end - start);
for (int i = 0; i < (int)(sizeof(modifiers) / sizeof(modifiers[0])); ++i) {
if (strlen(modifiers[i].name) == len &&
strncasecmp(modifiers[i].name, start, len) == 0
) {
mod |= modifiers[i].mod;
break;
}
}
p = (*end == '+') ? end + 1 : end;
}
return mod;
}
const char *get_modifier_name_by_mask(uint32_t modifier) {