diff options
Diffstat (limited to 'intern/ghost/GHOST_Types.h')
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index f7d0425aec8..705f4916619 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * ***** BEGIN GPL LICENSE BLOCK ***** * @@ -26,9 +26,20 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file ghost/GHOST_Types.h + * \ingroup GHOST + */ + + #ifndef _GHOST_TYPES_H_ #define _GHOST_TYPES_H_ +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + +#define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name + typedef char GHOST_TInt8; typedef unsigned char GHOST_TUns8; typedef short GHOST_TInt16; @@ -96,7 +107,7 @@ typedef enum { GHOST_kModifierKeyRightAlt, GHOST_kModifierKeyLeftControl, GHOST_kModifierKeyRightControl, - GHOST_kModifierKeyCommand, // APPLE only + GHOST_kModifierKeyOS, GHOST_kModifierKeyNumMasks } GHOST_TModifierKeyMask; @@ -283,8 +294,8 @@ typedef enum { GHOST_kKeyRightControl, GHOST_kKeyLeftAlt, GHOST_kKeyRightAlt, - GHOST_kKeyCommand, // APPLE only! - GHOST_kKeyGrLess , // German PC only! + GHOST_kKeyOS, // Command key on Apple, Windows key(s) on Windows + GHOST_kKeyGrLess , // German PC only! GHOST_kKeyCapsLock, GHOST_kKeyNumLock, @@ -347,7 +358,13 @@ typedef enum { GHOST_kKeyF21, GHOST_kKeyF22, GHOST_kKeyF23, - GHOST_kKeyF24 + GHOST_kKeyF24, + + // Multimedia keypad buttons + GHOST_kKeyMediaPlay, + GHOST_kKeyMediaStop, + GHOST_kKeyMediaFirst, + GHOST_kKeyMediaLast } GHOST_TKey; typedef enum { @@ -444,7 +461,7 @@ typedef struct { GHOST_TUns64 delta; } GHOST_TEventNDOFData; -typedef int (*GHOST_NDOFLibraryInit_fp)(); +typedef int (*GHOST_NDOFLibraryInit_fp)(void); typedef void (*GHOST_NDOFLibraryShutdown_fp)(void* deviceHandle); typedef void* (*GHOST_NDOFDeviceOpen_fp)(void* platformData); |