diff options
| author | Asher <ThatAsherGuy> | 2020-01-15 05:19:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-15 05:23:23 +0300 |
| commit | e400cfe6bb6e70ccae339494e76b5fd526a402ac (patch) | |
| tree | 9db28d5d7dc9e4f2a22a31f3912d824750e953b0 /source/blender/windowmanager | |
| parent | f164ea6eaae541c76a8589837796d81df143c9ca (diff) | |
WM: support keys F20-F24
This was already supported by GHOST on X11, WIN32.
macOS goes up to F20.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index bc068173327..f5970e8fb61 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -4201,7 +4201,7 @@ static int convert_key(GHOST_TKey key) else if (key >= GHOST_kKeyNumpad0 && key <= GHOST_kKeyNumpad9) { return (PAD0 + ((int)key - GHOST_kKeyNumpad0)); } - else if (key >= GHOST_kKeyF1 && key <= GHOST_kKeyF19) { + else if (key >= GHOST_kKeyF1 && key <= GHOST_kKeyF24) { return (F1KEY + ((int)key - GHOST_kKeyF1)); } else { diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 3bd0851d60c..252eb9673ae 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -223,6 +223,11 @@ enum { F17KEY = 0x013c, /* 316 */ F18KEY = 0x013d, /* 317 */ F19KEY = 0x013e, /* 318 */ + F20KEY = 0x013f, /* 319 */ + F21KEY = 0x0140, /* 320 */ + F22KEY = 0x0141, /* 321 */ + F23KEY = 0x0142, /* 322 */ + F24KEY = 0x0143, /* 323 */ /* *** End of keyboard codes. *** */ @@ -347,7 +352,7 @@ enum { /* test whether the event is a key on the keyboard */ #define ISKEYBOARD(event_type) \ (((event_type) >= 0x0020 && (event_type) <= 0x00ff) || \ - ((event_type) >= 0x012c && (event_type) <= 0x013f)) + ((event_type) >= 0x012c && (event_type) <= 0x0143)) /* test whether the event is a modifier key */ #define ISKEYMODIFIER(event_type) \ |