sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Added ability to use up to F19 on the keyboard (previous max was F12).

Browse Source 
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.
This commit is contained in:
Matt Ebb 2010-04-20 00:08:27 +00:00
parent 4d39e04102
commit 3a04262c4c
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/makesrna/intern/rna_wm.c
View File

@ -226,6 +226,13 @@ EnumPropertyItem event_type_items[] = {
{F10KEY, "F10", 0, "F10", ""}, {F10KEY, "F10", 0, "F10", ""},
{F11KEY, "F11", 0, "F11", ""}, {F11KEY, "F11", 0, "F11", ""},
{F12KEY, "F12", 0, "F12", ""}, {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", ""}, {PAUSEKEY, "PAUSE", 0, "Pause", ""},
{INSERTKEY, "INSERT", 0, "Insert", ""}, {INSERTKEY, "INSERT", 0, "Insert", ""},
{HOMEKEY, "HOME", 0, "Home", ""}, {HOMEKEY, "HOME", 0, "Home", ""},

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -1963,7 +1963,7 @@ static int convert_key(GHOST_TKey key)
return (ZEROKEY + ((int) key - GHOST_kKey0)); return (ZEROKEY + ((int) key - GHOST_kKey0));
} else if (key>=GHOST_kKeyNumpad0 && key<=GHOST_kKeyNumpad9) { } else if (key>=GHOST_kKeyNumpad0 && key<=GHOST_kKeyNumpad9) {
return (PAD0 + ((int) key - GHOST_kKeyNumpad0)); 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)); return (F1KEY + ((int) key - GHOST_kKeyF1));
} else { } else {
switch (key) { switch (key) {

7
source/blender/windowmanager/wm_event_types.h
View File

@ -187,6 +187,13 @@
#define F10KEY 309 #define F10KEY 309
#define F11KEY 310 #define F11KEY 310
#define F12KEY 311 #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 PAUSEKEY 165
#define INSERTKEY 166 #define INSERTKEY 166