1 files changed, 65 insertions, 11 deletions

diff --git a/src/dom/watcher.c b/src/dom/watcher.c
index cb775c6..d515cf6 100644
--- a/src/dom/watcher.c
+++ b/src/dom/watcher.c
@@ -31,8 +31,10 @@
  * A dom watcher object
  */
 struct nsl_dom_watcher {
-	dom_document *document;
-	dom_event_listener *listener; /**< DOM event listener object */
+	dom_document *document;         /**< DOM document */
+	dom_event_listener *listener;   /**< DOM event listener object */
+	nsl_dom_watcher_cb watcher_cb;  /**< Client callback */
+	void *pw;                       /**< Client data */
 };
 
 /**
@@ -44,17 +46,65 @@ struct nsl_dom_watcher {
 static void nsl__dom_event_handler(struct dom_event *evt, void *pw)
 {
 	const struct nsl_dom_watcher *watcher = pw;
-
-	UNUSED(watcher);
+	enum nsl_dom_watcher_type type;
+	dom_event_target *node = NULL;
+	dom_string *evt_type = NULL;
+	dom_node_type node_type;
+	dom_exception exc;
 
 	nsl_dom_debug_dump_event(evt);
 
-	/* TODO: Based on event type:
-	 *         1. call to do (re)selection:
-	 *              a. all nodes?
-	 *              b. just this node?
-	 *         2. call to update layout, if needed.
-	 */
+	exc = dom_event_get_target(evt, &node);
+	if ((exc != DOM_NO_ERR) || (node == NULL)) {
+		printf("FAILED to get target node!\n");
+		goto fail;
+	}
+
+	exc = dom_node_get_node_type(node, &node_type);
+	if (exc != DOM_NO_ERR) {
+		printf("FAILED to get target node type!\n");
+		goto fail;
+	}
+
+	exc = dom_event_get_type(evt, &evt_type);
+	if ((exc != DOM_NO_ERR) || (evt_type == NULL)) {
+		printf("FAILED to get event type!\n");
+		goto fail;
+	}
+
+	if (dom_string_isequal(evt_type,
+			nsl_dom_str_node_inserted)) {
+		type = NSL_DOM_WATCHER_NODE_INSERTED;
+
+	} else if (dom_string_isequal(evt_type,
+			nsl_dom_str_node_removed)) {
+		type = NSL_DOM_WATCHER_NODE_REMOVED;
+
+	} else if (dom_string_isequal(evt_type,
+			nsl_dom_str_subtree_modified)) {
+		type = NSL_DOM_WATCHER_SUBTREE_MODIFIED;
+
+	} else if (dom_string_isequal(evt_type,
+			nsl_dom_str_attr_modified)) {
+		type = NSL_DOM_WATCHER_ATTR_MODIFIED;
+
+	} else if (dom_string_isequal(evt_type,
+			nsl_dom_str_characterdata_modified)) {
+		type = NSL_DOM_WATCHER_CHAR_DATA_MODIFIED;
+	} else {
+		printf("FAILED: unrecognised event type: '%s'",
+				dom_string_data(evt_type));
+		goto fail;
+	}
+
+	dom_string_unref(evt_type);
+
+	watcher->watcher_cb(type, node, node_type, watcher->pw);
+	return;
+
+fail:
+	if (evt_type != NULL) dom_string_unref(evt_type);
+	if (node != NULL) dom_node_unref(node);
 }
 
 
@@ -144,7 +194,9 @@ error:
 /* Exported function, documented in src/dom/watcher.h */
 nslayout_error nsl_dom_watcher_create(
 		struct nsl_dom_watcher **watcher_out,
-		dom_document *document)
+		dom_document *document,
+		nsl_dom_watcher_cb watcher_cb,
+		void *pw)
 {
 	struct nsl_dom_watcher *watcher;
 	nslayout_error err;
@@ -155,6 +207,8 @@ nslayout_error nsl_dom_watcher_create(
 	}
 
 	watcher->document = document;
+	watcher->watcher_cb = watcher_cb;
+	watcher->pw = pw;
 
 	err = nsl__dom_listener_create(&watcher->listener, watcher);
 	if (err != NSLAYOUT_OK) {