diff options
| author | Harley Acheson <harley.acheson@gmail.com> | 2019-12-10 08:54:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-10 09:13:02 +0300 |
| commit | b7533f92e5e515555951ca00cec0690c7f59d8f4 (patch) | |
| tree | 99593c938b5c56927458926646cdb1aa095b5ffb /source | |
| parent | dfb6af3011c13b8f090fed2e932c9e5120887642 (diff) | |
GHOST: add support for application/menu key
Support the application key on Linux & Windows.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 8e68495dd78..a57be90b08c 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -242,6 +242,7 @@ const EnumPropertyItem rna_enum_event_type_items[] = { {RIGHTSHIFTKEY, "RIGHT_SHIFT", 0, "Right Shift", "ShiftR"}, {0, "", 0, NULL, NULL}, {OSKEY, "OSKEY", 0, "OS Key", "Cmd"}, + {APPKEY, "APP", 0, "Application", "App"}, {GRLESSKEY, "GRLESS", 0, "Grless", ""}, {ESCKEY, "ESC", 0, "Esc", ""}, {TABKEY, "TAB", 0, "Tab", ""}, diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 7c3e4ebc008..f24b7826b01 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -4165,6 +4165,8 @@ static int convert_key(GHOST_TKey key) return LEFTALTKEY; case GHOST_kKeyRightAlt: return RIGHTALTKEY; + case GHOST_kKeyApp: + return APPKEY; case GHOST_kKeyCapsLock: return CAPSLOCKKEY; diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 7a25a6dfa4d..e39e6a8698b 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -202,6 +202,8 @@ enum { MEDIAFIRST = 0x00b0, /* 176 */ MEDIALAST = 0x00b1, /* 177 */ + APPKEY = 0x00b2, /* 178 */ + F1KEY = 0x012c, /* 300 */ F2KEY = 0x012d, /* 301 */ F3KEY = 0x012e, /* 302 */ |