Index: ppapi/c/pp_input_event.h |
=================================================================== |
--- ppapi/c/pp_input_event.h (revision 90976) |
+++ ppapi/c/pp_input_event.h (working copy) |
@@ -14,81 +14,9 @@ |
#include "ppapi/c/pp_macros.h" |
#include "ppapi/c/pp_stdint.h" |
#include "ppapi/c/pp_time.h" |
+#include "ppapi/c/ppb_input_event.h" |
/** |
- * |
- * @addtogroup Enums |
- * @{ |
- */ |
- |
-/** |
- * This enumeration contains constants representing each mouse button. |
- */ |
-typedef enum { |
- PP_INPUTEVENT_MOUSEBUTTON_NONE = -1, |
- PP_INPUTEVENT_MOUSEBUTTON_LEFT = 0, |
- PP_INPUTEVENT_MOUSEBUTTON_MIDDLE = 1, |
- PP_INPUTEVENT_MOUSEBUTTON_RIGHT = 2 |
-} PP_InputEvent_MouseButton; |
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_MouseButton, 4); |
-/** |
- * @} |
- */ |
- |
-/** |
- * @addtogroup Enums |
- * @{ |
- */ |
- |
-/** |
- * This enumeration contains mouse and keyboard event constants. |
- */ |
-typedef enum { |
- PP_INPUTEVENT_TYPE_UNDEFINED = -1, |
- PP_INPUTEVENT_TYPE_MOUSEDOWN = 0, // PP_InputEvent_Mouse |
- PP_INPUTEVENT_TYPE_MOUSEUP = 1, // PP_InputEvent_Mouse |
- PP_INPUTEVENT_TYPE_MOUSEMOVE = 2, // PP_InputEvent_Mouse |
- PP_INPUTEVENT_TYPE_MOUSEENTER = 3, // PP_InputEvent_Mouse |
- PP_INPUTEVENT_TYPE_MOUSELEAVE = 4, // PP_InputEvent_Mouse |
- PP_INPUTEVENT_TYPE_MOUSEWHEEL = 5, // PP_InputEvent_Wheel |
- PP_INPUTEVENT_TYPE_RAWKEYDOWN = 6, // PP_InputEvent_Key |
- PP_INPUTEVENT_TYPE_KEYDOWN = 7, // PP_InputEvent_Key |
- PP_INPUTEVENT_TYPE_KEYUP = 8, // PP_InputEvent_Key |
- PP_INPUTEVENT_TYPE_CHAR = 9, // PP_InputEvent_Character |
- PP_INPUTEVENT_TYPE_CONTEXTMENU = 10 // PP_InputEvent_Mouse |
-} PP_InputEvent_Type; |
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Type, 4); |
-/** |
- * @} |
- */ |
- |
-/** |
- * @addtogroup Enums |
- * @{ |
- */ |
- |
-/** |
- * This enumeration contains event modifier constants. |
- */ |
-typedef enum { |
- PP_INPUTEVENT_MODIFIER_SHIFTKEY = 1 << 0, |
- PP_INPUTEVENT_MODIFIER_CONTROLKEY = 1 << 1, |
- PP_INPUTEVENT_MODIFIER_ALTKEY = 1 << 2, |
- PP_INPUTEVENT_MODIFIER_METAKEY = 1 << 3, |
- PP_INPUTEVENT_MODIFIER_ISKEYPAD = 1 << 4, |
- PP_INPUTEVENT_MODIFIER_ISAUTOREPEAT = 1 << 5, |
- PP_INPUTEVENT_MODIFIER_LEFTBUTTONDOWN = 1 << 6, |
- PP_INPUTEVENT_MODIFIER_MIDDLEBUTTONDOWN = 1 << 7, |
- PP_INPUTEVENT_MODIFIER_RIGHTBUTTONDOWN = 1 << 8, |
- PP_INPUTEVENT_MODIFIER_CAPSLOCKKEY = 1 << 9, |
- PP_INPUTEVENT_MODIFIER_NUMLOCKKEY = 1 << 10 |
-} PP_InputEvent_Modifier; |
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Modifier, 4); |
-/** |
- * @} |
- */ |
- |
-/** |
* @addtogroup Structs |
* @{ |
*/ |