griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

WM: improve support for binding actions to modifier keys

Browse Source 
Previously a modifier key-map type only worked when the same key was
enabled as a modifier as well.

This allows for users to assign an action to double-tap-shift for eg.
This commit is contained in:
Campbell Barton
2019-03-01 16:46:10 +11:00
parent 5e32bd47e8
commit 90526e1606
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1886,24 +1886,33 @@ static bool wm_eventmatch(const wmEvent *winevent, const wmKeyMapItem *kmi)
}
}
/* modifiers also check bits, so it allows modifier order */
/* Modifiers also check bits, so it allows modifier order.
* Account for rare case of when these keys are used as the 'type' not as modifiers. */
if (kmi->shift != KM_ANY) {
if (winevent->shift != kmi->shift && !(winevent->shift & kmi->shift)) {
if ((winevent->shift != kmi->shift) && !(winevent->shift & kmi->shift) &&
!ELEM(winevent->type, LEFTSHIFTKEY, RIGHTSHIFTKEY))
{
return false;
}
}
if (kmi->ctrl != KM_ANY) {
if (winevent->ctrl != kmi->ctrl && !(winevent->ctrl & kmi->ctrl)) {
if (winevent->ctrl != kmi->ctrl && !(winevent->ctrl & kmi->ctrl) &&
!ELEM(winevent->type, LEFTCTRLKEY, RIGHTCTRLKEY))
{
return false;
}
}
if (kmi->alt != KM_ANY) {
if (winevent->alt != kmi->alt && !(winevent->alt & kmi->alt)) {
if (winevent->alt != kmi->alt && !(winevent->alt & kmi->alt) &&
!ELEM(winevent->type, LEFTALTKEY, RIGHTALTKEY))
{
return false;
}
}
if (kmi->oskey != KM_ANY) {
if (winevent->oskey != kmi->oskey && !(winevent->oskey & kmi->oskey)) {
if (winevent->oskey != kmi->oskey && !(winevent->oskey & kmi->oskey) &&
(winevent->type != OSKEY))
{
return false;
}
}