diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-22 15:34:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-22 15:34:01 +0400 |
| commit | c1de5cc83829b65094eee024af10928bd13261ce (patch) | |
| tree | 9d2afd264f8a6c1dee8d718195bdd14df5ea9cd9 /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | ebe63b664baa2f4e65643a2535766e5babf9c8a7 (diff) | |
- use defines for wmKeyMapItem & wmEvent alt/shift/ctrl/oskey
- clear utf8_buf on key up & complain if its set (should never happen)
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 854fa688ea4..99bd83ef8c1 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -310,31 +310,15 @@ static void keymap_event_set(wmKeyMapItem *kmi, short type, short val, int modif kmi->type= type; kmi->val= val; kmi->keymodifier= keymodifier; - + if(modifier == KM_ANY) { kmi->shift= kmi->ctrl= kmi->alt= kmi->oskey= KM_ANY; } else { - - kmi->shift= kmi->ctrl= kmi->alt= kmi->oskey= 0; - - /* defines? */ - if(modifier & KM_SHIFT) - kmi->shift= 1; - else if(modifier & KM_SHIFT2) - kmi->shift= 2; - if(modifier & KM_CTRL) - kmi->ctrl= 1; - else if(modifier & KM_CTRL2) - kmi->ctrl= 2; - if(modifier & KM_ALT) - kmi->alt= 1; - else if(modifier & KM_ALT2) - kmi->alt= 2; - if(modifier & KM_OSKEY) - kmi->oskey= 1; - else if(modifier & KM_OSKEY2) - kmi->oskey= 2; + kmi->shift= (modifier & KM_SHIFT) ? KM_MOD_FIRST : ((modifier & KM_SHIFT2) ? KM_MOD_SECOND : FALSE); + kmi->ctrl= (modifier & KM_CTRL) ? KM_MOD_FIRST : ((modifier & KM_CTRL2) ? KM_MOD_SECOND : FALSE); + kmi->alt= (modifier & KM_ALT) ? KM_MOD_FIRST : ((modifier & KM_ALT2) ? KM_MOD_SECOND : FALSE); + kmi->oskey= (modifier & KM_OSKEY) ? KM_MOD_FIRST : ((modifier & KM_OSKEY2) ? KM_MOD_SECOND : FALSE); } } |