RNA read-only wrapped wmEvent so python operators invoke functions

* 2 new enums event_value_items and event_type_items in RNA_enum_types.h
* WM_key_event_string now uses an RNA enum lookup rather then its own switch statement.
* moved wmEvent from WM_types.h into DNA_windowmanager_types.h
* added RNA_enum_identifier and RNA_enum_name to get strings from an enum value.

2 files changed, 4 insertions, 338 deletions

diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 739cfbcc1ac..9b987cdfa51 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -58,37 +58,6 @@ enum {
 	WM_OP_EXEC_SCREEN
 };
 
-/* ************** wmEvent ************************ */
-
-/* each event should have full modifier state */
-/* event comes from eventmanager and from keymap */
-typedef struct wmEvent {
-	struct wmEvent *next, *prev;
-	
-	short type;			/* event code itself (short, is also in keymap) */
-	short val;			/* press, release, scrollvalue */
-	short x, y;			/* mouse pointer position, screen coord */
-	short mval[2];		/* region mouse position, name convention pre 2.5 :) */
-	short prevx, prevy;	/* previous mouse pointer position */
-	short unicode;		/* future, ghost? */
-	char ascii;			/* from ghost */
-	char pad;
-	
-	/* modifier states */
-	short shift, ctrl, alt, oskey;	/* oskey is apple or windowskey, value denotes order of pressed */
-	short keymodifier;				/* rawkey modifier */
-	
-	/* keymap item, set by handler (weak?) */
-	const char *keymap_idname;
-	
-	/* custom data */
-	short custom;	/* custom data type, stylus, 6dof, see wm_event_types.h */
-	void *customdata;	/* ascii, unicode, mouse coords, angles, vectors, dragdrop info */
-	short customdatafree;
-	
-} wmEvent;
-
-
 /* ************** wmKeyMap ************************ */
 
 /* modifier */
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 7528321c7c5..85028e3ea1a 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -44,6 +44,7 @@
 
 #include "RNA_access.h"
 #include "RNA_types.h"
