diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-15 05:46:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-15 05:46:25 +0300 |
| commit | 41075589c0ffec141fcf83d4176bbd65c55367ed (patch) | |
| tree | 094addde6bba1cc2e496d62dfb5a811d6eae6385 /source/blender/windowmanager | |
| parent | 1ec08999b6a2200a1a54533fc9858b5d7dfc1364 (diff) | |
| parent | dedceb9395bb4383f7986540d6de551e4044640e (diff) | |
Merge branch 'blender-v2.82-release'
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 eebef43c0f6..d90eab6f94f 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -3883,7 +3883,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) \ |