diff options
| author | Matt Ebb <matt@mke3.net> | 2010-04-20 04:08:27 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-04-20 04:08:27 +0400 |
| commit | 3a04262c4c424f190646d286ab82f90ac0f83608 (patch) | |
| tree | 5cf9d483f51d12f93efff5b8d3486c7bff496e0d /source | |
| parent | 4d39e0410288497455ace549a931d2b07fe49f86 (diff) | |
Added ability to use up to F19 on the keyboard (previous max was F12).
GHOST is already collecting up to F24, but I've only got up to F19 on this
keyboard so I've just committed what I could test here.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 7 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 7 |
3 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index cad8f0910ee..844df1ad2d3 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -226,6 +226,13 @@ EnumPropertyItem event_type_items[] = { {F10KEY, "F10", 0, "F10", ""}, {F11KEY, "F11", 0, "F11", ""}, {F12KEY, "F12", 0, "F12", ""}, + {F13KEY, "F13", 0, "F13", ""}, + {F14KEY, "F14", 0, "F14", ""}, + {F15KEY, "F15", 0, "F15", ""}, + {F16KEY, "F16", 0, "F16", ""}, + {F17KEY, "F17", 0, "F17", ""}, + {F18KEY, "F18", 0, "F18", ""}, + {F19KEY, "F19", 0, "F19", ""}, {PAUSEKEY, "PAUSE", 0, "Pause", ""}, {INSERTKEY, "INSERT", 0, "Insert", ""}, {HOMEKEY, "HOME", 0, "Home", ""}, diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 72e34eea2ba..2b3d6fa856e 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1963,7 +1963,7 @@ static int convert_key(GHOST_TKey key) return (ZEROKEY + ((int) key - GHOST_kKey0)); } else if (key>=GHOST_kKeyNumpad0 && key<=GHOST_kKeyNumpad9) { return (PAD0 + ((int) key - GHOST_kKeyNumpad0)); - } else if (key>=GHOST_kKeyF1 && key<=GHOST_kKeyF12) { + } else if (key>=GHOST_kKeyF1 && key<=GHOST_kKeyF19) { return (F1KEY + ((int) key - GHOST_kKeyF1)); } else { switch (key) { diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 47bb11f4dd7..a38e433fe56 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -187,6 +187,13 @@ #define F10KEY 309 #define F11KEY 310 #define F12KEY 311 +#define F13KEY 312 +#define F14KEY 313 +#define F15KEY 314 +#define F16KEY 315 +#define F17KEY 316 +#define F18KEY 317 +#define F19KEY 318 #define PAUSEKEY 165 #define INSERTKEY 166 |