Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: ppapi/c/pp_input_event.h

Issue 7399016: More trivial cleanupi of ppapi/c headers (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/c/pp_file_info.h ('k') | ppapi/c/pp_instance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/c/pp_input_event.h
===================================================================
--- ppapi/c/pp_input_event.h (revision 92804)
+++ ppapi/c/pp_input_event.h (working copy)
@@ -2,14 +2,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
+/* From pp_input_event.idl modified Sat Jul 16 16:50:26 2011. */
+
#ifndef PPAPI_C_PP_INPUT_EVENT_H_
#define PPAPI_C_PP_INPUT_EVENT_H_
-/**
- * @file
- * This file defines the API used to handle mouse and keyboard input events.
- */
-
#include "ppapi/c/pp_bool.h"
#include "ppapi/c/pp_macros.h"
#include "ppapi/c/pp_stdint.h"
@@ -17,10 +15,15 @@
#include "ppapi/c/ppb_input_event.h"
/**
+ * @file
+ * This file defines the API used to handle mouse and keyboard input events.
+ */
+
+
+/**
* @addtogroup Structs
* @{
*/
-
/**
* The <code>PP_InputEvent_Key</code> struct represents a key up or key down
* event.
@@ -41,25 +44,15 @@
struct PP_InputEvent_Key {
/** This value is a bit field combination of the EVENT_MODIFIER flags. */
uint32_t modifier;
-
/**
* This value reflects the DOM KeyboardEvent <code>keyCode</code> field.
* Chrome populates this with the Windows-style Virtual Key code of the key.
*/
-
uint32_t key_code;
};
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Key, 8);
-/**
- * @}
- */
/**
- * @addtogroup Structs
- * @{
- */
-
-/**
* The <code>PP_InputEvent_Character</code> struct represents a typed character
* event.
*
@@ -83,7 +76,6 @@
struct PP_InputEvent_Character {
/** A combination of the <code>PP_InputEvent_Modifier</code> flags. */
uint32_t modifier;
-
/**
* This value represents the typed character as a single null-terminated UTF-8
* character. Any unused bytes will be filled with null bytes. Since the
@@ -93,16 +85,8 @@
char text[5];
};
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Character, 12);
-/**
- * @}
- */
/**
- * @addtogroup Structs
- * @{
- */
-
-/**
* The <code>PP_InputEvent_Mouse</code> struct represents all mouse events
* except mouse wheel events.
*/
@@ -112,14 +96,12 @@
* <code>PP_InputEvent_Modifier</code> flags.
*/
uint32_t modifier;
-
/**
* This value represents the button that changed for mouse down or up events.
* This value will be <code>PP_EVENT_MOUSEBUTTON_NONE</code> for mouse move,
* enter, and leave events.
*/
PP_InputEvent_MouseButton button;
-
/**
* This values represents the x coordinate of the mouse when the event
* occurred.
@@ -140,21 +122,12 @@
* plugin will give non-integer values.
*/
float y;
-
- // TODO(brettw) figure out exactly what this means.
+ /* TODO(brettw) figure out exactly what this means. */
int32_t click_count;
};
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Mouse, 20);
-/**
- * @}
- */
/**
- * @addtogroup Structs
- * @{
- */
-
-/**
* The <code>PP_InputEvent_Wheel</code> struct represents all mouse wheel
* events.
*/
@@ -164,7 +137,6 @@
* flags.
*/
uint32_t modifier;
-
/**
* Indicates the amount vertically and horizontally the user has requested
* to scroll by with their mouse wheel. A scroll down or to the right (where
@@ -187,10 +159,8 @@
* "clicks".
*/
float delta_x;
-
/** This value represents */
float delta_y;
-
/**
* The number of "clicks" of the scroll wheel that have produced the
* event. The value may have system-specific acceleration applied to it,
@@ -210,10 +180,8 @@
* of scrolling as for a mouse that has a discrete mouse wheel.
*/
float wheel_ticks_x;
-
/** This value represents */
float wheel_ticks_y;
-
/**
* Indicates if the scroll <code>delta_x</code>/<code>delta_y</code>
* indicates pages or lines to scroll by. When true, the user is requesting
@@ -222,17 +190,8 @@
PP_Bool scroll_by_page;
};
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent_Wheel, 24);
-/**
- * @}
- */
/**
- *
- * @addtogroup Structs
- * @{
- */
-
-/**
* The PP_InputEventData union represents all input event data types.
*/
union PP_InputEventData {
@@ -240,48 +199,34 @@
struct PP_InputEvent_Character character;
struct PP_InputEvent_Mouse mouse;
struct PP_InputEvent_Wheel wheel;
-
/**
* This value allows new events to be added without changing the size of
* this struct.
*/
char padding[64];
};
-/**
- * @}
- */
/**
- *
- * @addtogroup Structs
- * @{
- */
-
-/**
* The PP_InputEvent struct represents all input events.
*/
struct PP_InputEvent {
/** This value represents the type of the event. */
PP_InputEvent_Type type;
-
/** This value ensure the time_stamp is aligned on an 8-byte boundary
* relative to the start of the struct. Some compilers align doubles
* on 8-byte boundaries for 32-bit x86, and some align on 4-byte boundaries.
*/
int32_t padding;
-
/**
* This value represents the time that this event was generated. This value
* is not relative to any particular epoch; the most you can do is compare
* time stamps.
*/
PP_TimeTicks time_stamp;
-
/**
* This value represents the event type and its specific data.
*/
union PP_InputEventData u;
-
};
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent, 80);
/**
@@ -289,3 +234,4 @@
*/
#endif /* PPAPI_C_PP_INPUT_EVENT_H_ */
+
« no previous file with comments | « ppapi/c/pp_file_info.h ('k') | ppapi/c/pp_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698