+#include "RNA_enum_types.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -155,313 +156,9 @@ ListBase *WM_keymap_listbase(wmWindowManager *wm, const char *nameid, int spacei
 
 char *WM_key_event_string(short type)
 {
-	/* not returned: CAPSLOCKKEY, UNKNOWNKEY, COMMANDKEY, GRLESSKEY */
-
-	switch(type) {
-	case AKEY:
-		return "A";
-		break;
-	case BKEY:
-		return "B";
-		break;
-	case CKEY:
-		return "C";
-		break;
-	case DKEY:
-		return "D";
-		break;
-	case EKEY:
-		return "E";
-		break;
-	case FKEY:
-		return "F";
-		break;
-	case GKEY:
-		return "G";
-		break;
-	case HKEY:
-		return "H";
-		break;
-	case IKEY:
-		return "I";
-		break;
-	case JKEY:
-		return "J";
-		break;
-	case KKEY:
-		return "K";
-		break;
-	case LKEY:
-		return "L";
-		break;
-	case MKEY:
-		return "M";
-		break;
-	case NKEY:
-		return "N";
-		break;
-	case OKEY:
-		return "O";
-		break;
-	case PKEY:
-		return "P";
-		break;
-	case QKEY:
-		return "Q";
-		break;
-	case RKEY:
-		return "R";
-		break;
-	case SKEY:
-		return "S";
-		break;
-	case TKEY:
-		return "T";
-		break;
-	case UKEY:
-		return "U";
-		break;
-	case VKEY:
-		return "V";
-		break;
-	case WKEY:
-		return "W";
-		break;
-	case XKEY:
-		return "X";
-		break;
-	case YKEY:
-		return "Y";
-		break;
-	case ZKEY:
-		return "Z";
-		break;
-
-	case ZEROKEY:
-		return "Zero";
-		break;
-	case ONEKEY:
-		return "One";
-		break;
-	case TWOKEY:
-		return "Two";
-		break;
-	case THREEKEY:
-		return "Three";
-		break;
-	case FOURKEY:
-		return "Four";
-		break;
-	case FIVEKEY:
-		return "Five";
-		break;
-	case SIXKEY:
-		return "Six";
-		break;
-	case SEVENKEY:
-		return "Seven";
-		break;
-	case EIGHTKEY:
-		return "Eight";
-		break;
-	case NINEKEY:
-		return "Nine";
-		break;
-
-	case LEFTCTRLKEY:
-		return "Leftctrl";
-		break;
-	case LEFTALTKEY:
-		return "Leftalt";
-		break;
-	case RIGHTALTKEY:
-		return "Rightalt";
-		break;
-	case RIGHTCTRLKEY:
-		return "Rightctrl";
-		break;
-	case RIGHTSHIFTKEY:
-		return "Rightshift";
-		break;
-	case LEFTSHIFTKEY:
-		return "Leftshift";
-		break;
-
-	case ESCKEY:
-		return "Esc";
-		break;
-	case TABKEY:
-		return "Tab";
-		break;
-	case RETKEY:
-		return "Ret";
-		break;
-	case SPACEKEY:
-		return "Space";
-		break;
-	case LINEFEEDKEY:
-		return "Linefeed";
-		break;
-	case BACKSPACEKEY:
-		return "Backspace";
-		break;
-	case DELKEY:
-		return "Del";
-		break;
-	case SEMICOLONKEY:
-		return "Semicolon";
-		break;
-	case PERIODKEY:
-		return "Period";
-		break;
-	case COMMAKEY:
-		return "Comma";
-		break;
-	case QUOTEKEY:
-		return "Quote";
-		break;
-	case ACCENTGRAVEKEY:
-		return "Accentgrave";
-		break;
-	case MINUSKEY:
-		return "Minus";
-		break;
-	case SLASHKEY:
-		return "Slash";
-		break;
-	case BACKSLASHKEY:
-		return "Backslash";
-		break;
-	case EQUALKEY:
-		return "Equal";
-		break;
-	case LEFTBRACKETKEY:
-		return "Leftbracket";
-		break;
-	case RIGHTBRACKETKEY:
-		return "Rightbracket";
-		break;
-
-	case LEFTARROWKEY:
-		return "Leftarrow";
-		break;
-	case DOWNARROWKEY:
-		return "Downarrow";
-		break;
-	case RIGHTARROWKEY:
-		return "Rightarrow";
-		break;
-	case UPARROWKEY:
-		return "Uparrow";
-		break;
-
-	case PAD2:
-		return "Numpad 2";
-		break;
-	case PAD4:
-		return "Numpad 4";
-		break;
-	case PAD6:
-		return "Numpad 6";
-		break;
-	case PAD8:
-		return "Numpad 8";
-		break;
-	case PAD1:
-		return "Numpad 1";
-		break;
-	case PAD3:
-		return "Numpad 3";
-		break;
-	case PAD5:
-		return "Numpad 5";
-		break;
-	case PAD7:
-		return "Numpad 7";
-		break;
-	case PAD9:
-		return "Numpad 9";
-		break;
-
-	case PADPERIOD:
-		return "Numpad .";
-		break;
-	case PADSLASHKEY:
-		return "Numpad /";
-		break;
-	case PADASTERKEY:
-		return "Numpad *";
-		break;
-
-	case PAD0:
-		return "Numpad 0";
-		break;
-	case PADMINUS:
-		return "Numpad -";
-		break;
-	case PADENTER:
-		return "Numpad Enter";
-		break;
-	case PADPLUSKEY:
-		return "Numpad +";
-		break;
-
-	case F1KEY:
-		return "F1";
-		break;
-	case F2KEY:
-		return "F2";
-		break;
-	case F3KEY:
-		return "F3";
-		break;
-	case F4KEY:
-		return "F4";
-		break;
-	case F5KEY:
-		return "F5";
-		break;
-	case F6KEY:
-		return "F6";
-		break;
-	case F7KEY:
-		return "F7";
-		break;
-	case F8KEY:
-		return "F8";
-		break;
-	case F9KEY:
-		return "F9";
-		break;
-	case F10KEY:
-		return "F10";
-		break;
-	case F11KEY:
-		return "F11";
-		break;
-	case F12KEY:
-		return "F12";
-		break;
-
-	case PAUSEKEY:
-		return "Pause";
-		break;
-	case INSERTKEY:
-		return "Insert";
-		break;
-	case HOMEKEY:
-		return "Home";
-		break;
-	case PAGEUPKEY:
-		return "Pageup";
-		break;
-	case PAGEDOWNKEY:
-		return "Pagedown";
-		break;
-	case ENDKEY:
-		return "End";
-		break;
-	}
+	const char *name= NULL;
+	if(RNA_enum_name(event_type_items, (int)type, &name))
+		return name;
 	
 	return "";
 }