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

Merge branch 'master' into disable_titlebar

Browse source
This commit is contained in:
neuromagus 2024-04-09 04:29:20 +03:00 • committed by GitHub
commit 034fbb5789
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sway/input/keyboard.c
View file

@ -32,6 +32,7 @@ static struct modifier_key {
{ XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 }, { XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
{ "Mod3", WLR_MODIFIER_MOD3 }, { "Mod3", WLR_MODIFIER_MOD3 },
{ XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO }, { XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
{ "Super", WLR_MODIFIER_LOGO },
{ "Mod5", WLR_MODIFIER_MOD5 }, { "Mod5", WLR_MODIFIER_MOD5 },
}; };

4
sway/sway.5.scd
View file

@ -403,8 +403,8 @@ runtime.
For specifying modifier keys, you can use the XKB modifier names _Shift_, For specifying modifier keys, you can use the XKB modifier names _Shift_,
_Lock_ (for Caps Lock), _Control_, _Mod1_ (for Alt), _Mod2_ (for Num Lock), _Lock_ (for Caps Lock), _Control_, _Mod1_ (for Alt), _Mod2_ (for Num Lock),
_Mod3_ (for XKB modifier Mod3), _Mod4_ (for the Logo key), and _Mod5_ (for _Mod3_ (for XKB modifier Mod3), _Mod4_ (for the Logo key), and _Mod5_ (for
AltGr). In addition, you can use the aliases _Ctrl_ (for Control) and _Alt_ AltGr). In addition, you can use the aliases _Ctrl_ (for Control), _Alt_
(for Alt). (for Alt), and _Super_ (for the Logo key).
Unless the flag _--locked_ is set, the command will not be run when a 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 screen locking program is active. If there is a matching binding with