summaryrefslogtreecommitdiff
path: root/src/events
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2012-09-10 19:14:49 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2012-09-10 19:14:49 +0100
commita77488bab4732c30044b04e97d13707e03825bdf (patch)
treec2b056265adfe7acd76596ab5433d2ce7f227cd3 /src/events
parentc733e0fbd053ffa80b83839c4114a2a28b3ed2ec (diff)
downloadlibdom-a77488bab4732c30044b04e97d13707e03825bdf.tar.gz
libdom-a77488bab4732c30044b04e97d13707e03825bdf.tar.bz2
unsigned long -> uint32_t, signed long and long -> int32_t, plus collateral fixes. Test suite does not pass
Diffstat (limited to 'src/events')
-rw-r--r--src/events/mouse_event.c16
-rw-r--r--src/events/mouse_event.h8
-rw-r--r--src/events/mouse_multi_wheel_event.c14
-rw-r--r--src/events/mouse_multi_wheel_event.h6
-rw-r--r--src/events/mouse_wheel_event.c8
-rw-r--r--src/events/mouse_wheel_event.h2
-rw-r--r--src/events/ui_event.c6
-rw-r--r--src/events/ui_event.h2
8 files changed, 31 insertions, 31 deletions
diff --git a/src/events/mouse_event.c b/src/events/mouse_event.c
index a2a97bb..3e76879 100644
--- a/src/events/mouse_event.c
+++ b/src/events/mouse_event.c
@@ -66,7 +66,7 @@ void _virtual_dom_mouse_event_destroy(struct dom_event *evt)
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt,
- long *x)
+ int32_t *x)
{
*x = evt->sx;
@@ -81,7 +81,7 @@ dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt,
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt,
- long *y)
+ int32_t *y)
{
*y = evt->sy;
@@ -96,7 +96,7 @@ dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt,
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt,
- long *x)
+ int32_t *x)
{
*x = evt->cx;
@@ -111,7 +111,7 @@ dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt,
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt,
- long *y)
+ int32_t *y)
{
*y = evt->cy;
@@ -282,8 +282,8 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt,
*/
dom_exception _dom_mouse_event_init(dom_mouse_event *evt,
dom_string *type, bool bubble, bool cancelable,
- struct dom_abstract_view *view, long detail, long screen_x,
- long screen_y, long client_x, long client_y, bool ctrl,
+ struct dom_abstract_view *view, int32_t detail, int32_t screen_x,
+ int32_t screen_y, int32_t client_x, int32_t client_y, bool ctrl,
bool alt, bool shift, bool meta, unsigned short button,
dom_event_target *et)
{
@@ -337,8 +337,8 @@ dom_exception _dom_mouse_event_init(dom_mouse_event *evt,
dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt,
dom_string *namespace, dom_string *type,
bool bubble, bool cancelable, struct dom_abstract_view *view,
- long detail, long screen_x, long screen_y, long client_x,
- long client_y, bool ctrl, bool alt, bool shift, bool meta,
+ int32_t detail, int32_t screen_x, int32_t screen_y, int32_t client_x,
+ int32_t client_y, bool ctrl, bool alt, bool shift, bool meta,
unsigned short button, dom_event_target *et)
{
evt->sx = screen_x;
diff --git a/src/events/mouse_event.h b/src/events/mouse_event.h
index 85246e7..e49bcd7 100644
--- a/src/events/mouse_event.h
+++ b/src/events/mouse_event.h
@@ -18,10 +18,10 @@
struct dom_mouse_event {
struct dom_ui_event base; /**< Base class */
- long sx; /**< ScreenX */
- long sy; /**< ScreenY */
- long cx; /**< ClientX */
- long cy; /**< ClientY */
+ int32_t sx; /**< ScreenX */
+ int32_t sy; /**< ScreenY */
+ int32_t cx; /**< ClientX */
+ int32_t cy; /**< ClientY */
uint32_t modifier_state; /**< The modifier keys state */
diff --git a/src/events/mouse_multi_wheel_event.c b/src/events/mouse_multi_wheel_event.c
index 8c4615b..35f91af 100644
--- a/src/events/mouse_multi_wheel_event.c
+++ b/src/events/mouse_multi_wheel_event.c
@@ -67,7 +67,7 @@ void _virtual_dom_mouse_multi_wheel_event_destroy(struct dom_event *evt)
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x(
- dom_mouse_multi_wheel_event *evt, long *x)
+ dom_mouse_multi_wheel_event *evt, int32_t *x)
{
*x = evt->x;
@@ -82,7 +82,7 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x(
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y(
- dom_mouse_multi_wheel_event *evt, long *y)
+ dom_mouse_multi_wheel_event *evt, int32_t *y)
{
*y = evt->y;
@@ -97,7 +97,7 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y(
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z(
- dom_mouse_multi_wheel_event *evt, long *z)
+ dom_mouse_multi_wheel_event *evt, int32_t *z)
{
*z = evt->z;
@@ -129,11 +129,11 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z(
dom_exception _dom_mouse_multi_wheel_event_init_ns(
dom_mouse_multi_wheel_event *evt, dom_string *namespace,
dom_string *type, bool bubble, bool cancelable,
- struct dom_abstract_view *view, long detail, long screen_x,
- long screen_y, long client_x, long client_y,
+ struct dom_abstract_view *view, int32_t detail, int32_t screen_x,
+ int32_t screen_y, int32_t client_x, int32_t client_y,
unsigned short button, dom_event_target *et,
- dom_string *modifier_list, long wheel_delta_x,
- long wheel_delta_y, long wheel_delta_z)
+ dom_string *modifier_list, int32_t wheel_delta_x,
+ int32_t wheel_delta_y, int32_t wheel_delta_z)
{
dom_exception err;
dom_mouse_event *e = (dom_mouse_event *) evt;
diff --git a/src/events/mouse_multi_wheel_event.h b/src/events/mouse_multi_wheel_event.h
index 9b854c9..0476911 100644
--- a/src/events/mouse_multi_wheel_event.h
+++ b/src/events/mouse_multi_wheel_event.h
@@ -18,9 +18,9 @@
struct dom_mouse_multi_wheel_event {
struct dom_mouse_event base; /**< The base class */
- long x; /**< The wheelDeltaX */
- long y; /**< The wheelDeltaY */
- long z; /**< The wheelDeltaZ */
+ int32_t x; /**< The wheelDeltaX */
+ int32_t y; /**< The wheelDeltaY */
+ int32_t z; /**< The wheelDeltaZ */
};
/* Constructor */
diff --git a/src/events/mouse_wheel_event.c b/src/events/mouse_wheel_event.c
index cce4fac..778a53b 100644
--- a/src/events/mouse_wheel_event.c
+++ b/src/events/mouse_wheel_event.c
@@ -65,7 +65,7 @@ void _virtual_dom_mouse_wheel_event_destroy(struct dom_event *evt)
* \return DOM_NO_ERR.
*/
dom_exception _dom_mouse_wheel_event_get_wheel_delta(
- dom_mouse_wheel_event *evt, long *d)
+ dom_mouse_wheel_event *evt, int32_t *d)
{
*d = evt->delta;
@@ -95,10 +95,10 @@ dom_exception _dom_mouse_wheel_event_get_wheel_delta(
dom_exception _dom_mouse_wheel_event_init_ns(
dom_mouse_wheel_event *evt, dom_string *namespace,
dom_string *type, bool bubble, bool cancelable,
- struct dom_abstract_view *view, long detail, long screen_x,
- long screen_y, long client_x, long client_y,
+ struct dom_abstract_view *view, int32_t detail, int32_t screen_x,
+ int32_t screen_y, int32_t client_x, int32_t client_y,
unsigned short button, dom_event_target *et,
- dom_string *modifier_list, long wheel_delta)
+ dom_string *modifier_list, int32_t wheel_delta)
{
dom_exception err;
dom_mouse_event *e = (dom_mouse_event *) evt;
diff --git a/src/events/mouse_wheel_event.h b/src/events/mouse_wheel_event.h
index 9247d4a..e78abf6 100644
--- a/src/events/mouse_wheel_event.h
+++ b/src/events/mouse_wheel_event.h
@@ -18,7 +18,7 @@
struct dom_mouse_wheel_event {
struct dom_mouse_event base; /**< The base class */
- long delta; /**< The wheelDelta */
+ int32_t delta; /**< The wheelDelta */
};
/* Constructor */
diff --git a/src/events/ui_event.c b/src/events/ui_event.c
index 0082332..911b0d0 100644
--- a/src/events/ui_event.c
+++ b/src/events/ui_event.c
@@ -84,7 +84,7 @@ dom_exception _dom_ui_event_get_view(dom_ui_event *evt,
* \return DOM_NO_ERR.
*/
dom_exception _dom_ui_event_get_detail(dom_ui_event *evt,
- long *detail)
+ int32_t *detail)
{
*detail = evt->detail;
@@ -104,7 +104,7 @@ dom_exception _dom_ui_event_get_detail(dom_ui_event *evt,
*/
dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type,
bool bubble, bool cancelable, struct dom_abstract_view *view,
- long detail)
+ int32_t detail)
{
evt->view = view;
evt->detail = detail;
@@ -127,7 +127,7 @@ dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type,
dom_exception _dom_ui_event_init_ns(dom_ui_event *evt,
dom_string *namespace, dom_string *type,
bool bubble, bool cancelable, struct dom_abstract_view *view,
- long detail)
+ int32_t detail)
{
evt->view = view;
evt->detail = detail;
diff --git a/src/events/ui_event.h b/src/events/ui_event.h
index d90f6d7..e60ed35 100644
--- a/src/events/ui_event.h
+++ b/src/events/ui_event.h
@@ -32,7 +32,7 @@ typedef enum {
struct dom_ui_event {
struct dom_event base; /**< The base class */
struct dom_abstract_view *view; /**< The AbstractView */
- long detail; /**< Some private data for this event */
+ int32_t detail; /**< Some private data for this event */
};
/* Constructor */