r8940 struggleyb - in /branches/struggleyb/libdom-events: include/dom/events/document_event.h src/events/Makefile src/events/document_event.c src/events/document_event.h src/events/event_target.c
by netsurf＠semichrome.net
Author: struggleyb
Date: Sat Aug 1 03:07:37 2009
New Revision: 8940
URL: http://source.netsurf-browser.org?rev=8940&view=rev
Log:
Add DocumentEvent.
Modified:
branches/struggleyb/libdom-events/include/dom/events/document_event.h
branches/struggleyb/libdom-events/src/events/Makefile
branches/struggleyb/libdom-events/src/events/document_event.c
branches/struggleyb/libdom-events/src/events/document_event.h
branches/struggleyb/libdom-events/src/events/event_target.c
Modified: branches/struggleyb/libdom-events/include/dom/events/document_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/document_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/document_event.h Sat Aug 1 03:07:37 2009
@@ -20,10 +20,10 @@
(struct dom_string *) (t), (struct dom_event **) (e))
dom_exception dom_document_event_can_dispatch(dom_document_event *de,
- struct dom_string *namespace, struct dom_string *type);
-#define dom_document_event_can_dispatch(d, n, t) \
+ struct dom_string *namespace, struct dom_string *type, bool* can);
+#define dom_document_event_can_dispatch(d, n, t, c) \
dom_document_event_can_dispatch((dom_document_event *) (d), \
- (struct dom_string *) (n), (struct dom_string *) (t))
+ (struct dom_string *) (n), (struct dom_string *) (t), (bool *) (c))
#endif
Modified: branches/struggleyb/libdom-events/src/events/Makefile
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/Makefile (original)
+++ branches/struggleyb/libdom-events/src/events/Makefile Sat Aug 1 03:07:37 2009
@@ -1,5 +1,5 @@
# Sources
-DIR_SOURCES := event.c event_target.c document_event.c event_exception.c \
+DIR_SOURCES := event.c event_target.c document_event.c \
custom_event.c keyboard_event.c mouse_wheel_event.c text_event.c \
event_listener.c mouse_event.c mutation_event.c ui_event.c \
mouse_multi_wheel_event.c mutation_name_event.c
Modified: branches/struggleyb/libdom-events/src/events/document_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/document_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/document_event.c Sat Aug 1 03:07:37 2009
@@ -1,0 +1,159 @@
+/*
+ * This file is part of libdom.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com>
+ */
+
+#include <assert.h>
+
+#include <libwapcaplet/libwapcaplet.h>
+
+#include "core/string.h"
+#include "events/document_event.h"
+
+#include "utils/utils.h"
+
+static const char *__event_types[] = {
+ "Event",
+ "CustomEvent",
+ "UIEvent",
+ "TextEvent",
+ "KeyboardEvent",
+ "MouseEvent",
+ "MouseMultiWheelEvent",
+ "MouseWheelEvent",
+ "MutationEvent",
+ "MutationNameEvent"
+};
+
+/**
+ * Initialise this DocumentEvent
+ *
+ * \param doc The document object
+ * \param dei The DocumentEvent internal object
+ * \param actions The default action fetcher, the browser should provide such
+ * a function to Event module.
+ */
+dom_exception _dom_document_event_internal_initialise(struct dom_document *doc,
+ dom_document_event_internal *dei, default_action actions)
+{
+ lwc_error err;
+ lwc_context *ctx = _dom_document_get_intern_context(doc);
+ int i = 0;
+
+ for (; i < DOM_EVENT_COUNT; i++) {
+ err = lwc_context_intern(ctx, __event_types[i], strlen(__event_types[i]),
+ &dei->event_types[i]);
+ if (err != lwc_error_ok)
+ return _dom_exception_from_lwc_error(err);
+ }
+
+ dei->actions = actions;
+
+ return DOM_NO_ERR;
+}
+
+/* Finalise this DocumentEvent */
+void _dom_document_event_internal_finalise(struct dom_document *doc,
+ dom_document_event_internal *dei)
+{
+ /* Nothing to do here */
+ return;
+}
+
+/*-------------------------------------------------------------------------*/
+/* Public API */
+
+/**
+ * Create an Event object
+ *
+ * \param de The DocumentEvent object
+ * \param type The Event type
+ * \param evt The returned Event object
+ */
+dom_exception dom_document_event_create_event(dom_document_event *de,
+ struct dom_string *type, struct dom_event **evt)
+{
+ lwc_context *ctx = NULL;
+ lwc_string *t = NULL;
+ dom_exception err;
+ struct dom_document *doc = de;
+
+ dom_string_get_intern(type, &ctx, &t);
+ if (t == NULL) {
+ ctx = _dom_document_get_intern_context(doc);
+ err = _dom_string_intern(type, ctx, &t);
+ if (err != DOM_NO_ERR)
+ return err;
+ }
+
+ assert (t != NULL);
+
+ int i, et;
+ dom_document_event_internal *dei = de->dei;
+ for (i = 0; i < DOM_EVENT_COUNT; i++) {
+ if (dei->event_types[i] == t) {
+ et = i;
+ break;
+ }
+ }
+ lwc_context_string_unref(ctx, t);
+
+ switch (et) {
+ case DOM_EVENT:
+ err = _dom_event_create(doc, evt);
+ break;
+ case DOM_CUSTOM_EVENT:
+ err = _dom_custom_event_create(doc, evt);
+ break;
+ case DOM_UI_EVENT:
+ err = _dom_ui_event_create(doc, evt);
+ break;
+ case DOM_TEXT_EVENT:
+ err = _dom_text_event_create(doc, evt);
+ break;
+ case DOM_KEYBOARD_EVENT:
+ err = _dom_keyboard_event_create(doc, evt);
+ break;
+ case DOM_MOUSE_EVENT:
+ err = _dom_mouse_event_create(doc, evt);
+ break;
+ case DOM_MOUSE_MULTI_WHEEL_EVENT:
+ err = _dom_mouse_multi_wheel_event_create(doc, evt);
+ break;
+ case DOM_MOUSE_WHEEL_EVENT:
+ err = _dom_mouse_wheel_event_create(doc, evt);
+ break;
+ case DOM_MUTATION_EVENT:
+ err = _dom_mutation_event_create(doc, evt);
+ break;
+ case DOM_MUTATION_NAME_EVENT:
+ err = _dom_mutation_name_event_create(doc, evt);
+ break;
+ default:
+ assert ("Should never be here" == NULL);
+ }
+
+ return err;
+}
+
+/**
+ * Tests if the implementation can generate events of a specified type
+ *
+ * \param de The DocumentEvent
+ * \param namespace The namespace of the event
+ * \param type The type of the event
+ * \param can True if we can generate such an event, false otherwise
+ */
+dom_exception dom_document_event_can_dispatch(dom_document_event *de,
+ struct dom_string *namespace, struct dom_string *type, bool *can)
+{
+ UNUSED(de);
+ UNUSED(namespace);
+ UNUSED(type);
+ UNUSED(can);
+
+ return DOM_NOT_SUPPORTED_ERR;
+}
+
Modified: branches/struggleyb/libdom-events/src/events/document_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/document_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/document_event.h Sat Aug 1 03:07:37 2009
@@ -1,0 +1,56 @@
+/*
+ * This file is part of libdom.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com>
+ */
+
+#ifndef dom_internal_events_document_event_h_
+#define dom_internal_events_document_event_h_
+
+#include <dom/events/document_event.h>
+
+struct dom_event_listener;
+struct lwc_string_s;
+struct dom_document;
+
+typedef struct dom_event_listener *(*default_action)(struct lwc_string_s *name,
+ struct lwc_string_s *type);
+
+typedef enum {
+ DOM_EVENT = 0,
+ DOM_CUSTOM_EVENT,
+ DOM_UI_EVENT,
+ DOM_TEXT_EVENT,
+ DOM_KEYBOARD_EVENT,
+ DOM_MOUSE_EVENT,
+ DOM_MOUSE_MULTI_WHEEL_EVENT,
+ DOM_MOUSE_WHEEL_EVENT,
+ DOM_MUTATION_EVENT,
+ DOM_MUTATION_NAME_EVENT,
+
+ DOM_EVENT_COUNT
+} dom_event_type;
+
+struct dom_document_event_internal {
+ default_action actions;
+ struct lwc_string_s *event_types[DOM_EVENT_COUNT];
+};
+
+typedef struct dom_document_event_internal dom_document_event_internal;
+
+/**
+ * Constructor and destructor: Since this object is not intended to be allocated
+ * alone, it should be embedded into the Document object, there is no constructor
+ * and destructor for it.
+ */
+
+/* Initialise this DocumentEvent */
+dom_exception _dom_document_event_internal_initialise(struct dom_document *doc,
+ dom_document_event_internal *dei, default_action actions);
+
+/* Finalise this DocumentEvent */
+void _dom_document_event_internal_finalise(struct dom_document *doc,
+ dom_document_event_internal *dei);
+
+#endif
Modified: branches/struggleyb/libdom-events/src/events/event_target.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/event_target.c (original)
+++ branches/struggleyb/libdom-events/src/events/event_target.c Sat Aug 1 03:07:37 2009
@@ -278,9 +278,34 @@
goto cleanup;
}
- /**
- * TODO: The default action here
- */
+ struct dom_document_event_internal *dei = &doc->dei;
+ if (dei->actions == NULL || evt->prevent_default == true)
+ goto cleanup;
+
+ /* The default action */
+ struct dom_string *nodename;
+ err = dom_node_get_node_name(et, &nodename);
+ if (err != DOM_NO_ERR) {
+ ret = err;
+ goto cleanup;
+ }
+ lwc_string *lnodename = NULL;
+ lwc_string *lctx = NULL;
+ err = dom_string_get_intern(nodename, lctx, lnodename);
+ if (err != DOM_NO_ERR) {
+ dom_string_unref(nodename);
+ ret = err;
+ goto cleanup;
+ }
+
+ dom_event_listener *da = dei->actions(lnodename, t)
+ if (da != NULL) {
+ da->handler(evt, da->pw);
+ }
+
+ dom_string_unref(nodename);
+ lwc_context_string_unref(lctx, lnodename);
+ lwc_context_unref(lctx);
cleanup:
if (event->prevent_default == true) {
13 years, 8 months
- 1
- 0
r8939 struggleyb - in /branches/struggleyb/libdom-events: include/dom/events/event.h src/events/event_target.c src/events/event_target.h
by netsurf＠semichrome.net
Author: struggleyb
Date: Sat Aug 1 02:02:12 2009
New Revision: 8939
URL: http://source.netsurf-browser.org?rev=8939&view=rev
Log:
Add dispatchEvent.
Modified:
branches/struggleyb/libdom-events/include/dom/events/event.h
branches/struggleyb/libdom-events/src/events/event_target.c
branches/struggleyb/libdom-events/src/events/event_target.h
Modified: branches/struggleyb/libdom-events/include/dom/events/event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/event.h Sat Aug 1 02:02:12 2009
@@ -12,9 +12,9 @@
struct event_target;
typedef enum {
- CAPTURING_PHASE = 1,
- AT_TARGET = 2,
- BUBBLING_PHASE = 3
+ DOM_CAPTURING_PHASE = 1,
+ DOM_AT_TARGET = 2,
+ DOM_BUBBLING_PHASE = 3
} dom_event_flow_phase;
typedef struct dom_event dom_event;
Modified: branches/struggleyb/libdom-events/src/events/event_target.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/event_target.c (original)
+++ branches/struggleyb/libdom-events/src/events/event_target.c Sat Aug 1 02:02:12 2009
@@ -16,6 +16,11 @@
/* The number of chains in the hash table used for hash event types */
#define CHAINS 11
+
+typedef struct dom_event_target_entry {
+ list_entry entry; /**< The list entry */
+ struct dom_event_target *et; /**< The node */
+} dom_event_target_entry;
/* Hash key/value functions */
static void *_key(void *key, void *key_pw, dom_alloc alloc, void *pw,
@@ -189,6 +194,107 @@
dom_exception dom_event_target_dispatch_event(dom_event_target *et,
struct dom_event *evt, bool *success)
{
+ struct listener_entry *le = NULL;
+ struct dom_document *doc = dom_node_get_owner(et);
+ assert (doc != NULL);
+ struct dom_event_target_internal *eti = NULL;
+ lwc_string *t = evt->type;
+ lwc_context *ctx = NULL;
+ dom_exception err, ret = DOM_NO_ERR;
+ dom_event_target_entry list;
+ dom_event_target *target = et;
+
+ ctx = dom_document_get_intern_context(doc);
+ assert (t != NULL);
+
+ *success = true;
+
+ /* Compose the event target list */
+ list_init(&list->entry);
+ list.et = et;
+ dom_node_ref(et);
+ et = et->parent;
+
+ while (et != NULL) {
+ dom_event_target_entry *l = (dom_event_target_entry *) dom_document_alloc(
+ doc, NULL, sizeof(dom_event_target_entry));
+ if (l == NULL) {
+ ret = DOM_NO_MEM_ERR;
+ goto cleanup;
+ }
+ list_append(&list.entry, &l->entry);
+ l->et = et;
+ dom_node_ref(et);
+ et = et->parent;
+ }
+
+ /* Fill the target of the event */
+ evt->target = target;
+ evt->phase = DOM_CAPTURING_PHASE;
+
+ /* The capture phase */
+ list_entry *e = list.entry.prev;
+ for (; e != &list.entry; e = e->prev) {
+ dom_event_target_entry *l = (dom_event_target_entry *) e;
+ err = _dom_event_target_dispatch(l->et, evt, DOM_CAPTURING_PHASE,
+ success);
+ if (err != DOM_NO_ERR) {
+ ret = err;
+ goto cleanup;
+ }
+ /**
+ * If the stopImmediatePropagation or stopPropagation is called, we
+ * should break
+ */
+ if (event->stop_now == true || event->stop == true)
+ goto cleanup;
+ }
+
+ /* Target phase */
+ evt->phase = DOM_AT_TARGET;
+ evt->current = target;
+ err = _dom_event_target_dispatch(target, evt, DOM_AT_TARGET,
+ success);
+ if (event->stop_now == true || event->stop == true)
+ goto cleanup;
+
+ /* Bubbling phase */
+ evt->phase = DOM_BUBBLING_PHASE;
+
+ e = list.entry.next;
+ for (; e != &list.entry; e = e->next) {
+ dom_event_target_entry *l = (dom_event_target_entry *) e;
+ err = _dom_event_target_dispatch(l->et, evt, DOM_BUBBLING_PHASE,
+ success);
+ if (err != DOM_NO_ERR) {
+ ret = err;
+ goto cleanup;
+ }
+ /**
+ * If the stopImmediatePropagation or stopPropagation is called, we
+ * should break
+ */
+ if (event->stop_now == true || event->stop == true)
+ goto cleanup;
+ }
+
+ /**
+ * TODO: The default action here
+ */
+
+cleanup:
+ if (event->prevent_default == true) {
+ *success = false;
+ }
+
+ while (list.entry.next != &list->entry) {
+ list_del(list.entry.next);
+ dom_event_target_entry *e = (dom_event_target_entry *) list.entry.next;
+ dom_node_unref(e->et);
+ dom_document_alloc(doc, e, sizeof(dom_event_target_entry));
+ }
+
+ return ret;
}
/**
@@ -296,3 +402,48 @@
return lwc_string_hash_value(lstr);
}
+/*-------------------------------------------------------------------------*/
+
+/**
+ * Dispatches an event on certain EventTarget
+ *
+ * \param et The EventTarget object
+ * \param evt The event object
+ * \param success Indicates whether any of the listeners which handled the
+ * event called Event.preventDefault(). If Event.preventDefault()
+ * was called the returned value is false, else it is true.
+ */
+dom_exception _dom_event_target_dispatch(dom_event_target *et,
+ struct dom_event *evt, dom_event_flow_phase phase, bool *success)
+{
+ struct dom_event_target_internal *eti = et->eti;
+ lwc_string *t = evt->type;
+
+ list_entry *item = (list_entry *) _dom_hash_get(eti->listeners, t);
+ if (item == NULL) {
+ /* There is no such event listener */
+ return DOM_NO_ERR;
+ } else {
+ /* Call the handler for each listener */
+ list_entry *i = item;
+ /* Fill the Event fields */
+ evt->current = et;
+ do {
+ le = (struct listener_entry *) i;
+ assert (le->listener->handler != NULL);
+ if ((le->capture == true && phase = DOM_CAPTURING_PHASE) ||
+ (le->capture == false && phase = DOM_BUBBLING_PHASE) ||
+ (evt->target == evt->current && phase = DOM_AT_TARGET)) {
+ /* We found the listener */
+ le->listener->handler(event, pw);
+ /* If the handler call stopImmediatedPropagation,
+ * we should break */
+ if (event->stop_now == true)
+ break;
+ }
+ i = i->next;
+ } while(i != item);
+ }
+
+ return DOM_NO_ERR;
+}
Modified: branches/struggleyb/libdom-events/src/events/event_target.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/event_target.h (original)
+++ branches/struggleyb/libdom-events/src/events/event_target.h Sat Aug 1 02:02:12 2009
@@ -47,4 +47,8 @@
void _dom_event_target_internal_finalise(struct dom_document *doc,
dom_event_target_internal *eti);
+/* Disptach the event on this node */
+dom_exception _dom_event_target_dispatch(dom_event_target *et,
+ struct dom_event *evt, dom_event_flow_phase phase, bool *success);
+
#endif
13 years, 8 months
- 1
- 0
r8938 struggleyb - in /branches/struggleyb/libdom-events: include/dom/events/ src/events/
by netsurf＠semichrome.net
Author: struggleyb
Date: Fri Jul 31 22:17:25 2009
New Revision: 8938
URL: http://source.netsurf-browser.org?rev=8938&view=rev
Log:
Code style fixing.
Modified:
branches/struggleyb/libdom-events/include/dom/events/custom_event.h
branches/struggleyb/libdom-events/include/dom/events/document_event.h
branches/struggleyb/libdom-events/include/dom/events/event.h
branches/struggleyb/libdom-events/include/dom/events/event_target.h
branches/struggleyb/libdom-events/include/dom/events/keyboard_event.h
branches/struggleyb/libdom-events/include/dom/events/mouse_event.h
branches/struggleyb/libdom-events/include/dom/events/mouse_multi_wheel_event.h
branches/struggleyb/libdom-events/include/dom/events/mouse_wheel_event.h
branches/struggleyb/libdom-events/include/dom/events/mutation_event.h
branches/struggleyb/libdom-events/include/dom/events/mutation_name_event.h
branches/struggleyb/libdom-events/include/dom/events/text_event.h
branches/struggleyb/libdom-events/include/dom/events/ui_event.h
branches/struggleyb/libdom-events/src/events/custom_event.c
branches/struggleyb/libdom-events/src/events/custom_event.h
branches/struggleyb/libdom-events/src/events/event.c
branches/struggleyb/libdom-events/src/events/event.h
branches/struggleyb/libdom-events/src/events/event_target.c
branches/struggleyb/libdom-events/src/events/event_target.h
branches/struggleyb/libdom-events/src/events/keyboard_event.c
branches/struggleyb/libdom-events/src/events/keyboard_event.h
branches/struggleyb/libdom-events/src/events/mouse_event.c
branches/struggleyb/libdom-events/src/events/mouse_event.h
branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.c
branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.h
branches/struggleyb/libdom-events/src/events/mouse_wheel_event.c
branches/struggleyb/libdom-events/src/events/mouse_wheel_event.h
branches/struggleyb/libdom-events/src/events/mutation_event.c
branches/struggleyb/libdom-events/src/events/mutation_event.h
branches/struggleyb/libdom-events/src/events/mutation_name_event.c
branches/struggleyb/libdom-events/src/events/mutation_name_event.h
branches/struggleyb/libdom-events/src/events/text_event.c
branches/struggleyb/libdom-events/src/events/text_event.h
branches/struggleyb/libdom-events/src/events/ui_event.c
branches/struggleyb/libdom-events/src/events/ui_event.h
Modified: branches/struggleyb/libdom-events/include/dom/events/custom_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/custom_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/custom_event.h Fri Jul 31 22:17:25 2009
@@ -12,15 +12,15 @@
typedef struct dom_custom_event dom_custom_event;
-dom_exception _dom_custom_event_get_detail(dom_custom_event *evt, void **detail);
+dom_exception dom_custom_event_get_detail(dom_custom_event *evt, void **detail);
#define dom_custom_event_get_detail(e, d) \
- _dom_custom_event_get_detail((dom_custom_event *) (e), (void **) (d))
+ dom_custom_event_get_detail((dom_custom_event *) (e), (void **) (d))
-dom_exception _dom_custom_event_init_ns(dom_custom_event *evt,
+dom_exception dom_custom_event_init_ns(dom_custom_event *evt,
struct dom_string *namespace, struct dom_string *type,
bool bubble, bool cancelable, void *detail);
#define dom_custom_event_init_ns(e, n, t, b, c, d) \
- _dom_custom_event_init_ns((dom_custom_event *) (e), \
+ dom_custom_event_init_ns((dom_custom_event *) (e), \
(struct dom_string *) (n), (struct dom_string *) (t), \
(bool) (b), (bool) (c), (void *) (d))
Modified: branches/struggleyb/libdom-events/include/dom/events/document_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/document_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/document_event.h Fri Jul 31 22:17:25 2009
@@ -13,16 +13,16 @@
struct dom_string;
struct dom_event;
-dom_exception _dom_document_event_create_event(dom_document_event *de,
+dom_exception dom_document_event_create_event(dom_document_event *de,
struct dom_string *type, struct dom_event **evt);
#define dom_document_event_create_event(d, t, e) \
- _dom_document_event_create_event((dom_document_event *) (d), \
+ dom_document_event_create_event((dom_document_event *) (d), \
(struct dom_string *) (t), (struct dom_event **) (e))
-dom_exception _dom_document_event_can_dispatch(dom_document_event *de,
+dom_exception dom_document_event_can_dispatch(dom_document_event *de,
struct dom_string *namespace, struct dom_string *type);
#define dom_document_event_can_dispatch(d, n, t) \
- _dom_document_event_can_dispatch((dom_document_event *) (d), \
+ dom_document_event_can_dispatch((dom_document_event *) (d), \
(struct dom_string *) (n), (struct dom_string *) (t))
#endif
Modified: branches/struggleyb/libdom-events/include/dom/events/event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/event.h Fri Jul 31 22:17:25 2009
@@ -19,60 +19,60 @@
typedef struct dom_event dom_event;
-dom_exception _dom_event_get_type(dom_event *evt, struct dom_string **type);
-#define dom_event_get_type(e, t) _dom_event_get_type((dom_event *) (e), \
+dom_exception dom_event_get_type(dom_event *evt, struct dom_string **type);
+#define dom_event_get_type(e, t) dom_event_get_type((dom_event *) (e), \
(struct dom_string **) (t))
-dom_exception _dom_event_get_target(dom_event *evt, struct event_target **target);
-#define dom_event_get_target(e, t) _dom_event_get_target((dom_event *) (e), \
+dom_exception dom_event_get_target(dom_event *evt, struct event_target **target);
+#define dom_event_get_target(e, t) dom_event_get_target((dom_event *) (e), \
(struct event_target **) (t))
-dom_exception _dom_event_get_current_target(dom_event *evt, struct event_target **current);
-#define dom_event_get_current_target(e, c) _dom_event_get_current_target((dom_event *) (e), \
+dom_exception dom_event_get_current_target(dom_event *evt, struct event_target **current);
+#define dom_event_get_current_target(e, c) dom_event_get_current_target((dom_event *) (e), \
(struct event_target **) (c))
-dom_exception _dom_event_get_bubbles(dom_event *evt, bool *bubbles);
-#define dom_event_get_bubbles(e, b) _dom_event_get_bubbles((dom_event *) (e), \
+dom_exception dom_event_get_bubbles(dom_event *evt, bool *bubbles);
+#define dom_event_get_bubbles(e, b) dom_event_get_bubbles((dom_event *) (e), \
(bool *) (b))
-dom_exception _dom_event_get_cancelable(dom_event *evt, bool *cancelable);
-#define dom_event_get_cancelable(e, c) _dom_event_get_cancelable((dom_event *) (e), \
+dom_exception dom_event_get_cancelable(dom_event *evt, bool *cancelable);
+#define dom_event_get_cancelable(e, c) dom_event_get_cancelable((dom_event *) (e), \
(bool *) (c))
-dom_exception _dom_event_get_timestamp(dom_event *evt, unsigned int *timestamp);
-#define dom_event_get_timestamp(e, t) _dom_event_get_timestamp((dom_event *) (e), \
+dom_exception dom_event_get_timestamp(dom_event *evt, unsigned int *timestamp);
+#define dom_event_get_timestamp(e, t) dom_event_get_timestamp((dom_event *) (e), \
(unsigned int *) (t))
-dom_exception _dom_event_stop_propagation(dom_event *evt);
-#define dom_event_stop_propagation(e) _dom_event_stop_propagation((dom_event *) (e))
+dom_exception dom_event_stop_propagation(dom_event *evt);
+#define dom_event_stop_propagation(e) dom_event_stop_propagation((dom_event *) (e))
-dom_exception _dom_event_prevent_default(dom_event *evt);
-#define dom_event_prevent_default(e) _dom_event_prevent_default((dom_event *) (e))
+dom_exception dom_event_prevent_default(dom_event *evt);
+#define dom_event_prevent_default(e) dom_event_prevent_default((dom_event *) (e))
-dom_exception _dom_event_init(dom_event *evt, struct dom_string *type,
+dom_exception dom_event_init(dom_event *evt, struct dom_string *type,
bool bubble, bool cancelable);
-#define dom_event_init(e, t, b, c) _dom_event_init((dom_event *) (e), \
+#define dom_event_init(e, t, b, c) dom_event_init((dom_event *) (e), \
(struct dom_string *) (t), (bool) (b), (bool) (c))
-dom_exception _dom_event_get_namespace(dom_event *evt, struct dom_string **namespace);
-#define dom_event_get_namespace(e, n) _dom_event_get_namespace((dom_event *) (e), \
+dom_exception dom_event_get_namespace(dom_event *evt, struct dom_string **namespace);
+#define dom_event_get_namespace(e, n) dom_event_get_namespace((dom_event *) (e), \
(struct dom_string **) (n))
-dom_exception _dom_event_is_custom(dom_event *evt, bool *custom);
-#define dom_event_is_custom(e, c) _dom_event_is_custom((dom_event *) (e), \
+dom_exception dom_event_is_custom(dom_event *evt, bool *custom);
+#define dom_event_is_custom(e, c) dom_event_is_custom((dom_event *) (e), \
(bool *) (c))
-dom_exception _dom_event_stop_immediate_propagation(dom_event *evt);
+dom_exception dom_event_stop_immediate_propagation(dom_event *evt);
#define dom_event_stop_immediate_propagation(e) \
- _dom_event_stop_immediate_propagation((dom_event *) (e))
+ dom_event_stop_immediate_propagation((dom_event *) (e))
-dom_exception _dom_event_is_default_prevented(dom_event *evt);
+dom_exception dom_event_is_default_prevented(dom_event *evt);
#define dom_event_is_default_prevented(e) \
- _dom_event_is_default_prevented((dom_event *) (e))
+ dom_event_is_default_prevented((dom_event *) (e))
-dom_exception _dom_event_init_ns(dom_event *evt, struct dom_string *namespace,
+dom_exception dom_event_init_ns(dom_event *evt, struct dom_string *namespace,
struct dom_string *type, bool bubble, bool cancelable);
-#define dom_event_init_ns(e, n, t, b, c) _dom_event_init_ns( \
+#define dom_event_init_ns(e, n, t, b, c) dom_event_init_ns( \
(dom_event *) (e), (struct dom_string *) (n), (struct dom_string *) (t), \
(bool) (b), (bool) (c))
Modified: branches/struggleyb/libdom-events/include/dom/events/event_target.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/event_target.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/event_target.h Fri Jul 31 22:17:25 2009
@@ -14,41 +14,41 @@
struct dom_event_listener;
struct dom_event;
-dom_exception _dom_event_target_add_event_listener(dom_event_target *et,
+dom_exception dom_event_target_add_event_listener(dom_event_target *et,
struct dom_string *type, struct dom_event_listener *listener,
bool capture);
#define dom_event_target_add_event_listener(et, t, l, c) \
- _dom_event_target_add_event_listener((dom_event_target *) (et),\
+ dom_event_target_add_event_listener((dom_event_target *) (et),\
(struct dom_string *) (t), (struct dom_event_listener *) (l), \
(bool) (c))
-dom_exception _dom_event_target_remove_event_listener(dom_event_target *et,
+dom_exception dom_event_target_remove_event_listener(dom_event_target *et,
struct dom_string *type, struct dom_event_listener *listener,
bool capture);
#define dom_event_target_remove_event_listener(et, t, l, c) \
- _dom_event_target_remove_event_listener((dom_event_target *) (et),\
+ dom_event_target_remove_event_listener((dom_event_target *) (et),\
(struct dom_string *) (t), (struct dom_event_listener *) (l), \
(bool) (c))
-dom_exception _dom_event_target_dispatch_event(dom_event_target *et,
+dom_exception dom_event_target_dispatch_event(dom_event_target *et,
struct dom_event *evt, bool *success);
#define dom_event_target_dispatch_event(et, e, s) \
- _dom_event_target_dispatch_event((dom_event_target *) (et),\
+ dom_event_target_dispatch_event((dom_event_target *) (et),\
(struct dom_event *) (e), (bool *) (s))
-dom_exception _dom_event_target_add_event_listener_ns(dom_event_target *et,
+dom_exception dom_event_target_add_event_listener_ns(dom_event_target *et,
struct dom_string *namespace, struct dom_string *type,
struct dom_event_listener_ns *listener, bool capture);
#define dom_event_target_add_event_listener_ns(et, n, t, l, c) \
- _dom_event_target_add_event_listener_ns((dom_event_target *) (et),\
+ dom_event_target_add_event_listener_ns((dom_event_target *) (et),\
(struct dom_string *) (n), (struct dom_string *) (t), \
(struct dom_event_listener_ns *) (l), (bool) (c))
-dom_exception _dom_event_target_remove_event_listener_ns(dom_event_target *et,
+dom_exception dom_event_target_remove_event_listener_ns(dom_event_target *et,
struct dom_string *namespace, struct dom_string *type,
struct dom_event_listener_ns *listener, bool capture);
#define dom_event_target_remove_event_listener_ns(et, n, t, l, c) \
- _dom_event_target_remove_event_listener_ns((dom_event_target *) (et),\
+ dom_event_target_remove_event_listener_ns((dom_event_target *) (et),\
(struct dom_string *) (n), (struct dom_string *) (t), \
(struct dom_event_listener_ns *) (l), (bool) (c))
Modified: branches/struggleyb/libdom-events/include/dom/events/keyboard_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/keyboard_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/keyboard_event.h Fri Jul 31 22:17:25 2009
@@ -20,59 +20,59 @@
DOM_KEY_LOCATION_NUMPAD = 3
} dom_key_location;
-dom_exception _dom_keyboard_event_get_key_identifier(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_key_identifier(dom_keyboard_event *evt,
struct dom_string **ident);
#define dom_keyboard_event_get_key_identifier(e, i) \
- _dom_keyboard_event_get_key_identifier((dom_keyboard_event *) (e), \
+ dom_keyboard_event_get_key_identifier((dom_keyboard_event *) (e), \
(struct dom_string **) (i))
-dom_exception _dom_keyboard_event_get_key_location(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_key_location(dom_keyboard_event *evt,
dom_key_location *loc);
#define dom_keyboard_event_get_key_location(e, l) \
- _dom_keyboard_event_get_key_location((dom_keyboard_event *) (e), \
+ dom_keyboard_event_get_key_location((dom_keyboard_event *) (e), \
(dom_key_location *) (l))
-dom_exception _dom_keyboard_event_get_ctrl_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_ctrl_key(dom_keyboard_event *evt,
bool *key);
-#define dom_keyboard_event_get_ctrl_key(e, k) _dom_keyboard_event_get_ctrl_key( \
+#define dom_keyboard_event_get_ctrl_key(e, k) dom_keyboard_event_get_ctrl_key( \
(dom_keyboard_event *) (e), (bool *) (k))
-dom_exception _dom_keyboard_event_get_shift_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_shift_key(dom_keyboard_event *evt,
bool *key);
-#define dom_keyboard_event_get_shift_key(e, k) _dom_keyboard_event_get_shift_key( \
+#define dom_keyboard_event_get_shift_key(e, k) dom_keyboard_event_get_shift_key( \
(dom_keyboard_event *) (e), (bool *) (k))
-dom_exception _dom_keyboard_event_get_alt_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_alt_key(dom_keyboard_event *evt,
bool *key);
-#define dom_keyboard_event_get_alt_key(e, k) _dom_keyboard_event_get_alt_key( \
+#define dom_keyboard_event_get_alt_key(e, k) dom_keyboard_event_get_alt_key( \
(dom_keyboard_event *) (e), (bool *) (k))
-dom_exception _dom_keyboard_event_get_meta_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_meta_key(dom_keyboard_event *evt,
bool *key);
-#define dom_keyboard_event_get_meta_key(e, k) _dom_keyboard_event_get_meta_key( \
+#define dom_keyboard_event_get_meta_key(e, k) dom_keyboard_event_get_meta_key( \
(dom_keyboard_event *) (e), (bool *) (k))
-dom_exception _dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt,
struct dom_string *m, bool *state);
#define dom_keyboard_event_get_modifier_state(e, m, s) \
- _dom_keyboard_event_get_modifier_state((dom_keyboard_event *) (e), \
+ dom_keyboard_event_get_modifier_state((dom_keyboard_event *) (e), \
(struct dom_string *) (m), (bool *) (s))
-dom_exception _dom_keyboard_event_init(dom_keyboard_event *evt,
+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);
#define dom_keyboard_event_init(e, t, b, c, v, ki, kl, m) \
- _dom_keyboard_event_init((dom_keyboard_event *) (e), (struct dom_string *) (t), \
+ dom_keyboard_event_init((dom_keyboard_event *) (e), (struct dom_string *) (t), \
(bool) (b), (bool) (c), (struct dom_abstract_view *) (v), \
(struct dom_string *) (ki), (dom_key_location) (kl), (struct dom_string *) (m))
-dom_exception _dom_keyboard_event_init_ns(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_init_ns(dom_keyboard_event *evt,
struct dom_string *namespace, 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);
#define dom_keyboard_event_init_ns(e, n, t, b, c, v, ki, kl, m) \
- _dom_keyboard_event_init_ns((dom_keyboard_event *) (e), (struct dom_string *) (n), \
+ dom_keyboard_event_init_ns((dom_keyboard_event *) (e), (struct dom_string *) (n), \
(struct dom_string *) (t), (bool) (b), (bool) (c), (struct dom_abstract_view *) (v), \
(struct dom_string *) (ki), (dom_key_location) (kl), (struct dom_string *) (m))
Modified: branches/struggleyb/libdom-events/include/dom/events/mouse_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/mouse_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/mouse_event.h Fri Jul 31 22:17:25 2009
@@ -14,84 +14,84 @@
typedef struct dom_mouse_event dom_mouse_event;
-dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_screen_x(dom_mouse_event *evt,
long *x);
-#define dom_mouse_event_get_screen_x(e, x) _dom_mouse_event_get_screen_x(\
+#define dom_mouse_event_get_screen_x(e, x) dom_mouse_event_get_screen_x(\
(dom_mouse_event *) (e), (long *) (x))
-dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_screen_y(dom_mouse_event *evt,
long *y);
-#define dom_mouse_event_get_screen_y(e, y) _dom_mouse_event_get_screen_y(\
+#define dom_mouse_event_get_screen_y(e, y) dom_mouse_event_get_screen_y(\
(dom_mouse_event *) (e), (long *) (y))
-dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_client_x(dom_mouse_event *evt,
long *x);
-#define dom_mouse_event_get_client_x(e, x) _dom_mouse_event_get_client_x(\
+#define dom_mouse_event_get_client_x(e, x) dom_mouse_event_get_client_x(\
(dom_mouse_event *) (e), (long *) (x))
-dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_client_y(dom_mouse_event *evt,
long *y);
-#define dom_mouse_event_get_client_y(e, y) _dom_mouse_event_get_client_y(\
+#define dom_mouse_event_get_client_y(e, y) dom_mouse_event_get_client_y(\
(dom_mouse_event *) (e), (long *) (y))
-dom_exception _dom_mouse_event_get_ctrl_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_ctrl_key(dom_mouse_event *evt,
bool *key);
-#define dom_mouse_event_get_ctrl_key(e, k) _dom_mouse_event_get_ctrl_key( \
+#define dom_mouse_event_get_ctrl_key(e, k) dom_mouse_event_get_ctrl_key( \
(dom_mouse_event *) (e), (bool *) (k))
-dom_exception _dom_mouse_event_get_shift_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_shift_key(dom_mouse_event *evt,
bool *key);
-#define dom_mouse_event_get_shift_key(e, k) _dom_mouse_event_get_shift_key( \
+#define dom_mouse_event_get_shift_key(e, k) dom_mouse_event_get_shift_key( \
(dom_mouse_event *) (e), (bool *) (k))
-dom_exception _dom_mouse_event_get_alt_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_alt_key(dom_mouse_event *evt,
bool *key);
-#define dom_mouse_event_get_alt_key(e, k) _dom_mouse_event_get_alt_key( \
+#define dom_mouse_event_get_alt_key(e, k) dom_mouse_event_get_alt_key( \
(dom_mouse_event *) (e), (bool *) (k))
-dom_exception _dom_mouse_event_get_meta_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_meta_key(dom_mouse_event *evt,
bool *key);
-#define dom_mouse_event_get_meta_key(e, k) _dom_mouse_event_get_meta_key( \
+#define dom_mouse_event_get_meta_key(e, k) dom_mouse_event_get_meta_key( \
(dom_mouse_event *) (e), (bool *) (k))
-dom_exception _dom_mouse_event_get_button(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_button(dom_mouse_event *evt,
unsigned short *button);
-#define dom_mouse_event_get_button(e, b) _dom_mouse_event_get_button(\
+#define dom_mouse_event_get_button(e, b) dom_mouse_event_get_button(\
(dom_mouse_event *) (e), (unsigned short *) (b))
-dom_exception _dom_mouse_event_get_related_target(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_related_target(dom_mouse_event *evt,
struct event_target **et);
#define dom_mouse_event_get_related_target(e, t) \
- _dom_mouse_event_get_related_target((dom_mouse_event *) (e),\
+ dom_mouse_event_get_related_target((dom_mouse_event *) (e),\
(struct event_target **) (t))
-dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_modifier_state(dom_mouse_event *evt,
struct dom_string *m, bool *state);
#define dom_mouse_event_get_modifier_state(e, m, s) \
- _dom_mouse_event_get_modifier_state((dom_mouse_event *) (e), \
+ dom_mouse_event_get_modifier_state((dom_mouse_event *) (e), \
(struct dom_string *) (m), (bool *) (s))
-dom_exception _dom_mouse_event_init(dom_mouse_event *evt,
+dom_exception dom_mouse_event_init(dom_mouse_event *evt,
struct 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, struct event_target *et);
#define dom_mouse_event_init(e, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt, \
shift, meta, button, et) \
- _dom_mouse_event_init((dom_mouse_event *) (e), (struct dom_string *) (t), \
+ dom_mouse_event_init((dom_mouse_event *) (e), (struct dom_string *) (t), \
(bool) (b), (bool) (c), (struct dom_abstract_view *) (v), \
(long) (d), (long) (sx), (long) (sy), (long) (cx), (long) (cy), (bool) (ctrl),\
(bool) (alt), (bool) (shift), (bool) (meta), (unsigned short) (button),\
(struct event_target *) (et))
-dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, struct dom_string *namespace,
+dom_exception dom_mouse_event_init_ns(dom_mouse_event *evt, struct dom_string *namespace,
struct 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, struct event_target *et);
#define dom_mouse_event_init_ns(e, n, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt, \
shift, meta, button, et) \
- _dom_mouse_event_init_ns((dom_mouse_event *) (e), (struct dom_string *) (n), \
+ dom_mouse_event_init_ns((dom_mouse_event *) (e), (struct dom_string *) (n), \
(struct dom_string *) (t), (bool) (b), (bool) (c), (struct dom_abstract_view *) (v), \
(long) (d), (long) (sx), (long) (sy), (long) (cx), (long) (cy), (bool) (ctrl),\
(bool) (alt), (bool) (shift), (bool) (meta), (unsigned short) (button),\
Modified: branches/struggleyb/libdom-events/include/dom/events/mouse_multi_wheel_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/mouse_multi_wheel_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/mouse_multi_wheel_event.h Fri Jul 31 22:17:25 2009
@@ -14,22 +14,22 @@
typedef struct dom_mouse_multi_wheel_event dom_mouse_multi_wheel_event;
-dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x(
+dom_exception dom_mouse_multi_wheel_event_get_wheel_delta_x(
dom_mouse_multi_wheel_event *evt, long *x);
#define dom_mouse_multi_wheel_event_get_wheel_delta_x(e, x) \
- _dom_mouse_multi_wheel_event_get_wheel_delta_x( \
+ dom_mouse_multi_wheel_event_get_wheel_delta_x( \
(dom_mouse_multi_wheel_event *) (e), (long *) (x))
-dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y(
+dom_exception dom_mouse_multi_wheel_event_get_wheel_delta_y(
dom_mouse_multi_wheel_event *evt, long *y);
#define dom_mouse_multi_wheel_event_get_wheel_delta_y(e, y) \
- _dom_mouse_multi_wheel_event_get_wheel_delta_y( \
+ dom_mouse_multi_wheel_event_get_wheel_delta_y( \
(dom_mouse_multi_wheel_event *) (e), (long *) (y))
-dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z(
+dom_exception dom_mouse_multi_wheel_event_get_wheel_delta_z(
dom_mouse_multi_wheel_event *evt, long *z);
#define dom_mouse_multi_wheel_event_get_wheel_delta_z(e, z) \
- _dom_mouse_multi_wheel_event_get_wheel_delta_z( \
+ dom_mouse_multi_wheel_event_get_wheel_delta_z( \
(dom_mouse_multi_wheel_event *) (e), (long *) (z))
dom_exception _dom_mouse_multi_wheel_event_init_ns(
Modified: branches/struggleyb/libdom-events/include/dom/events/mouse_wheel_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/mouse_wheel_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/mouse_wheel_event.h Fri Jul 31 22:17:25 2009
@@ -13,13 +13,13 @@
typedef struct dom_mouse_wheel_event dom_mouse_wheel_event;
-dom_exception _dom_mouse_wheel_event_get_wheel_delta(
+dom_exception dom_mouse_wheel_event_get_wheel_delta(
dom_mouse_wheel_event *evt, long *d);
#define dom_mouse_wheel_event_get_wheel_delta(e, d) \
- _dom_mouse_wheel_event_get_wheel_delta( \
+ dom_mouse_wheel_event_get_wheel_delta( \
(dom_mouse_wheel_event *) (e), (long *) (d))
-dom_exception _dom_mouse_wheel_event_init_ns(
+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,
struct dom_abstract_view *view, long detail, long screen_x,
@@ -28,7 +28,7 @@
long wheel_delta);
#define dom_mouse_wheel_event_init_ns(e, n, t, b, c, v, \
d, sx, sy, cx, cy, button, et, ml, d) \
- _dom_mouse_wheel_event_init_ns((dom_mouse_wheel_event *) (e), \
+ dom_mouse_wheel_event_init_ns((dom_mouse_wheel_event *) (e), \
(struct dom_string *) (n), (struct dom_string *) (t), (bool) (b),\
(bool) (c), (struct dom_abstract_view *) (v), (long) (d), (long) (sx), \
(long) (sy), (long) (cx), (long) (cy), (unsigned short) (button), \
Modified: branches/struggleyb/libdom-events/include/dom/events/mutation_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/mutation_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/mutation_event.h Fri Jul 31 22:17:25 2009
@@ -19,51 +19,51 @@
typedef struct dom_mutation_event dom_mutation_event;
-dom_exception _dom_mutation_event_get_related_node(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_related_node(dom_mutation_event *evt,
struct dom_node **node);
#define dom_mutation_event_get_related_node(e, n) \
- _dom_mutation_event_get_related_node((dom_mutation_event *) (e), \
+ dom_mutation_event_get_related_node((dom_mutation_event *) (e), \
(struct dom_node **) (n))
-dom_exception _dom_mutation_event_get_prev_value(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_prev_value(dom_mutation_event *evt,
struct dom_string **ret);
#define dom_mutation_event_get_prev_value(e, r) \
- _dom_mutation_event_get_prev_value((dom_mutation_event *) (e), \
+ dom_mutation_event_get_prev_value((dom_mutation_event *) (e), \
(struct dom_string **) (r))
-dom_exception _dom_mutation_event_get_new_value(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_new_value(dom_mutation_event *evt,
struct dom_string **ret);
#define dom_mutation_event_get_new_value(e, r) \
- _dom_mutation_event_get_new_value((dom_mutation_event *) (e), \
+ dom_mutation_event_get_new_value((dom_mutation_event *) (e), \
(struct dom_string **) (r))
-dom_exception _dom_mutation_event_get_attr_name(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_attr_name(dom_mutation_event *evt,
struct dom_string **ret);
#define dom_mutation_event_get_attr_name(e, r) \
- _dom_mutation_event_get_attr_name((dom_mutation_event *) (e), \
+ dom_mutation_event_get_attr_name((dom_mutation_event *) (e), \
(struct dom_string **) (r))
-dom_exception _dom_mutation_event_get_attr_change(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_attr_change(dom_mutation_event *evt,
dom_attr_change_type *type);
#define dom_mutation_event_get_attr_change(e, t) \
- _dom_mutation_event_get_attr_change((dom_mutation_event *) (e), \
+ dom_mutation_event_get_attr_change((dom_mutation_event *) (e), \
(dom_attr_change_type *) (t))
-dom_exception _dom_mutation_event_init(dom_mutation_event *evt,
+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_attr_change_type change);
#define dom_mutation_event_init(e, t, b, c, n, p, nv, a, ch) \
- _dom_mutation_event_init((dom_mutation_event *) (e), (struct dom_string *) (t), \
+ dom_mutation_event_init((dom_mutation_event *) (e), (struct dom_string *) (t), \
(bool) (b), (bool) (c), (struct dom_node *) (n), (struct dom_string *) (p), \
(struct dom_string *) (nv), (struct dom_string *) (a), (dom_attr_change_type) (ch))
-dom_exception _dom_mutation_event_init_ns(dom_mutation_event *evt, struct dom_string *namespace,
+dom_exception dom_mutation_event_init_ns(dom_mutation_event *evt, struct dom_string *namespace,
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_attr_change_type change);
#define dom_mutation_event_init_ns(e, n, t, b, c, n, p, nv, a, ch) \
- _dom_mutation_event_init_ns((dom_mutation_event *) (e), (struct dom_string *) (n), \
+ dom_mutation_event_init_ns((dom_mutation_event *) (e), (struct dom_string *) (n), \
(struct dom_string *) (t), (bool) (b), (bool) (c), (struct dom_node *) (n), \
(struct dom_string *) (p), (struct dom_string *) (nv), (struct dom_string *) (a),\
(dom_attr_change_type) (ch))
Modified: branches/struggleyb/libdom-events/include/dom/events/mutation_name_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/mutation_name_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/mutation_name_event.h Fri Jul 31 22:17:25 2009
@@ -13,32 +13,32 @@
typedef struct dom_mutation_name_event dom_mutation_name_event;
-dom_exception _dom_mutation_name_event_get_prev_namespace(
+dom_exception dom_mutation_name_event_get_prev_namespace(
dom_mutation_name_event *evt, struct dom_string **namespace);
#define dom_mutation_name_event_get_prev_namespace(e, n) \
- _dom_mutation_name_event_get_prev_namespace((dom_mutation_name_event *) (e),\
+ dom_mutation_name_event_get_prev_namespace((dom_mutation_name_event *) (e),\
(struct dom_string **) (n))
-dom_exception _dom_mutation_name_event_get_prev_node_name(
+dom_exception dom_mutation_name_event_get_prev_node_name(
dom_mutation_name_event *evt, struct dom_string **name);
#define dom_mutation_name_event_get_prev_node_name(e, n) \
- _dom_mutation_name_event_get_prev_node_name((dom_mutation_name_event *) (e),\
+ dom_mutation_name_event_get_prev_node_name((dom_mutation_name_event *) (e),\
(struct dom_string **) (n))
-dom_exception _dom_mutation_name_event_init(dom_mutation_name_event *evt,
+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);
#define dom_mutation_name_event_init(e, t, b, c, n, p, pn) \
- _dom_mutation_name_event_init((dom_mutation_name_event *) (e), (struct dom_string *) (t), \
+ dom_mutation_name_event_init((dom_mutation_name_event *) (e), (struct dom_string *) (t), \
(bool) (b), (bool) (c), (struct dom_node *) (n), (struct dom_string *) (p), \
(struct dom_string *) (pn))
-dom_exception _dom_mutation_name_event_init_ns(dom_mutation_name_event *evt,
+dom_exception dom_mutation_name_event_init_ns(dom_mutation_name_event *evt,
struct dom_string *namespace, struct dom_string *type, bool bubble,
bool cancelable, struct dom_node *node, struct dom_string *prev_ns,
struct dom_string *prev_name);
#define dom_mutation_name_event_init_ns(e, n, t, b, c, n, p, pn)
- _dom_mutation_name_event_init_ns((dom_mutation_name_event *) (e), (struct dom_string *) (n), \
+ dom_mutation_name_event_init_ns((dom_mutation_name_event *) (e), (struct dom_string *) (n), \
(struct dom_string *) (t), (bool) (b), (bool) (c), (struct dom_node *) (n), \
(struct dom_string *) (p), (struct dom_string *) (pn))
Modified: branches/struggleyb/libdom-events/include/dom/events/text_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/text_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/text_event.h Fri Jul 31 22:17:25 2009
@@ -13,23 +13,23 @@
typedef struct dom_text_event dom_text_event;
-dom_exception _dom_text_event_get_data(dom_text_event *evt,
+dom_exception dom_text_event_get_data(dom_text_event *evt,
struct dom_string **data);
-#define dom_text_event_get_data(e, d) _dom_text_event_get_data(\
+#define dom_text_event_get_data(e, d) dom_text_event_get_data(\
(dom_text_event *) (e), (struct dom_string **) (d))
-dom_exception _dom_text_event_init(dom_text_event *evt, struct dom_string *type,
+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);
-#define dom_text_event_init(e, t, b, c, v, d) _dom_text_event_init( \
+#define dom_text_event_init(e, t, b, c, v, d) dom_text_event_init( \
(dom_text_event *) (e), (struct dom_string *) (t), (bool) (b), \
(bool) (c), (struct dom_abstract_view *) (v), (struct dom_string *) (d))
-dom_exception _dom_text_event_init_ns(dom_text_event *evt,
+dom_exception dom_text_event_init_ns(dom_text_event *evt,
struct dom_string *namespace, struct dom_string *type, bool bubble,
bool cancelable, struct dom_abstract_view *view,
struct dom_string *data);
-#define dom_text_event_init_ns(e, n, t, b, c, v, d) _dom_text_event_init_ns( \
+#define dom_text_event_init_ns(e, n, t, b, c, v, d) dom_text_event_init_ns( \
(dom_text_event *) (e), (struct dom_string *) (n), (struct dom_string *) (t),\
(bool) (b), (bool) (c), (struct dom_abstract_view *) (v), \
(struct dom_string *) (d))
Modified: branches/struggleyb/libdom-events/include/dom/events/ui_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/inclu...
==============================================================================
--- branches/struggleyb/libdom-events/include/dom/events/ui_event.h (original)
+++ branches/struggleyb/libdom-events/include/dom/events/ui_event.h Fri Jul 31 22:17:25 2009
@@ -12,26 +12,26 @@
typedef struct dom_ui_event dom_ui_event;
-dom_exception _dom_ui_event_get_view(dom_ui_event *evt,
+dom_exception dom_ui_event_get_view(dom_ui_event *evt,
struct dom_abstract_view **view);
-#define dom_ui_event_get_view(e, v) _dom_ui_event_get_view((dom_ui_event *) (e), \
+#define dom_ui_event_get_view(e, v) dom_ui_event_get_view((dom_ui_event *) (e), \
(struct dom_abstract_view **) (v))
-dom_exception _dom_ui_event_get_detail(dom_ui_event *evt,
+dom_exception dom_ui_event_get_detail(dom_ui_event *evt,
long *detail);
-#define dom_ui_event_get_detail(e, d) _dom_ui_event_get_detail((dom_ui_event *) (e),\
+#define dom_ui_event_get_detail(e, d) dom_ui_event_get_detail((dom_ui_event *) (e),\
(long *) (d))
-dom_exception _dom_ui_event_init(dom_ui_event *evt, struct dom_string *type,
+dom_exception dom_ui_event_init(dom_ui_event *evt, struct dom_string *type,
bool bubble, bool cancelable, struct dom_abstract_view *view, long detail);
-#define dom_ui_event_init(e, t, b, c, v, d) _dom_ui_event_init((dom_ui_event *) (e),\
+#define dom_ui_event_init(e, t, b, c, v, d) dom_ui_event_init((dom_ui_event *) (e),\
(struct dom_string *) (t), (bool) (b), (bool) (c), \
(struct dom_abstract_view *) (v), (long) (d))
-dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, struct dom_string *namespace,
+dom_exception dom_ui_event_init_ns(dom_ui_event *evt, struct dom_string *namespace,
struct dom_string *type, bool bubble, bool cancelable,
struct dom_abstract_view *view, long detail);
-#define dom_ui_event_init_ns(e, n, t, b, c, v, d) _dom_ui_event_init_ns( \
+#define dom_ui_event_init_ns(e, n, t, b, c, v, d) dom_ui_event_init_ns( \
(dom_ui_event *) (e), (struct dom_string *) (n), (struct dom_string *) (t),\
(bool) (b), (bool) (c), (struct dom_abstract_view *) (v), (long) (d))
Modified: branches/struggleyb/libdom-events/src/events/custom_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/custom_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/custom_event.c Fri Jul 31 22:17:25 2009
@@ -10,39 +10,39 @@
#include "core/document.h"
/* Constructor */
-dom_exception dom_custom_event_create(struct dom_document *doc,
+dom_exception _dom_custom_event_create(struct dom_document *doc,
struct dom_custom_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_custom_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_custom_event_initialise(doc, evt);
+ return _dom_custom_event_initialise(doc, evt);
}
/* Destructor */
-void dom_custom_event_destroy(struct dom_document *doc,
+void _dom_custom_event_destroy(struct dom_document *doc,
struct dom_custom_event *evt)
{
- dom_custom_event_finalise(doc, evt);
+ _dom_custom_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_custom_event));
}
/* Initialise function */
-dom_exception dom_custom_event_initialise(struct dom_document *doc,
+dom_exception _dom_custom_event_initialise(struct dom_document *doc,
struct dom_custom_event *evt)
{
evt->detail = NULL;
- return dom_event_initialise(doc, &evt->base);
+ return _dom_event_initialise(doc, &evt->base);
}
/* Finalise function */
-void dom_custom_event_finalise(struct dom_document *doc,
+void _dom_custom_event_finalise(struct dom_document *doc,
struct dom_custom_event *evt)
{
evt->detail = NULL;
- dom_event_finalise(doc, &evt->base);
+ _dom_event_finalise(doc, &evt->base);
}
/* */
@@ -56,7 +56,7 @@
* \param evt The Event object
* \param detail The returned detail object
*/
-dom_exception _dom_custom_event_get_detail(dom_custom_event *evt, void **detail)
+dom_exception dom_custom_event_get_detail(dom_custom_event *evt, void **detail)
{
*detail = evt->detail
@@ -73,7 +73,7 @@
* \param cancelable Whether this event is cancelable
* \param detail The detail object of this custom event
*/
-dom_exception _dom_custom_event_init_ns(dom_custom_event *evt,
+dom_exception dom_custom_event_init_ns(dom_custom_event *evt,
struct dom_string *namespace, struct dom_string *type,
bool bubble, bool cancelable, void *detail)
{
Modified: branches/struggleyb/libdom-events/src/events/custom_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/custom_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/custom_event.h Fri Jul 31 22:17:25 2009
@@ -18,19 +18,19 @@
};
/* Constructor */
-dom_exception dom_custom_event_create(struct dom_document *doc,
+dom_exception _dom_custom_event_create(struct dom_document *doc,
struct dom_custom_event **evt);
/* Destructor */
-void dom_custom_event_destroy(struct dom_document *doc,
+void _dom_custom_event_destroy(struct dom_document *doc,
struct dom_custom_event *evt);
/* Initialise function */
-dom_exception dom_custom_event_initialise(struct dom_document *doc,
+dom_exception _dom_custom_event_initialise(struct dom_document *doc,
struct dom_custom_event *evt);
/* Finalise function */
-void dom_custom_event_finalise(struct dom_document *doc,
+void _dom_custom_event_finalise(struct dom_document *doc,
struct dom_custom_event *evt);
#endif
Modified: branches/struggleyb/libdom-events/src/events/event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/event.c (original)
+++ branches/struggleyb/libdom-events/src/events/event.c Fri Jul 31 22:17:25 2009
@@ -16,26 +16,26 @@
#include "core/document.h"
/* Constructor */
-dom_exception dom_event_create(struct dom_document *doc,
+dom_exception _dom_event_create(struct dom_document *doc,
struct dom_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_event_initialise(doc, evt);
+ return _dom_event_initialise(doc, evt);
}
/* Destructor */
-void dom_event_destroy(struct dom_document *doc, struct dom_event *evt)
-{
- dom_event_finalise(doc, evt);
+void _dom_event_destroy(struct dom_document *doc, struct dom_event *evt)
+{
+ _dom_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_event));
}
/* Initialise function */
-dom_exception dom_event_initialise(struct dom_document *doc,
+dom_exception _dom_event_initialise(struct dom_document *doc,
struct dom_event *evt)
{
assert(doc != NULL);
@@ -59,7 +59,7 @@
}
/* Finalise function */
-void dom_event_finalise(struct dom_document *doc, struct dom_event *evt)
+void _dom_event_finalise(struct dom_document *doc, struct dom_event *evt)
{
assert(doc != NULL);
lwc_context *ctx = dom_document_get_intern_context(doc);
@@ -80,7 +80,7 @@
* \param evt The event object
* \param type The returned event type
*/
-dom_exception _dom_event_get_type(dom_event *evt, struct dom_string **type)
+dom_exception dom_event_get_type(dom_event *evt, struct dom_string **type)
{
dom_document *doc = evt->doc;
dom_exception err;
@@ -98,7 +98,7 @@
* \param evt The event object
* \param target The target node
*/
-dom_exception _dom_event_get_target(dom_event *evt, struct dom_event_target **target)
+dom_exception dom_event_get_target(dom_event *evt, struct dom_event_target **target)
{
*target = evt->target;
dom_event_target_ref(*target);
@@ -112,7 +112,7 @@
* \param evt The event object
* \param current The current event target node
*/
-dom_exception _dom_event_get_current_target(dom_event *evt, struct dom_event_target **current)
+dom_exception dom_event_get_current_target(dom_event *evt, struct dom_event_target **current)
{
*current = evt->current;
dom_event_target_ref(*current);
@@ -121,28 +121,28 @@
}
/* Get whether this event can bubble */
-dom_exception _dom_event_get_bubbles(dom_event *evt, bool *bubbles)
+dom_exception dom_event_get_bubbles(dom_event *evt, bool *bubbles)
{
*bubbles = evt->bubble;
return DOM_NO_ERR;
}
/* Get whether this event can be cancelable */
-dom_exception _dom_event_get_cancelable(dom_event *evt, bool *cancelable)
+dom_exception dom_event_get_cancelable(dom_event *evt, bool *cancelable)
{
*cancelable = evt->cancelable;
return DOM_NO_ERR;
}
/* Get the event's generation timestamp */
-dom_exception _dom_event_get_timestamp(dom_event *evt, unsigned int *timestamp)
+dom_exception dom_event_get_timestamp(dom_event *evt, unsigned int *timestamp)
{
*timestamp = evt->timestamp;
return DOM_NO_ERR;
}
/* Stop progpagation of the event */
-dom_exception _dom_event_stop_propagation(dom_event *evt)
+dom_exception dom_event_stop_propagation(dom_event *evt)
{
evt->stop = true;
@@ -150,7 +150,7 @@
}
/* Prevent the default action of this event */
-dom_exception _dom_event_prevent_default(dom_event *evt)
+dom_exception dom_event_prevent_default(dom_event *evt)
{
evt->prevent_default = true;
}
@@ -163,7 +163,7 @@
* \param bubble Whether this event is bubbling
* \param cancelable Whether this event is cancelable
*/
-dom_exception _dom_event_init(dom_event *evt, struct dom_string *type,
+dom_exception dom_event_init(dom_event *evt, struct dom_string *type,
bool bubble, bool cancelable)
{
assert(evt->doc != NULL);
@@ -183,7 +183,7 @@
}
/* Get the namespace of this event */
-dom_exception _dom_event_get_namespace(dom_event *evt, struct dom_string **namespace)
+dom_exception dom_event_get_namespace(dom_event *evt, struct dom_string **namespace)
{
dom_document *doc = evt->doc;
dom_exception err;
@@ -196,7 +196,7 @@
}
/* Whether this is a custom event */
-dom_exception _dom_event_is_custom(dom_event *evt, bool *custom)
+dom_exception dom_event_is_custom(dom_event *evt, bool *custom)
{
*custom = evt->custom;
@@ -204,7 +204,7 @@
}
/* Stop the event propagation immediately */
-dom_exception _dom_event_stop_immediate_propagation(dom_event *evt)
+dom_exception dom_event_stop_immediate_propagation(dom_event *evt)
{
evt->stop_now = true;
@@ -212,7 +212,7 @@
}
/* Whether the default action is prevented */
-dom_exception _dom_event_is_default_prevented(dom_event *evt, bool *prevented)
+dom_exception dom_event_is_default_prevented(dom_event *evt, bool *prevented)
{
*prevented = evt->prevent_default;
@@ -228,7 +228,7 @@
* \param bubble Whether this event has a bubble phase
* \param cancelable Whether this event is cancelable
*/
-dom_exception _dom_event_init_ns(dom_event *evt, struct dom_string *namespace,
+dom_exception dom_event_init_ns(dom_event *evt, struct dom_string *namespace,
struct dom_string *type, bool bubble, bool cancelable)
{
assert(evt->doc != NULL);
Modified: branches/struggleyb/libdom-events/src/events/event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/event.h (original)
+++ branches/struggleyb/libdom-events/src/events/event.h Fri Jul 31 22:17:25 2009
@@ -40,18 +40,18 @@
};
/* Constructor */
-dom_exception dom_event_create(struct dom_document *doc,
+dom_exception _dom_event_create(struct dom_document *doc,
struct dom_event **evt);
/* Destructor */
-void dom_event_destroy(struct dom_document *doc, struct dom_event *evt);
+void _dom_event_destroy(struct dom_document *doc, struct dom_event *evt);
/* Initialise function */
-dom_exception dom_event_initialise(struct dom_document *doc,
+dom_exception _dom_event_initialise(struct dom_document *doc,
struct dom_event *evt);
/* Finalise function */
-void dom_event_finalise(struct dom_document *doc, struct dom_event *evt);
+void _dom_event_finalise(struct dom_document *doc, struct dom_event *evt);
#endif
Modified: branches/struggleyb/libdom-events/src/events/event_target.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/event_target.c (original)
+++ branches/struggleyb/libdom-events/src/events/event_target.c Fri Jul 31 22:17:25 2009
@@ -26,7 +26,7 @@
/* Initialise this EventTarget */
-dom_exception dom_event_target_internal_initialise(struct dom_document *doc,
+dom_exception _dom_event_target_internal_initialise(struct dom_document *doc,
dom_event_target_internal *eti)
{
eti->listeners = NULL;
@@ -36,7 +36,7 @@
}
/* Finalise this EventTarget */
-void dom_event_target_internal_finalise(struct dom_document *doc,
+void _dom_event_target_internal_finalise(struct dom_document *doc,
dom_event_target_internal *eti)
{
lwc_context *ctx = dom_document_get_intern_context(doc);
@@ -59,7 +59,7 @@
* \param listener The event listener object
* \param capture Whether add this listener in the capturing phase
*/
-dom_exception _dom_event_target_add_event_listener(dom_event_target *et,
+dom_exception dom_event_target_add_event_listener(dom_event_target *et,
struct dom_string *type, struct dom_event_listener *listener,
bool capture)
{
@@ -126,7 +126,7 @@
* \param listener The listener object
* \param capture Whether the listener is registered at the capturing phase
*/
-dom_exception _dom_event_target_remove_event_listener(dom_event_target *et,
+dom_exception dom_event_target_remove_event_listener(dom_event_target *et,
struct dom_string *type, struct dom_event_listener *listener,
bool capture)
{
@@ -186,7 +186,7 @@
* event called Event.preventDefault(). If Event.preventDefault()
* was called the returned value is false, else it is true.
*/
-dom_exception _dom_event_target_dispatch_event(dom_event_target *et,
+dom_exception dom_event_target_dispatch_event(dom_event_target *et,
struct dom_event *evt, bool *success)
{
}
@@ -200,7 +200,7 @@
* \param listener The event listener object
* \param capture Whether add this listener in the capturing phase
*/
-dom_exception _dom_event_target_add_event_listener_ns(dom_event_target *et,
+dom_exception dom_event_target_add_event_listener_ns(dom_event_target *et,
struct dom_string *namespace, struct dom_string *type,
struct dom_event_listener_ns *listener, bool capture)
{
@@ -222,7 +222,7 @@
* \param listener The event listener object
* \param capture Whether add this listener in the capturing phase
*/
-dom_exception _dom_event_target_remove_event_listener_ns(dom_event_target *et,
+dom_exception dom_event_target_remove_event_listener_ns(dom_event_target *et,
struct dom_string *namespace, struct dom_string *type,
struct dom_event_listener_ns *listener, bool capture)
{
Modified: branches/struggleyb/libdom-events/src/events/event_target.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/event_target.h (original)
+++ branches/struggleyb/libdom-events/src/events/event_target.h Fri Jul 31 22:17:25 2009
@@ -40,11 +40,11 @@
*/
/* Initialise this EventTarget */
-dom_exception dom_event_target_internal_initialise(struct dom_document *doc,
+dom_exception _dom_event_target_internal_initialise(struct dom_document *doc,
dom_event_target_internal *eti);
/* Finalise this EventTarget */
-void dom_event_target_internal_finalise(struct dom_document *doc,
+void _dom_event_target_internal_finalise(struct dom_document *doc,
dom_event_target_internal *eti);
#endif
Modified: branches/struggleyb/libdom-events/src/events/keyboard_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/keyboard_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/keyboard_event.c Fri Jul 31 22:17:25 2009
@@ -8,27 +8,27 @@
#include "events/keyboard_event.h"
/* Constructor */
-dom_exception dom_keyboard_event_create(struct dom_document *doc,
+dom_exception _dom_keyboard_event_create(struct dom_document *doc,
struct dom_keyboard_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_keyboard_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_keyboard_event_initialise(doc, evt);
+ return _dom_keyboard_event_initialise(doc, evt);
}
/* Destructor */
-void dom_keyboard_event_destroy(struct dom_document *doc,
+void _dom_keyboard_event_destroy(struct dom_document *doc,
struct dom_keyboard_event *evt)
{
- dom_keyboard_event_finalise(doc, evt);
+ _dom_keyboard_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_keyboard_event));
}
/* Initialise function */
-dom_exception dom_keyboard_event_initialise(struct dom_document *doc,
+dom_exception _dom_keyboard_event_initialise(struct dom_document *doc,
struct dom_keyboard_event *evt)
{
evt->key_ident = NULL;
@@ -36,15 +36,15 @@
evt->meta = false;
evt->shift = false;
evt->alt = false;
- return dom_ui_event_initialise(doc, &evt->base);
+ return _dom_ui_event_initialise(doc, &evt->base);
}
/* Finalise function */
-void dom_keyboard_event_finalise(struct dom_document *doc,
+void _dom_keyboard_event_finalise(struct dom_document *doc,
struct dom_keyboard_event *evt)
{
evt->view = NULL;
- dom_ui_event_finalise(doc, &evt->base);
+ _dom_ui_event_finalise(doc, &evt->base);
}
/* */
@@ -53,7 +53,7 @@
/* The public API */
/* Get the key identifier */
-dom_exception _dom_keyboard_event_get_key_identifier(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_key_identifier(dom_keyboard_event *evt,
struct dom_string **ident)
{
*ident = evt->key_ident;
@@ -63,7 +63,7 @@
}
/* Get the key location */
-dom_exception _dom_keyboard_event_get_key_location(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_key_location(dom_keyboard_event *evt,
dom_key_location *loc)
{
*loc = evt->key_loc;
@@ -72,7 +72,7 @@
}
/* Get the ctrl key state */
-dom_exception _dom_keyboard_event_get_ctrl_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_ctrl_key(dom_keyboard_event *evt,
bool *key)
{
*key = evt->ctrl;
@@ -81,7 +81,7 @@
}
/* Get the shift key state */
-dom_exception _dom_keyboard_event_get_shift_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_shift_key(dom_keyboard_event *evt,
bool *key)
{
*key = evt->shift;
@@ -90,7 +90,7 @@
}
/* Get the alt key state */
-dom_exception _dom_keyboard_event_get_alt_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_alt_key(dom_keyboard_event *evt,
bool *key)
{
*key = evt->alt;
@@ -99,7 +99,7 @@
}
/* Get the meta key state */
-dom_exception _dom_keyboard_event_get_meta_key(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_meta_key(dom_keyboard_event *evt,
bool *key)
{
*key = evt->meta;
@@ -118,14 +118,14 @@
* @note: If an application wishes to distinguish between right and left modifiers,
* this information could be deduced using keyboard events and KeyboardEvent.keyLocation.
*/
-dom_exception _dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt,
struct dom_string *m, bool *state)
{
/* TODO: Intern the string m ... */
}
/* Initialise the keyboard event */
-dom_exception _dom_keyboard_event_init(dom_keyboard_event *evt,
+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)
@@ -140,7 +140,7 @@
}
/* Initialise the keyboard event with namespace */
-dom_exception _dom_keyboard_event_init_ns(dom_keyboard_event *evt,
+dom_exception dom_keyboard_event_init_ns(dom_keyboard_event *evt,
struct dom_string *namespace, 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)
Modified: branches/struggleyb/libdom-events/src/events/keyboard_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/keyboard_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/keyboard_event.h Fri Jul 31 22:17:25 2009
@@ -24,19 +24,19 @@
};
/* Constructor */
-dom_exception dom_keyboard_event_create(struct dom_document *doc,
+dom_exception _dom_keyboard_event_create(struct dom_document *doc,
struct dom_keyboard_event **evt);
/* Destructor */
-void dom_keyboard_event_destroy(struct dom_document *doc,
+void _dom_keyboard_event_destroy(struct dom_document *doc,
struct dom_keyboard_event *evt);
/* Initialise function */
-dom_exception dom_keyboard_event_initialise(struct dom_document *doc,
+dom_exception _dom_keyboard_event_initialise(struct dom_document *doc,
struct dom_keyboard_event *evt);
/* Finalise function */
-void dom_keyboard_event_finalise(struct dom_document *doc,
+void _dom_keyboard_event_finalise(struct dom_document *doc,
struct dom_keyboard_event *evt);
#endif
Modified: branches/struggleyb/libdom-events/src/events/mouse_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mouse_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/mouse_event.c Fri Jul 31 22:17:25 2009
@@ -8,21 +8,21 @@
#include "events/mouse_event.h"
/* Constructor */
-dom_exception dom_mouse_event_create(struct dom_document *doc,
+dom_exception _dom_mouse_event_create(struct dom_document *doc,
struct dom_mouse_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_mouse_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_mouse_event_initialise(doc, evt);
+ return _dom_mouse_event_initialise(doc, evt);
}
/* Destructor */
-void dom_mouse_event_destroy(struct dom_document *doc,
+void _dom_mouse_event_destroy(struct dom_document *doc,
struct dom_mouse_event *evt)
{
- dom_mouse_event_finalise(doc, evt);
+ _dom_mouse_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_mouse_event));
}
@@ -33,7 +33,7 @@
/* The public API */
/* Get screenX */
-dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_screen_x(dom_mouse_event *evt,
long *x)
{
*x = evt->sx;
@@ -42,7 +42,7 @@
}
/* Get screenY */
-dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_screen_y(dom_mouse_event *evt,
long *y)
{
*y = evt->sy;
@@ -51,7 +51,7 @@
}
/* Get clientX */
-dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_client_x(dom_mouse_event *evt,
long *x)
{
*x = evt->cx;
@@ -60,7 +60,7 @@
}
/* Get clientY */
-dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_client_y(dom_mouse_event *evt,
long *y)
{
*y = evt->cy;
@@ -69,7 +69,7 @@
}
/* Get the ctrl key state */
-dom_exception _dom_mouse_event_get_ctrl_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_ctrl_key(dom_mouse_event *evt,
bool *key)
{
*key = evt->ctrl;
@@ -78,7 +78,7 @@
}
/* Get the shift key state */
-dom_exception _dom_mouse_event_get_shift_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_shift_key(dom_mouse_event *evt,
bool *key)
{
*key = evt->shift;
@@ -87,7 +87,7 @@
}
/* Get the alt key state */
-dom_exception _dom_mouse_event_get_alt_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_alt_key(dom_mouse_event *evt,
bool *key)
{
*key = evt->alt;
@@ -96,7 +96,7 @@
}
/* Get the meta key state */
-dom_exception _dom_mouse_event_get_meta_key(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_meta_key(dom_mouse_event *evt,
bool *key)
{
*key = evt->meta;
@@ -105,7 +105,7 @@
}
/* Get the button which get pressed */
-dom_exception _dom_mouse_event_get_button(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_button(dom_mouse_event *evt,
unsigned short *button)
{
*button = evt->button;
@@ -114,7 +114,7 @@
}
/* Get the related target */
-dom_exception _dom_mouse_event_get_related_target(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_related_target(dom_mouse_event *evt,
struct event_target **et)
{
*et = evt->related_target;
@@ -133,14 +133,14 @@
* @note: If an application wishes to distinguish between right and left modifiers,
* this information could be deduced using keyboard events and KeyboardEvent.keyLocation.
*/
-dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt,
+dom_exception dom_mouse_event_get_modifier_state(dom_mouse_event *evt,
struct dom_string *m, bool *state)
{
/* TODO: Intern the string m ... */
}
/* Initialise this event */
-dom_exception _dom_mouse_event_init(dom_mouse_event *evt,
+dom_exception dom_mouse_event_init(dom_mouse_event *evt,
struct 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,
@@ -163,7 +163,7 @@
}
/* Initialise the event with namespace */
-dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, struct dom_string *namespace,
+dom_exception dom_mouse_event_init_ns(dom_mouse_event *evt, struct dom_string *namespace,
struct 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,
Modified: branches/struggleyb/libdom-events/src/events/mouse_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mouse_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/mouse_event.h Fri Jul 31 22:17:25 2009
@@ -30,18 +30,18 @@
};
/* Constructor */
-dom_exception dom_mouse_event_create(struct dom_document *doc,
+dom_exception _dom_mouse_event_create(struct dom_document *doc,
struct dom_mouse_event **evt);
/* Destructor */
-void dom_mouse_event_destroy(struct dom_document *doc,
+void _dom_mouse_event_destroy(struct dom_document *doc,
struct dom_mouse_event *evt);
/* Initialise function */
-#define dom_mouse_event_initialise dom_ui_event_initialise
+#define _dom_mouse_event_initialise _dom_ui_event_initialise
/* Finalise function */
-#define dom_mouse_event_finalise dom_ui_event_finalise
+#define _dom_mouse_event_finalise _dom_ui_event_finalise
#endif
Modified: branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.c Fri Jul 31 22:17:25 2009
@@ -8,21 +8,21 @@
#include "events/mouse_multi_wheel_event.h"
/* Constructor */
-dom_exception dom_mouse_multi_wheel_event_create(struct dom_document *doc,
+dom_exception _dom_mouse_multi_wheel_event_create(struct dom_document *doc,
struct dom_mouse_multi_wheel_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_mouse_multi_wheel_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_mouse_multi_wheel_event_initialise(doc, evt);
+ return _dom_mouse_multi_wheel_event_initialise(doc, evt);
}
/* Destructor */
-void dom_mouse_multi_wheel_event_destroy(struct dom_document *doc,
+void _dom_mouse_multi_wheel_event_destroy(struct dom_document *doc,
struct dom_mouse_multi_wheel_event *evt)
{
- dom_mouse_multi_wheel_event_finalise(doc, evt);
+ _dom_mouse_multi_wheel_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_mouse_multi_wheel_event));
}
@@ -33,7 +33,7 @@
/* The public API */
/* Get wheelDeltaX */
-dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x(
+dom_exception dom_mouse_multi_wheel_event_get_wheel_delta_x(
dom_mouse_multi_wheel_event *evt, long *x)
{
*x = evt->x;
@@ -42,7 +42,7 @@
}
/* Get wheelDeltaY */
-dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y(
+dom_exception dom_mouse_multi_wheel_event_get_wheel_delta_y(
dom_mouse_multi_wheel_event *evt, long *y)
{
*y = evt->y;
@@ -51,7 +51,7 @@
}
/* Get wheelDeltaZ */
-dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z(
+dom_exception dom_mouse_multi_wheel_event_get_wheel_delta_z(
dom_mouse_multi_wheel_event *evt, long *z)
{
*z = evt->z;
Modified: branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/mouse_multi_wheel_event.h Fri Jul 31 22:17:25 2009
@@ -21,18 +21,18 @@
};
/* Constructor */
-dom_exception dom_mouse_multi_wheel_event_create(struct dom_document *doc,
+dom_exception _dom_mouse_multi_wheel_event_create(struct dom_document *doc,
struct dom_mouse_multi_wheel_event **evt);
/* Destructor */
-void dom_mouse_multi_wheel_event_destroy(struct dom_document *doc,
+void _dom_mouse_multi_wheel_event_destroy(struct dom_document *doc,
struct dom_mouse_multi_wheel_event *evt);
/* Initialise function */
-#define dom_mouse_multi_wheel_event_initialise dom_mouse_event_initialise
+#define _dom_mouse_multi_wheel_event_initialise _dom_mouse_event_initialise
/* Finalise function */
-#define dom_mouse_multi_wheel_event_finalise dom_mouse_event_finalise
+#define _dom_mouse_multi_wheel_event_finalise _dom_mouse_event_finalise
#endif
Modified: branches/struggleyb/libdom-events/src/events/mouse_wheel_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mouse_wheel_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/mouse_wheel_event.c Fri Jul 31 22:17:25 2009
@@ -8,21 +8,21 @@
#include "events/mouse_wheel_event.h"
/* Constructor */
-dom_exception dom_mouse_wheel_event_create(struct dom_document *doc,
+dom_exception _dom_mouse_wheel_event_create(struct dom_document *doc,
struct dom_mouse_wheel_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_mouse_wheel_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_mouse_wheel_event_initialise(doc, evt);
+ return _dom_mouse_wheel_event_initialise(doc, evt);
}
/* Destructor */
-void dom_mouse_wheel_event_destroy(struct dom_document *doc,
+void _dom_mouse_wheel_event_destroy(struct dom_document *doc,
struct dom_mouse_wheel_event *evt)
{
- dom_mouse_wheel_event_finalise(doc, evt);
+ _dom_mouse_wheel_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_mouse_wheel_event));
}
@@ -33,7 +33,7 @@
/* The public API */
/* Get wheelDelta */
-dom_exception _dom_mouse_wheel_event_get_wheel_delta(
+dom_exception dom_mouse_wheel_event_get_wheel_delta(
dom_mouse_wheel_event *evt, long *d)
{
*d = evt->delta;
@@ -42,7 +42,7 @@
}
/* Intialise this event with namespace */
-dom_exception _dom_mouse_wheel_event_init_ns(
+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,
struct dom_abstract_view *view, long detail, long screen_x,
Modified: branches/struggleyb/libdom-events/src/events/mouse_wheel_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mouse_wheel_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/mouse_wheel_event.h Fri Jul 31 22:17:25 2009
@@ -19,18 +19,18 @@
};
/* Constructor */
-dom_exception dom_mouse_wheel_event_create(struct dom_document *doc,
+dom_exception _dom_mouse_wheel_event_create(struct dom_document *doc,
struct dom_mouse_wheel_event **evt);
/* Destructor */
-void dom_mouse_wheel_event_destroy(struct dom_document *doc,
+void _dom_mouse_wheel_event_destroy(struct dom_document *doc,
struct dom_mouse_wheel_event *evt);
/* Initialise function */
-#define dom_mouse_wheel_event_initialise dom_mouse_event_initialise
+#define _dom_mouse_wheel_event_initialise _dom_mouse_event_initialise
/* Finalise function */
-#define dom_mouse_wheel_event_finalise dom_mouse_event_finalise
+#define _dom_mouse_wheel_event_finalise _dom_mouse_event_finalise
#endif
Modified: branches/struggleyb/libdom-events/src/events/mutation_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mutation_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/mutation_event.c Fri Jul 31 22:17:25 2009
@@ -7,27 +7,27 @@
/* Constructor */
-dom_exception dom_mutation_event_create(struct dom_document *doc,
+dom_exception _dom_mutation_event_create(struct dom_document *doc,
struct dom_mutation_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_mutation_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_mutation_event_initialise(doc, evt);
+ return _dom_mutation_event_initialise(doc, evt);
}
/* Destructor */
-void dom_mutation_event_destroy(struct dom_document *doc,
+void _dom_mutation_event_destroy(struct dom_document *doc,
struct dom_mutation_event *evt)
{
- dom_mutation_event_finalise(doc, evt);
+ _dom_mutation_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_mutation_event));
}
/* Initialise function */
-dom_exception dom_mutation_event_initialise(struct dom_document *doc,
+dom_exception _dom_mutation_event_initialise(struct dom_document *doc,
struct dom_mutation_event *evt)
{
evt->related_node = NULL;
@@ -35,11 +35,11 @@
evt->new_value = NULL:
evt->attr_name = NULL;
- return dom_event_initialise(doc, &evt->base);
+ return _dom_event_initialise(doc, &evt->base);
}
/* Finalise function */
-void dom_mutation_event_finalise(struct dom_document *doc,
+void _dom_mutation_event_finalise(struct dom_document *doc,
struct dom_mutation_event *evt)
{
dom_node_unref(evt->related_node);
@@ -47,7 +47,7 @@
dom_string_unref(evt->new_value);
dom_string_unref(evt->attr_name);
- dom_event_finalise(doc, &evt->base);
+ _dom_event_finalise(doc, &evt->base);
}
/* */
@@ -56,7 +56,7 @@
/* The public API */
/* Get the related node */
-dom_exception _dom_mutation_event_get_related_node(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_related_node(dom_mutation_event *evt,
struct dom_node **node)
{
*node = evt->related_node;
@@ -66,7 +66,7 @@
}
/* get the previous value */
-dom_exception _dom_mutation_event_get_prev_value(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_prev_value(dom_mutation_event *evt,
struct dom_string **ret)
{
*ret = evt->prev_value;
@@ -76,7 +76,7 @@
}
/* get the new value */
-dom_exception _dom_mutation_event_get_new_value(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_new_value(dom_mutation_event *evt,
struct dom_string **ret)
{
*ret = evt->new_value;
@@ -86,7 +86,7 @@
}
/* get the attr name*/
-dom_exception _dom_mutation_event_get_attr_name(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_attr_name(dom_mutation_event *evt,
struct dom_string **ret)
{
*ret = evt->attr_name;
@@ -96,7 +96,7 @@
}
/* Get the way the attribute change */
-dom_exception _dom_mutation_event_get_attr_change(dom_mutation_event *evt,
+dom_exception dom_mutation_event_get_attr_change(dom_mutation_event *evt,
dom_attr_change_type *type)
{
*type = evt->change;
@@ -105,7 +105,7 @@
}
/* Initialise this event */
-dom_exception _dom_mutation_event_init(dom_mutation_event *evt,
+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_attr_change_type change)
@@ -128,7 +128,7 @@
}
/* Initialise this event with namespace */
-dom_exception _dom_mutation_event_init_ns(dom_mutation_event *evt, struct dom_string *namespace,
+dom_exception dom_mutation_event_init_ns(dom_mutation_event *evt, struct dom_string *namespace,
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_attr_change_type change)
Modified: branches/struggleyb/libdom-events/src/events/mutation_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mutation_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/mutation_event.h Fri Jul 31 22:17:25 2009
@@ -23,19 +23,19 @@
};
/* Constructor */
-dom_exception dom_mutation_event_create(struct dom_document *doc,
+dom_exception _dom_mutation_event_create(struct dom_document *doc,
struct dom_mutation_event **evt);
/* Destructor */
-void dom_mutation_event_destroy(struct dom_document *doc,
+void _dom_mutation_event_destroy(struct dom_document *doc,
struct dom_mutation_event *evt);
/* Initialise function */
-dom_exception dom_mutation_event_initialise(struct dom_document *doc,
+dom_exception _dom_mutation_event_initialise(struct dom_document *doc,
struct dom_mutation_event *evt);
/* Finalise function */
-void dom_mutation_event_finalise(struct dom_document *doc,
+void _dom_mutation_event_finalise(struct dom_document *doc,
struct dom_mutation_event *evt);
#endif
Modified: branches/struggleyb/libdom-events/src/events/mutation_name_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mutation_name_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/mutation_name_event.c Fri Jul 31 22:17:25 2009
@@ -7,43 +7,43 @@
/* Constructor */
-dom_exception dom_mutation_name_event_create(struct dom_document *doc,
+dom_exception _dom_mutation_name_event_create(struct dom_document *doc,
struct dom_mutation_name_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_mutation_name_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_mutation_name_event_initialise(doc, evt);
+ return _dom_mutation_name_event_initialise(doc, evt);
}
/* Destructor */
-void dom_mutation_name_event_destroy(struct dom_document *doc,
+void _dom_mutation_name_event_destroy(struct dom_document *doc,
struct dom_mutation_name_event *evt)
{
- dom_mutation_name_event_finalise(doc, evt);
+ _dom_mutation_name_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_mutation_name_event));
}
/* Initialise function */
-dom_exception dom_mutation_name_event_initialise(struct dom_document *doc,
+dom_exception _dom_mutation_name_event_initialise(struct dom_document *doc,
struct dom_mutation_name_event *evt)
{
evt->prev_namespace = NULL;
evt->prev_nodename = NULL;
- return dom_event_initialise(doc, &evt->base);
+ return _dom_event_initialise(doc, &evt->base);
}
/* Finalise function */
-void dom_mutation_name_event_finalise(struct dom_document *doc,
+void _dom_mutation_name_event_finalise(struct dom_document *doc,
struct dom_mutation_name_event *evt)
{
dom_string_unref(evt->prev_namespace);
dom_string_unref(evt->prev_nodename);
- dom_event_finalise(doc, &evt->base);
+ _dom_event_finalise(doc, &evt->base);
}
/* */
@@ -52,7 +52,7 @@
/* The public API */
/* Get the previous namespace */
-dom_exception _dom_mutation_name_event_get_prev_namespace(
+dom_exception dom_mutation_name_event_get_prev_namespace(
dom_mutation_name_event *evt, struct dom_string **namespace)
{
*namespace = evt->prev_namespace;
@@ -62,7 +62,7 @@
}
/* Get the previous node name */
-dom_exception _dom_mutation_name_event_get_prev_node_name(
+dom_exception dom_mutation_name_event_get_prev_node_name(
dom_mutation_name_event *evt, struct dom_string **name)
{
*name = evt->prev_nodename;
@@ -72,7 +72,7 @@
}
/* Initialise this event */
-dom_exception _dom_mutation_name_event_init(dom_mutation_name_event *evt,
+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)
{
@@ -86,7 +86,7 @@
}
/* Initialise this event with namespace */
-dom_exception _dom_mutation_name_event_init_ns(dom_mutation_name_event *evt,
+dom_exception dom_mutation_name_event_init_ns(dom_mutation_name_event *evt,
struct dom_string *namespace, struct dom_string *type, bool bubble,
bool cancelable, struct dom_node *node, struct dom_string *prev_ns,
struct dom_string *prev_name)
Modified: branches/struggleyb/libdom-events/src/events/mutation_name_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/mutation_name_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/mutation_name_event.h Fri Jul 31 22:17:25 2009
@@ -20,19 +20,19 @@
};
/* Constructor */
-dom_exception dom_mutation_name_event_create(struct dom_document *doc,
+dom_exception _dom_mutation_name_event_create(struct dom_document *doc,
struct dom_mutation_name_event **evt);
/* Destructor */
-void dom_mutation_name_event_destroy(struct dom_document *doc,
+void _dom_mutation_name_event_destroy(struct dom_document *doc,
struct dom_mutation_name_event *evt);
/* Initialise function */
-dom_exception dom_mutation_name_event_initialise(struct dom_document *doc,
+dom_exception _dom_mutation_name_event_initialise(struct dom_document *doc,
struct dom_mutation_name_event *evt);
/* Finalise function */
-void dom_mutation_name_event_finalise(struct dom_document *doc,
+void _dom_mutation_name_event_finalise(struct dom_document *doc,
struct dom_mutation_name_event *evt);
#endif
Modified: branches/struggleyb/libdom-events/src/events/text_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/text_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/text_event.c Fri Jul 31 22:17:25 2009
@@ -7,39 +7,39 @@
/* Constructor */
-dom_exception dom_text_event_create(struct dom_document *doc,
+dom_exception _dom_text_event_create(struct dom_document *doc,
struct dom_text_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_text_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_text_event_initialise(doc, evt);
+ return _dom_text_event_initialise(doc, evt);
}
/* Destructor */
-void dom_text_event_destroy(struct dom_document *doc,
+void _dom_text_event_destroy(struct dom_document *doc,
struct dom_text_event *evt)
{
- dom_text_event_finalise(doc, evt);
+ _dom_text_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_text_event));
}
/* Initialise function */
-dom_exception dom_text_event_initialise(struct dom_document *doc,
+dom_exception _dom_text_event_initialise(struct dom_document *doc,
struct dom_text_event *evt)
{
evt->data = NULL;
- return dom_ui_event_initialise(doc, &evt->base);
+ return _dom_ui_event_initialise(doc, &evt->base);
}
/* Finalise function */
-void dom_text_event_finalise(struct dom_document *doc,
+void _dom_text_event_finalise(struct dom_document *doc,
struct dom_text_event *evt)
{
dom_string_unref(evt->data);
- dom_ui_event_finalise(doc, &evt->base);
+ _dom_ui_event_finalise(doc, &evt->base);
}
/* */
@@ -48,7 +48,7 @@
/* The public API */
/* Get the internal data of this event */
-dom_exception _dom_text_event_get_data(dom_text_event *evt,
+dom_exception dom_text_event_get_data(dom_text_event *evt,
struct dom_string **data)
{
*data = evt->data;
@@ -58,7 +58,7 @@
}
/* Initialise this event */
-dom_exception _dom_text_event_init(dom_text_event *evt, struct dom_string *type,
+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)
{
@@ -69,7 +69,7 @@
}
/* Initialise this event with namespace */
-dom_exception _dom_text_event_init_ns(dom_text_event *evt,
+dom_exception dom_text_event_init_ns(dom_text_event *evt,
struct dom_string *namespace, struct dom_string *type, bool bubble,
bool cancelable, struct dom_abstract_view *view,
struct dom_string *data)
Modified: branches/struggleyb/libdom-events/src/events/text_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/text_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/text_event.h Fri Jul 31 22:17:25 2009
@@ -18,19 +18,19 @@
};
/* Constructor */
-dom_exception dom_text_event_create(struct dom_document *doc,
+dom_exception _dom_text_event_create(struct dom_document *doc,
struct dom_text_event **evt);
/* Destructor */
-void dom_text_event_destroy(struct dom_document *doc,
+void _dom_text_event_destroy(struct dom_document *doc,
struct dom_text_event *evt);
/* Initialise function */
-dom_exception dom_text_event_initialise(struct dom_document *doc,
+dom_exception _dom_text_event_initialise(struct dom_document *doc,
struct dom_text_event *evt);
/* Finalise function */
-void dom_text_event_finalise(struct dom_document *doc,
+void _dom_text_event_finalise(struct dom_document *doc,
struct dom_text_event *evt);
#endif
Modified: branches/struggleyb/libdom-events/src/events/ui_event.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/ui_event.c (original)
+++ branches/struggleyb/libdom-events/src/events/ui_event.c Fri Jul 31 22:17:25 2009
@@ -7,39 +7,39 @@
/* Constructor */
-dom_exception dom_ui_event_create(struct dom_document *doc,
+dom_exception _dom_ui_event_create(struct dom_document *doc,
struct dom_ui_event **evt)
{
dom_event *evt = dom_document_alloc(doc, NULL, sizeof(dom_ui_event));
if (evt == NULL)
return DOM_NO_MEM_ERR;
- return dom_ui_event_initialise(doc, evt);
+ return _dom_ui_event_initialise(doc, evt);
}
/* Destructor */
-void dom_ui_event_destroy(struct dom_document *doc,
+void _dom_ui_event_destroy(struct dom_document *doc,
struct dom_ui_event *evt)
{
- dom_ui_event_finalise(doc, evt);
+ _dom_ui_event_finalise(doc, evt);
dom_document_alloc(doc, evt, sizeof(dom_ui_event));
}
/* Initialise function */
-dom_exception dom_ui_event_initialise(struct dom_document *doc,
+dom_exception _dom_ui_event_initialise(struct dom_document *doc,
struct dom_ui_event *evt)
{
evt->view = NULL;
- return dom_event_initialise(doc, &evt->base);
+ return _dom_event_initialise(doc, &evt->base);
}
/* Finalise function */
-void dom_ui_event_finalise(struct dom_document *doc,
+void _dom_ui_event_finalise(struct dom_document *doc,
struct dom_ui_event *evt)
{
evt->view = NULL;
- dom_event_finalise(doc, &evt->base);
+ _dom_event_finalise(doc, &evt->base);
}
/* */
@@ -48,7 +48,7 @@
/* The public API */
/* Get the AbstractView inside this event */
-dom_exception _dom_ui_event_get_view(dom_ui_event *evt,
+dom_exception dom_ui_event_get_view(dom_ui_event *evt,
struct dom_abstract_view *view)
{
*view = evt->view;
@@ -57,7 +57,7 @@
}
/* Get the detail param of this event */
-dom_exception _dom_ui_event_get_detail(dom_ui_event *evt,
+dom_exception dom_ui_event_get_detail(dom_ui_event *evt,
long *detail)
{
*detail = evt->detail;
@@ -66,7 +66,7 @@
}
/* Initialise the UIEvent */
-dom_exception _dom_ui_event_init(dom_ui_event *evt, struct dom_string *type,
+dom_exception dom_ui_event_init(dom_ui_event *evt, struct dom_string *type,
bool bubble, bool cancelable, struct dom_abstract_view *view, long detail)
{
evt->view = view;
@@ -76,7 +76,7 @@
}
/* Initialise the UIEvent with namespace */
-dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, struct dom_string *namespace,
+dom_exception dom_ui_event_init_ns(dom_ui_event *evt, struct dom_string *namespace,
struct dom_string *type, bool bubble, bool cancelable,
struct dom_abstract_view *view, long detail)
{
Modified: branches/struggleyb/libdom-events/src/events/ui_event.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-events/src/e...
==============================================================================
--- branches/struggleyb/libdom-events/src/events/ui_event.h (original)
+++ branches/struggleyb/libdom-events/src/events/ui_event.h Fri Jul 31 22:17:25 2009
@@ -19,19 +19,19 @@
};
/* Constructor */
-dom_exception dom_ui_event_create(struct dom_document *doc,
+dom_exception _dom_ui_event_create(struct dom_document *doc,
struct dom_ui_event **evt);
/* Destructor */
-void dom_ui_event_destroy(struct dom_document *doc,
+void _dom_ui_event_destroy(struct dom_document *doc,
struct dom_ui_event *evt);
/* Initialise function */
-dom_exception dom_ui_event_initialise(struct dom_document *doc,
+dom_exception _dom_ui_event_initialise(struct dom_document *doc,
struct dom_ui_event *evt);
/* Finalise function */
-void dom_ui_event_finalise(struct dom_document *doc,
+void _dom_ui_event_finalise(struct dom_document *doc,
struct dom_ui_event *evt);
#endif
13 years, 8 months
- 1
- 0
r8937 struggleyb - /branches/struggleyb/libdom-remain/src/core/document.c
by netsurf＠semichrome.net
Author: struggleyb
Date: Fri Jul 31 21:38:24 2009
New Revision: 8937
URL: http://source.netsurf-browser.org?rev=8937&view=rev
Log:
Unref the id_name only when it is not NULL.
Modified:
branches/struggleyb/libdom-remain/src/core/document.c
Modified: branches/struggleyb/libdom-remain/src/core/document.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
==============================================================================
--- branches/struggleyb/libdom-remain/src/core/document.c (original)
+++ branches/struggleyb/libdom-remain/src/core/document.c Fri Jul 31 21:38:24 2009
@@ -1657,7 +1657,8 @@
*/
void _dom_document_set_id_name(dom_document *doc, struct lwc_string_s *name)
{
- lwc_context_string_unref(doc->context, doc->id_name);
+ if (doc->id_name != NULL)
+ lwc_context_string_unref(doc->context, doc->id_name);
doc->id_name = name;
lwc_context_string_ref(doc->context, name);
}
13 years, 8 months
- 1
- 0
r8936 struggleyb - in /branches/struggleyb/libdom-remain: bindings/hubbub/parser.c bindings/xml/xmlparser.c src/core/document.c src/core/document.h src/core/element.c
by netsurf＠semichrome.net
Author: struggleyb
Date: Fri Jul 31 21:32:27 2009
New Revision: 8936
URL: http://source.netsurf-browser.org?rev=8936&view=rev
Log:
Get the ID attribute name from the language binding.
Modified:
branches/struggleyb/libdom-remain/bindings/hubbub/parser.c
branches/struggleyb/libdom-remain/bindings/xml/xmlparser.c
branches/struggleyb/libdom-remain/src/core/document.c
branches/struggleyb/libdom-remain/src/core/document.h
branches/struggleyb/libdom-remain/src/core/element.c
Modified: branches/struggleyb/libdom-remain/bindings/hubbub/parser.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/bindi...
==============================================================================
--- branches/struggleyb/libdom-remain/bindings/hubbub/parser.c (original)
+++ branches/struggleyb/libdom-remain/bindings/hubbub/parser.c Fri Jul 31 21:32:27 2009
@@ -7,6 +7,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <hubbub/hubbub.h>
#include <hubbub/parser.h>
@@ -15,6 +16,8 @@
#include "parser.h"
#include "utils.h"
+
+#include "core/document.h"
#include <libwapcaplet/libwapcaplet.h>
@@ -236,6 +239,8 @@
dom_hubbub_error dom_hubbub_parser_completed(dom_hubbub_parser *parser)
{
hubbub_error err;
+ lwc_string *name = NULL;
+ lwc_error lerr;
err = hubbub_parser_completed(parser->parser);
if (err != DOM_HUBBUB_OK) {
@@ -245,6 +250,13 @@
}
parser->complete = true;
+
+ lerr = lwc_context_intern(parser->ctx, "id", strlen("id"), &name);
+ if (lerr != lwc_error_ok)
+ return HUBBUB_UNKNOWN;
+
+ _dom_document_set_id_name(parser->doc, name);
+ lwc_context_string_unref(parser->ctx, name);
return DOM_HUBBUB_OK;
}
Modified: branches/struggleyb/libdom-remain/bindings/xml/xmlparser.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/bindi...
==============================================================================
--- branches/struggleyb/libdom-remain/bindings/xml/xmlparser.c (original)
+++ branches/struggleyb/libdom-remain/bindings/xml/xmlparser.c Fri Jul 31 21:32:27 2009
@@ -297,6 +297,8 @@
dom_xml_error dom_xml_parser_completed(dom_xml_parser *parser)
{
xmlParserErrors err;
+ lwc_string *name = NULL;
+ lwc_error lerr;
err = xmlParseChunk(parser->xml_ctx, "", 0, 1);
if (err != XML_ERR_OK) {
@@ -306,6 +308,13 @@
}
parser->complete = true;
+
+ lerr = lwc_context_intern(parser->ctx, "id", strlen("id"), &name);
+ if (lerr != lwc_error_ok)
+ return DOM_XML_LIBXML_ERR | lerr;
+
+ _dom_document_set_id_name(parser->doc, name);
+ lwc_context_string_unref(parser->ctx, name);
return DOM_XML_OK;
}
Modified: branches/struggleyb/libdom-remain/src/core/document.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
==============================================================================
--- branches/struggleyb/libdom-remain/src/core/document.c (original)
+++ branches/struggleyb/libdom-remain/src/core/document.c Fri Jul 31 21:32:27 2009
@@ -143,12 +143,15 @@
doc->alloc = alloc;
doc->pw = pw;
doc->context = ctx;
+ lwc_context_ref(ctx);
err = _dom_node_initialise(&doc->base, doc, DOM_DOCUMENT_NODE,
name, NULL, NULL, NULL);
lwc_context_string_unref(ctx, name);
list_init(&doc->pending_nodes);
+
+ doc->id_name = NULL;
return err;
}
@@ -182,6 +185,9 @@
* non-zero as these data structures reference the document because
* they are held by the client. */
doc->nodelists = NULL;
+
+ lwc_context_string_unref(doc->context, doc->id_name);
+ lwc_context_unref(doc->context);
return true;
}
@@ -1639,3 +1645,19 @@
_dom_document_destroy((dom_node_internal *) doc);
}
+
+/**
+ * Set the ID attribute name of this document
+ *
+ * \param doc The document object
+ * \param name The ID name of the elements in this document
+ *
+ * @note: The lwc_context of the param 'name' must be the same one with
+ * document's, this should be assured by the client.
+ */
+void _dom_document_set_id_name(dom_document *doc, struct lwc_string_s *name)
+{
+ lwc_context_string_unref(doc->context, doc->id_name);
+ doc->id_name = name;
+ lwc_context_string_ref(doc->context, name);
+}
Modified: branches/struggleyb/libdom-remain/src/core/document.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
==============================================================================
--- branches/struggleyb/libdom-remain/src/core/document.h (original)
+++ branches/struggleyb/libdom-remain/src/core/document.h Fri Jul 31 21:32:27 2009
@@ -58,6 +58,8 @@
void *pw; /**< Pointer to client data */
struct list_entry pending_nodes; /**< The deletion pending list */
+
+ struct lwc_string_s *id_name; /**< The ID attribute's name */
};
/* Initialise the document */
@@ -238,4 +240,9 @@
dom_exception _dom_find_element_by_id(dom_node_internal *root,
struct lwc_string_s *id, struct dom_element **result);
+/* Set the ID attribute name of this document */
+void _dom_document_set_id_name(struct dom_document *doc, struct lwc_string_s *name);
+
+#define _dom_document_get_id_name(d) (d->id_name)
+
#endif
Modified: branches/struggleyb/libdom-remain/src/core/element.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
==============================================================================
--- branches/struggleyb/libdom-remain/src/core/element.c (original)
+++ branches/struggleyb/libdom-remain/src/core/element.c Fri Jul 31 21:32:27 2009
@@ -34,12 +34,6 @@
#define CHAINS_ATTRIBUTES 31
#define CHAINS_NAMESPACE 7
#define CHAINS_NS_ATTRIBUTES 31
-
-/**
- * TODO: Make the "id" definition temporarily here, in future, it should
- * be obtained from the language bindings.
- */
-#define ID_ATTRIBUTE "id"
static struct dom_element_vtable element_vtable = {
{
@@ -1652,10 +1646,9 @@
if (err != DOM_NO_ERR) {
return err;
}
-
} else {
- err = _dom_document_create_string(doc, (uint8_t *) ID_ATTRIBUTE,
- strlen(ID_ATTRIBUTE), &name);
+ err = _dom_document_create_string_from_lwcstring(doc,
+ _dom_document_get_id_name(doc), &name);
if (err != DOM_NO_ERR) {
return err;
}
13 years, 8 months
- 1
- 0
r8935 struggleyb - in /branches/struggleyb/libdom-remain: bindings/xml/ src/bootstrap/ src/core/ src/utils/
by netsurf＠semichrome.net
Author: struggleyb
Date: Fri Jul 31 21:03:48 2009
New Revision: 8935
URL: http://source.netsurf-browser.org?rev=8935&view=rev
Log:
Code style fixing. Add a "_" at the start of internal functions.
Modified:
branches/struggleyb/libdom-remain/bindings/xml/xmlparser.c
branches/struggleyb/libdom-remain/src/bootstrap/implementation.c
branches/struggleyb/libdom-remain/src/core/attr.c
branches/struggleyb/libdom-remain/src/core/attr.h
branches/struggleyb/libdom-remain/src/core/cdatasection.c
branches/struggleyb/libdom-remain/src/core/cdatasection.h
branches/struggleyb/libdom-remain/src/core/characterdata.c
branches/struggleyb/libdom-remain/src/core/characterdata.h
branches/struggleyb/libdom-remain/src/core/comment.c
branches/struggleyb/libdom-remain/src/core/comment.h
branches/struggleyb/libdom-remain/src/core/doc_fragment.c
branches/struggleyb/libdom-remain/src/core/doc_fragment.h
branches/struggleyb/libdom-remain/src/core/document.c
branches/struggleyb/libdom-remain/src/core/document.h
branches/struggleyb/libdom-remain/src/core/document_type.c
branches/struggleyb/libdom-remain/src/core/document_type.h
branches/struggleyb/libdom-remain/src/core/element.c
branches/struggleyb/libdom-remain/src/core/element.h
branches/struggleyb/libdom-remain/src/core/entity_ref.c
branches/struggleyb/libdom-remain/src/core/entity_ref.h
branches/struggleyb/libdom-remain/src/core/namednodemap.c
branches/struggleyb/libdom-remain/src/core/namednodemap.h
branches/struggleyb/libdom-remain/src/core/node.c
branches/struggleyb/libdom-remain/src/core/node.h
branches/struggleyb/libdom-remain/src/core/nodelist.c
branches/struggleyb/libdom-remain/src/core/nodelist.h
branches/struggleyb/libdom-remain/src/core/pi.c
branches/struggleyb/libdom-remain/src/core/pi.h
branches/struggleyb/libdom-remain/src/core/string.c
branches/struggleyb/libdom-remain/src/core/string.h
branches/struggleyb/libdom-remain/src/core/text.c
branches/struggleyb/libdom-remain/src/core/text.h
branches/struggleyb/libdom-remain/src/utils/resource_mgr.c
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/struggleyb/libdom-remain/bindings/xml/xmlparser.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/bindi...
Modified: branches/struggleyb/libdom-remain/src/bootstrap/implementation.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/b...
Modified: branches/struggleyb/libdom-remain/src/core/attr.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/attr.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/cdatasection.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/cdatasection.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/characterdata.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/characterdata.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/comment.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/comment.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/doc_fragment.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/doc_fragment.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/document.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/document.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/document_type.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/document_type.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/element.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/element.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/entity_ref.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/entity_ref.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/namednodemap.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/namednodemap.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/node.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/node.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/nodelist.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/nodelist.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/pi.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/pi.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/string.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/string.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/text.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/core/text.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
Modified: branches/struggleyb/libdom-remain/src/utils/resource_mgr.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/u...
13 years, 8 months
- 1
- 0
r8934 struggleyb - in /branches/struggleyb/libdom-remain/src: bootstrap/init_fini.c core/document.c core/document.h utils/namespace.h
by netsurf＠semichrome.net
Author: struggleyb
Date: Fri Jul 31 20:53:32 2009
New Revision: 8934
URL: http://source.netsurf-browser.org?rev=8934&view=rev
Log:
Remove dom_document_module_initialise/finalise and the c string array.
Modified:
branches/struggleyb/libdom-remain/src/bootstrap/init_fini.c
branches/struggleyb/libdom-remain/src/core/document.c
branches/struggleyb/libdom-remain/src/core/document.h
branches/struggleyb/libdom-remain/src/utils/namespace.h
Modified: branches/struggleyb/libdom-remain/src/bootstrap/init_fini.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/b...
==============================================================================
--- branches/struggleyb/libdom-remain/src/bootstrap/init_fini.c (original)
+++ branches/struggleyb/libdom-remain/src/bootstrap/init_fini.c Fri Jul 31 20:53:32 2009
@@ -10,7 +10,6 @@
#include <dom/bootstrap/init_fini.h>
#include <dom/bootstrap/implregistry.h>
-#include "core/document.h"
#include "utils/namespace.h"
#include "bootstrap/implementation.h"
@@ -32,11 +31,6 @@
/* Ensure we only initialise once */
if (__initialised) {
return DOM_NO_ERR;
- }
-
- err = dom_document_module_initialise(alloc, pw);
- if (err != DOM_NO_ERR) {
- return err;
}
err = _dom_namespace_initialise(alloc, pw);
@@ -83,11 +77,6 @@
return err;
}
- err = dom_document_module_finalise();
- if (err != DOM_NO_ERR) {
- return err;
- }
-
__initialised = false;
return DOM_NO_ERR;
Modified: branches/struggleyb/libdom-remain/src/core/document.c
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
==============================================================================
--- branches/struggleyb/libdom-remain/src/core/document.c (original)
+++ branches/struggleyb/libdom-remain/src/core/document.c Fri Jul 31 20:53:32 2009
@@ -126,12 +126,11 @@
assert(alloc != NULL);
assert(impl != NULL);
- static const char _document_name[] = "#document";
dom_exception err;
lwc_string *name;
lwc_error lerr;
- lerr = lwc_context_intern(ctx, _document_name, 9, &name);
+ lerr = lwc_context_intern(ctx, "#document", strlen("#document"), &name);
if (lerr != lwc_error_ok)
return dom_exception_from_lwc_error(lerr);
@@ -323,14 +322,14 @@
dom_exception _dom_document_create_document_fragment(struct dom_document *doc,
struct dom_document_fragment **result)
{
- static const char _document_fragment_name[] = "#document-fragment";
lwc_string *name;
dom_exception err;
lwc_error lerr;
assert(doc->context != NULL);
- lerr = lwc_context_intern(doc->context, _document_fragment_name, 18, &name);
+ lerr = lwc_context_intern(doc->context, "#document-fragment",
+ strlen("#document-fragment"), &name);
if (lerr != lwc_error_ok)
return dom_exception_from_lwc_error(lerr);
@@ -355,14 +354,13 @@
dom_exception _dom_document_create_text_node(struct dom_document *doc,
struct dom_string *data, struct dom_text **result)
{
- static const char _text_name[] = "#text";
lwc_string *name;
dom_exception err;
lwc_error lerr;
assert(doc->context != NULL);
- lerr = lwc_context_intern(doc->context, _text_name, 5, &name);
+ lerr = lwc_context_intern(doc->context, "#text", strlen("#text"), &name);
if (lerr != lwc_error_ok)
return dom_exception_from_lwc_error(lerr);
@@ -387,14 +385,13 @@
dom_exception _dom_document_create_comment(struct dom_document *doc,
struct dom_string *data, struct dom_comment **result)
{
- static const char _comment_name[] = "#comment";
lwc_string *name;
dom_exception err;
lwc_error lerr;
assert(doc->context != NULL);
- lerr = lwc_context_intern(doc->context, _comment_name, 8, &name);
+ lerr = lwc_context_intern(doc->context, "#comment", strlen("#comment"), &name);
if (lerr != lwc_error_ok)
return dom_exception_from_lwc_error(lerr);
@@ -420,14 +417,14 @@
dom_exception _dom_document_create_cdata_section(struct dom_document *doc,
struct dom_string *data, struct dom_cdata_section **result)
{
- static const char _cdata_name[] = "#cdata-section";
lwc_string *name;
dom_exception err;
lwc_error lerr;
assert(doc->context != NULL);
- lerr = lwc_context_intern(doc->context, _cdata_name, 14, &name);
+ lerr = lwc_context_intern(doc->context, "#cdata-section",
+ strlen("#cdata-section"), &name);
if (lerr != lwc_error_ok)
return dom_exception_from_lwc_error(lerr);
Modified: branches/struggleyb/libdom-remain/src/core/document.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/c...
==============================================================================
--- branches/struggleyb/libdom-remain/src/core/document.h (original)
+++ branches/struggleyb/libdom-remain/src/core/document.h Fri Jul 31 20:53:32 2009
@@ -59,14 +59,6 @@
struct list_entry pending_nodes; /**< The deletion pending list */
};
-
-
-/* Initialise the document module */
-dom_exception dom_document_module_initialise(dom_alloc alloc, void *pw);
-
-/* Finalise the document module */
-dom_exception dom_document_module_finalise(void);
-
/* Initialise the document */
dom_exception dom_document_initialise(struct dom_document *doc,
Modified: branches/struggleyb/libdom-remain/src/utils/namespace.h
URL: http://source.netsurf-browser.org/branches/struggleyb/libdom-remain/src/u...
==============================================================================
--- branches/struggleyb/libdom-remain/src/utils/namespace.h (original)
+++ branches/struggleyb/libdom-remain/src/utils/namespace.h Fri Jul 31 20:53:32 2009
@@ -30,10 +30,10 @@
struct dom_string **prefix, struct dom_string **localname);
/* Get the XML prefix dom_string */
-dom_string *_dom_namespace_get_xml_prefix(void);
+struct dom_string *_dom_namespace_get_xml_prefix(void);
/* Get the XMLNS prefix dom_string */
-dom_string *_dom_namespace_get_xmlns_prefix(void);
+struct dom_string *_dom_namespace_get_xmlns_prefix(void);
#endif
13 years, 8 months
- 1
- 0
r8933 jmb - /trunk/netsurf/render/layout.c
by netsurf＠semichrome.net
Author: jmb
Date: Fri Jul 31 19:26:02 2009
New Revision: 8933
URL: http://source.netsurf-browser.org?rev=8933&view=rev
Log:
Prevent negative calculated width of replaced inlines in layout_minmax_line().
Modified:
trunk/netsurf/render/layout.c
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=8933&...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Fri Jul 31 19:26:02 2009
@@ -2678,7 +2678,9 @@
&fixed, &frac);
calculate_mbp_width(b->style, RIGHT, true, true, true,
&fixed, &frac);
- width += fixed;
+
+ if (0 < width + fixed)
+ width += fixed;
} else {
/* form control with no object */
if (width == AUTO)
13 years, 8 months
- 1
- 0