[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28293] trunk/blender/source/blender: Added ability to use up to F19 on the keyboard (previous max was F12).
Matt Ebb
matt at mke3.net
Tue Apr 20 02:08:27 CEST 2010
Revision: 28293
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28293
Author: broken
Date: 2010-04-20 02:08:27 +0200 (Tue, 20 Apr 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/wm_event_types.h
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c 2010-04-19 22:02:53 UTC (rev 28292)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c 2010-04-20 00:08:27 UTC (rev 28293)
@@ -226,6 +226,13 @@
{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", ""},
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2010-04-19 22:02:53 UTC (rev 28292)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2010-04-20 00:08:27 UTC (rev 28293)
@@ -1963,7 +1963,7 @@
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) {
Modified: trunk/blender/source/blender/windowmanager/wm_event_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/wm_event_types.h 2010-04-19 22:02:53 UTC (rev 28292)
+++ trunk/blender/source/blender/windowmanager/wm_event_types.h 2010-04-20 00:08:27 UTC (rev 28293)
@@ -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
More information about the Bf-blender-cvs
mailing list