diff options
Diffstat (limited to 'src/events')
-rw-r--r-- | src/events/custom_event.c | 2 | ||||
-rw-r--r-- | src/events/document_event.c | 4 | ||||
-rw-r--r-- | src/events/event.c | 10 | ||||
-rw-r--r-- | src/events/event_target.c | 10 | ||||
-rw-r--r-- | src/events/event_target.h | 9 | ||||
-rw-r--r-- | src/events/keyboard_event.c | 18 | ||||
-rw-r--r-- | src/events/keyboard_event.h | 4 | ||||
-rw-r--r-- | src/events/mouse_event.c | 6 | ||||
-rw-r--r-- | src/events/mouse_multi_wheel_event.c | 6 | ||||
-rw-r--r-- | src/events/mouse_wheel_event.c | 6 | ||||
-rw-r--r-- | src/events/mutation_event.c | 18 | ||||
-rw-r--r-- | src/events/mutation_event.h | 6 | ||||
-rw-r--r-- | src/events/mutation_name_event.c | 14 | ||||
-rw-r--r-- | src/events/mutation_name_event.h | 4 | ||||
-rw-r--r-- | src/events/text_event.c | 10 | ||||
-rw-r--r-- | src/events/text_event.h | 2 | ||||
-rw-r--r-- | src/events/ui_event.c | 4 |
17 files changed, 66 insertions, 67 deletions
diff --git a/src/events/custom_event.c b/src/events/custom_event.c index 920c23e..99b4120 100644 --- a/src/events/custom_event.c +++ b/src/events/custom_event.c @@ -89,7 +89,7 @@ dom_exception _dom_custom_event_get_detail(dom_custom_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_custom_event_init_ns(dom_custom_event *evt, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, bool bubble, bool cancelable, void *detail) { evt->detail = detail; diff --git a/src/events/document_event.c b/src/events/document_event.c index 6f18028..2b89152 100644 --- a/src/events/document_event.c +++ b/src/events/document_event.c @@ -91,7 +91,7 @@ void _dom_document_event_internal_finalise(struct dom_document *doc, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_document_event_create_event(dom_document_event *de, - struct dom_string *type, struct dom_event **evt) + dom_string *type, struct dom_event **evt) { lwc_string *t = NULL; dom_exception err; @@ -175,7 +175,7 @@ dom_exception _dom_document_event_create_event(dom_document_event *de, * DOM_NO_SUPPORTED_ERR. */ dom_exception _dom_document_event_can_dispatch(dom_document_event *de, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, bool *can) { UNUSED(de); diff --git a/src/events/event.c b/src/events/event.c index 6cd8d64..98bb0d5 100644 --- a/src/events/event.c +++ b/src/events/event.c @@ -129,7 +129,7 @@ void _dom_event_unref(dom_event *evt) * \parnm type The returned event type * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception _dom_event_get_type(dom_event *evt, struct dom_string **type) +dom_exception _dom_event_get_type(dom_event *evt, dom_string **type) { struct dom_document *doc = evt->doc; dom_exception err; @@ -245,7 +245,7 @@ dom_exception _dom_event_prevent_default(dom_event *evt) * \param cancelable Whether this event is cancelable * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception _dom_event_init(dom_event *evt, struct dom_string *type, +dom_exception _dom_event_init(dom_event *evt, dom_string *type, bool bubble, bool cancelable) { assert(evt->doc != NULL); @@ -273,7 +273,7 @@ dom_exception _dom_event_init(dom_event *evt, struct dom_string *type, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_event_get_namespace(dom_event *evt, - struct dom_string **namespace) + dom_string **namespace) { struct dom_document *doc = evt->doc; dom_exception err; @@ -337,8 +337,8 @@ dom_exception _dom_event_is_default_prevented(dom_event *evt, bool *prevented) * \param cancelable Whether this event is cancelable * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception _dom_event_init_ns(dom_event *evt, struct dom_string *namespace, - struct dom_string *type, bool bubble, bool cancelable) +dom_exception _dom_event_init_ns(dom_event *evt, dom_string *namespace, + dom_string *type, bool bubble, bool cancelable) { assert(evt->doc != NULL); lwc_string *str = NULL; diff --git a/src/events/event_target.c b/src/events/event_target.c index 5428557..6bf5458 100644 --- a/src/events/event_target.c +++ b/src/events/event_target.c @@ -72,7 +72,7 @@ void _dom_event_target_internal_finalise(struct dom_document *doc, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_event_target_add_event_listener(dom_event_target *et, - struct dom_string *type, struct dom_event_listener *listener, + dom_string *type, struct dom_event_listener *listener, bool capture) { struct listener_entry *le = NULL; @@ -141,7 +141,7 @@ dom_exception _dom_event_target_add_event_listener(dom_event_target *et, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_event_target_remove_event_listener(dom_event_target *et, - struct dom_string *type, struct dom_event_listener *listener, + dom_string *type, struct dom_event_listener *listener, bool capture) { struct listener_entry *le = NULL; @@ -244,7 +244,7 @@ dom_exception _dom_event_target_dispatch_event(dom_event_target *et, return DOM_NO_ERR; } - struct dom_string *type = NULL; + dom_string *type = NULL; err = _dom_document_create_string_from_lwcstring(doc, evt->type, &type); if (err != DOM_NO_ERR) return err; @@ -389,7 +389,7 @@ cleanup: * We don't support this API now, so it always return DOM_NOT_SUPPORTED_ERR. */ dom_exception _dom_event_target_add_event_listener_ns(dom_event_target *et, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, struct dom_event_listener *listener, bool capture) { UNUSED(et); @@ -414,7 +414,7 @@ dom_exception _dom_event_target_add_event_listener_ns(dom_event_target *et, * We don't support this API now, so it always return DOM_NOT_SUPPORTED_ERR. */ dom_exception _dom_event_target_remove_event_listener_ns(dom_event_target *et, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, struct dom_event_listener *listener, bool capture) { UNUSED(et); diff --git a/src/events/event_target.h b/src/events/event_target.h index e6ad7b6..78808e3 100644 --- a/src/events/event_target.h +++ b/src/events/event_target.h @@ -17,7 +17,6 @@ #include "utils/hashtable.h" struct dom_document; -struct dom_string; /** * Listener Entry @@ -72,13 +71,13 @@ dom_exception _dom_dispatch_node_change_event(struct dom_document *doc, /* Dispatch a DOMCharacterDataModified event */ dom_exception _dom_dispatch_characterdata_modified_event( struct dom_document *doc, dom_event_target *et, - struct dom_string *prev, struct dom_string *new, bool *success); + dom_string *prev, dom_string *new, bool *success); /* Dispatch a DOMAttrModified event */ dom_exception _dom_dispatch_attr_modified_event(struct dom_document *doc, - dom_event_target *et, struct dom_string *prev, - struct dom_string *new, dom_event_target *related, - struct dom_string *attr_name, dom_mutation_type change, + dom_event_target *et, dom_string *prev, + dom_string *new, dom_event_target *related, + dom_string *attr_name, dom_mutation_type change, bool *success); /* Dispatch a DOMSubtreeModified event */ diff --git a/src/events/keyboard_event.c b/src/events/keyboard_event.c index b8fc3ba..3e3b141 100644 --- a/src/events/keyboard_event.c +++ b/src/events/keyboard_event.c @@ -74,7 +74,7 @@ void _virtual_dom_keyboard_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_keyboard_event_get_key_identifier(dom_keyboard_event *evt, - struct dom_string **ident) + dom_string **ident) { *ident = evt->key_ident; dom_string_ref(*ident); @@ -171,7 +171,7 @@ dom_exception _dom_keyboard_event_get_meta_key(dom_keyboard_event *evt, * KeyboardEvent.keyLocation. */ dom_exception _dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt, - struct dom_string *m, bool *state) + dom_string *m, bool *state) { if (m == NULL) { *state = false; @@ -221,9 +221,9 @@ dom_exception _dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_keyboard_event_init(dom_keyboard_event *evt, - struct dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, struct dom_string *key_ident, - dom_key_location key_loc, struct dom_string *modifier_list) + dom_string *type, bool bubble, bool cancelable, + struct dom_abstract_view *view, dom_string *key_ident, + dom_key_location key_loc, dom_string *modifier_list) { dom_exception err; @@ -255,10 +255,10 @@ dom_exception _dom_keyboard_event_init(dom_keyboard_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_keyboard_event_init_ns(dom_keyboard_event *evt, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - struct dom_string *key_ident, dom_key_location key_loc, - struct dom_string *modifier_list) + dom_string *key_ident, dom_key_location key_loc, + dom_string *modifier_list) { dom_exception err; @@ -284,7 +284,7 @@ dom_exception _dom_keyboard_event_init_ns(dom_keyboard_event *evt, * \param modifier_state The returned state * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception _dom_parse_modifier_list(struct dom_string *modifier_list, +dom_exception _dom_parse_modifier_list(dom_string *modifier_list, uint32_t *modifier_state) { *modifier_state = 0; diff --git a/src/events/keyboard_event.h b/src/events/keyboard_event.h index 4d2777c..a988efc 100644 --- a/src/events/keyboard_event.h +++ b/src/events/keyboard_event.h @@ -18,7 +18,7 @@ struct dom_keyboard_event { struct dom_ui_event base; /**< The base class */ - struct dom_string *key_ident; /**< The identifier of the key in this + dom_string *key_ident; /**< The identifier of the key in this * event, please refer: * http://www.w3.org/TR/DOM-Level-3-Events/keyset.html#KeySet-Set * for detail @@ -49,7 +49,7 @@ void _dom_keyboard_event_finalise(struct dom_document *doc, /* Parse the modifier list string to corresponding bool variable state */ -dom_exception _dom_parse_modifier_list(struct dom_string *modifier_list, +dom_exception _dom_parse_modifier_list(dom_string *modifier_list, uint32_t *modifier_state); #endif diff --git a/src/events/mouse_event.c b/src/events/mouse_event.c index 1b31012..7f61343 100644 --- a/src/events/mouse_event.c +++ b/src/events/mouse_event.c @@ -222,7 +222,7 @@ dom_exception _dom_mouse_event_get_related_target(dom_mouse_event *evt, * KeyboardEvent.keyLocation. */ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt, - struct dom_string *m, bool *state) + dom_string *m, bool *state) { if (m == NULL) { *state = false; @@ -278,7 +278,7 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mouse_event_init(dom_mouse_event *evt, - struct dom_string *type, bool bubble, bool cancelable, + 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, unsigned short button, @@ -332,7 +332,7 @@ dom_exception _dom_mouse_event_init(dom_mouse_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, - struct dom_string *namespace, struct dom_string *type, + 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, diff --git a/src/events/mouse_multi_wheel_event.c b/src/events/mouse_multi_wheel_event.c index bca9c97..6eccdab 100644 --- a/src/events/mouse_multi_wheel_event.c +++ b/src/events/mouse_multi_wheel_event.c @@ -126,12 +126,12 @@ dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mouse_multi_wheel_event_init_ns( - dom_mouse_multi_wheel_event *evt, struct dom_string *namespace, - struct dom_string *type, bool bubble, bool cancelable, + 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, unsigned short button, dom_event_target *et, - struct dom_string *modifier_list, long wheel_delta_x, + dom_string *modifier_list, long wheel_delta_x, long wheel_delta_y, long wheel_delta_z) { dom_exception err; diff --git a/src/events/mouse_wheel_event.c b/src/events/mouse_wheel_event.c index c38ae3e..c2ae111 100644 --- a/src/events/mouse_wheel_event.c +++ b/src/events/mouse_wheel_event.c @@ -92,12 +92,12 @@ dom_exception _dom_mouse_wheel_event_get_wheel_delta( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mouse_wheel_event_init_ns( - dom_mouse_wheel_event *evt, struct dom_string *namespace, - struct dom_string *type, bool bubble, bool cancelable, + 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, unsigned short button, dom_event_target *et, - struct dom_string *modifier_list, long wheel_delta) + dom_string *modifier_list, long wheel_delta) { dom_exception err; evt->delta = wheel_delta; diff --git a/src/events/mutation_event.c b/src/events/mutation_event.c index c24ae15..ecc9794 100644 --- a/src/events/mutation_event.c +++ b/src/events/mutation_event.c @@ -98,7 +98,7 @@ dom_exception _dom_mutation_event_get_related_node(dom_mutation_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mutation_event_get_prev_value(dom_mutation_event *evt, - struct dom_string **ret) + dom_string **ret) { *ret = evt->prev_value; dom_string_ref(*ret); @@ -114,7 +114,7 @@ dom_exception _dom_mutation_event_get_prev_value(dom_mutation_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mutation_event_get_new_value(dom_mutation_event *evt, - struct dom_string **ret) + dom_string **ret) { *ret = evt->new_value; dom_string_ref(*ret); @@ -130,7 +130,7 @@ dom_exception _dom_mutation_event_get_new_value(dom_mutation_event *evt, * \return DOM_NO_ERR. */ dom_exception _dom_mutation_event_get_attr_name(dom_mutation_event *evt, - struct dom_string **ret) + dom_string **ret) { *ret = evt->attr_name; dom_string_ref(*ret); @@ -168,9 +168,9 @@ dom_exception _dom_mutation_event_get_attr_change(dom_mutation_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mutation_event_init(dom_mutation_event *evt, - struct dom_string *type, bool bubble, bool cancelable, - struct dom_node *node, struct dom_string *prev_value, - struct dom_string *new_value, struct dom_string *attr_name, + dom_string *type, bool bubble, bool cancelable, + struct dom_node *node, dom_string *prev_value, + dom_string *new_value, dom_string *attr_name, dom_mutation_type change) { evt->related_node = node; @@ -206,10 +206,10 @@ dom_exception _dom_mutation_event_init(dom_mutation_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mutation_event_init_ns(dom_mutation_event *evt, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_node *node, - struct dom_string *prev_value, struct dom_string *new_value, - struct dom_string *attr_name, dom_mutation_type change) + dom_string *prev_value, dom_string *new_value, + dom_string *attr_name, dom_mutation_type change) { evt->related_node = node; dom_node_ref(node); diff --git a/src/events/mutation_event.h b/src/events/mutation_event.h index d6cd733..58ae9fb 100644 --- a/src/events/mutation_event.h +++ b/src/events/mutation_event.h @@ -19,9 +19,9 @@ struct dom_mutation_event { struct dom_event base; struct dom_node *related_node; - struct dom_string *prev_value; - struct dom_string *new_value; - struct dom_string *attr_name; + dom_string *prev_value; + dom_string *new_value; + dom_string *attr_name; dom_mutation_type change; }; diff --git a/src/events/mutation_name_event.c b/src/events/mutation_name_event.c index 34b9288..d7c14e4 100644 --- a/src/events/mutation_name_event.c +++ b/src/events/mutation_name_event.c @@ -76,7 +76,7 @@ void _virtual_dom_mutation_name_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_mutation_name_event_get_prev_namespace( - dom_mutation_name_event *evt, struct dom_string **namespace) + dom_mutation_name_event *evt, dom_string **namespace) { *namespace = evt->prev_namespace; dom_string_ref(*namespace); @@ -92,7 +92,7 @@ dom_exception _dom_mutation_name_event_get_prev_namespace( * \return DOM_NO_ERR. */ dom_exception _dom_mutation_name_event_get_prev_node_name( - dom_mutation_name_event *evt, struct dom_string **name) + dom_mutation_name_event *evt, dom_string **name) { *name = evt->prev_nodename; dom_string_ref(*name); @@ -113,9 +113,9 @@ dom_exception _dom_mutation_name_event_get_prev_node_name( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mutation_name_event_init(dom_mutation_name_event *evt, - struct dom_string *type, bool bubble, bool cancelable, - struct dom_node *node, struct dom_string *prev_ns, - struct dom_string *prev_name) + dom_string *type, bool bubble, bool cancelable, + struct dom_node *node, dom_string *prev_ns, + dom_string *prev_name) { evt->prev_namespace = prev_ns; dom_string_ref(prev_ns); @@ -142,9 +142,9 @@ dom_exception _dom_mutation_name_event_init(dom_mutation_name_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_mutation_name_event_init_ns(dom_mutation_name_event *evt, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_node *node, - struct dom_string *prev_ns, struct dom_string *prev_name) + dom_string *prev_ns, dom_string *prev_name) { evt->prev_namespace = prev_ns; dom_string_ref(prev_ns); diff --git a/src/events/mutation_name_event.h b/src/events/mutation_name_event.h index 2ba74de..94b35a2 100644 --- a/src/events/mutation_name_event.h +++ b/src/events/mutation_name_event.h @@ -18,8 +18,8 @@ struct dom_mutation_name_event { struct dom_mutation_event base; - struct dom_string *prev_namespace; - struct dom_string *prev_nodename; + dom_string *prev_namespace; + dom_string *prev_nodename; }; /* Constructor */ diff --git a/src/events/text_event.c b/src/events/text_event.c index 24c921a..591da57 100644 --- a/src/events/text_event.c +++ b/src/events/text_event.c @@ -69,7 +69,7 @@ void _virtual_dom_text_event_destroy(struct dom_event *evt) * \return DOM_NO_ERR. */ dom_exception _dom_text_event_get_data(dom_text_event *evt, - struct dom_string **data) + dom_string **data) { *data = evt->data; dom_string_ref(*data); @@ -89,8 +89,8 @@ dom_exception _dom_text_event_get_data(dom_text_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_text_event_init(dom_text_event *evt, - struct dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, struct dom_string *data) + dom_string *type, bool bubble, bool cancelable, + struct dom_abstract_view *view, dom_string *data) { evt->data = data; dom_string_ref(data); @@ -112,9 +112,9 @@ dom_exception _dom_text_event_init(dom_text_event *evt, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_text_event_init_ns(dom_text_event *evt, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - struct dom_string *data) + dom_string *data) { evt->data = data; dom_string_ref(data); diff --git a/src/events/text_event.h b/src/events/text_event.h index 754a4f6..a50bf32 100644 --- a/src/events/text_event.h +++ b/src/events/text_event.h @@ -17,7 +17,7 @@ */ struct dom_text_event { struct dom_ui_event base; - struct dom_string *data; + dom_string *data; }; /* Constructor */ diff --git a/src/events/ui_event.c b/src/events/ui_event.c index f18e44f..0be2980 100644 --- a/src/events/ui_event.c +++ b/src/events/ui_event.c @@ -102,7 +102,7 @@ dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, * \param detail The detail object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ -dom_exception _dom_ui_event_init(dom_ui_event *evt, struct dom_string *type, +dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, long detail) { @@ -125,7 +125,7 @@ dom_exception _dom_ui_event_init(dom_ui_event *evt, struct dom_string *type, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, - struct dom_string *namespace, struct dom_string *type, + dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, long detail) { |