Merge remote-tracking branch 'keis/focus-event' into experimental

Conflicts:
	src/callbacks.c
	src/callbacks.h

7 files changed, 53 insertions, 3 deletions

diff --git a/examples/config/config b/examples/config/config
index 029ce57..9507b95 100644
--- a/examples/config/config
+++ b/examples/config/config
@@ -83,7 +83,7 @@ set download_handler    = sync_spawn @scripts_dir/download.sh
 @on_event   LOAD_FINISH    spawn @scripts_dir/history.sh
 
 # Switch to insert mode if a (editable) html form is clicked
-@on_event   FORM_ACTIVE    @set_mode insert
+@on_event   FOCUS_ELEMENT  sh 'if [ "$1" == INPUT ]; then echo "@set_mode insert" > $UZBL_FIFO; fi' %s
 # Switch to command mode if anything else is clicked
 @on_event   ROOT_ACTIVE    @set_mode command
 
diff --git a/examples/data/scripts/follow.sh b/examples/data/scripts/follow.sh
index f08bd29..3f61488 100755
--- a/examples/data/scripts/follow.sh
+++ b/examples/data/scripts/follow.sh
@@ -10,7 +10,7 @@ shift
 case "$result" in
     XXXEMIT_FORM_ACTIVEXXX)
         # a form element was selected
-        printf 'event FORM_ACTIVE\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO"
+        printf 'event KEYCMD_CLEAR\n' > "$UZBL_FIFO"
         ;;
     XXXRESET_MODEXXX)
         # a link was selected, reset uzbl's input mode
diff --git a/src/callbacks.c b/src/callbacks.c
index 14748c4..853edb2 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1048,4 +1048,38 @@ scrollbars_policy_cb(WebKitWebView *view) {
     return TRUE;
 }
 
+void
+window_object_cleared_cb(WebKitWebView *webview, WebKitWebFrame *frame,
+    JSGlobalContextRef *context, JSObjectRef *object) {
+    (void) frame; (void) context; (void) object;
+#if WEBKIT_CHECK_VERSION (1, 3, 13)
+    // Take this opportunity to set some callbacks on the DOM
+    WebKitDOMDocument *document = webkit_web_view_get_dom_document (webview);
+    webkit_dom_event_target_add_event_listener (WEBKIT_DOM_EVENT_TARGET (document),
+        "focus", G_CALLBACK(dom_focus_cb), TRUE, NULL);
+    webkit_dom_event_target_add_event_listener (WEBKIT_DOM_EVENT_TARGET (document),
+        "blur", G_CALLBACK(dom_focus_cb), TRUE, NULL);
+#else
+	(void) webview;
+#endif
+}
+
+#if WEBKIT_CHECK_VERSION (1, 3, 13)
+void
+dom_focus_cb(WebKitDOMEventTarget *target, WebKitDOMEvent *event, gpointer user_data) {
+    (void) target; (void) user_data;
+    WebKitDOMEventTarget *etarget = webkit_dom_event_get_target (event);
+    gchar* name = webkit_dom_node_get_node_name (WEBKIT_DOM_NODE (etarget));
+    send_event (FOCUS_ELEMENT, NULL, TYPE_STR, name, NULL);
+}
+
+void
+dom_blur_cb(WebKitDOMEventTarget *target, WebKitDOMEvent *event, gpointer user_data) {
+    (void) target; (void) user_data;
+    WebKitDOMEventTarget *etarget = webkit_dom_event_get_target (event);
+    gchar* name = webkit_dom_node_get_node_name (WEBKIT_DOM_NODE (etarget));
+    send_event (BLUR_ELEMENT, NULL, TYPE_STR, name, NULL);
+}
+#endif
+
 /* vi: set et ts=4: */
diff --git a/src/callbacks.h b/src/callbacks.h
index 20eaa92..79d7910 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -225,3 +225,15 @@ scroll_horiz_cb(GtkAdjustment *adjust, void *w);
 
 gboolean
 scrollbars_policy_cb(WebKitWebView *view);
+
+void
+window_object_cleared_cb(WebKitWebView *webview, WebKitWebFrame *frame,
+	JSGlobalContextRef *context, JSObjectRef *object);
+
+#if WEBKIT_CHECK_VERSION (1, 3, 13)
+void
+dom_focus_cb(WebKitDOMEventTarget *target, WebKitDOMEvent *event, gpointer user_data);
+
+void
+dom_blur_cb(WebKitDOMEventTarget *target, WebKitDOMEvent *event, gpointer user_data);
+#endif
diff --git a/src/events.c b/src/events.c
index 62d6414..05c3da6 100644
--- a/src/events.c
+++ b/src/events.c
@@ -54,7 +54,9 @@ const char *event_table[LAST_EVENT] = {
      "DOWNLOAD_PROGRESS",
      "DOWNLOAD_COMPLETE",
      "ADD_COOKIE"       ,
-     "DELETE_COOKIE"
+     "DELETE_COOKIE"    ,
+     "FOCUS_ELEMENT"    ,
+     "BLUR_ELEMENT"
 };
 
 void
diff --git a/src/events.h b/src/events.h
index 0c40206..60ea8df 100644
--- a/src/events.h
+++ b/src/events.h
@@ -25,6 +25,7 @@ enum event_type {
     PTR_MOVE, SCROLL_VERT, SCROLL_HORIZ,
     DOWNLOAD_STARTED, DOWNLOAD_PROGRESS, DOWNLOAD_COMPLETE,
     ADD_COOKIE, DELETE_COOKIE,
+    FOCUS_ELEMENT, BLUR_ELEMENT,
 
     /* must be last entry */
     LAST_EVENT
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 8cfef55..eeae2ec 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -1477,6 +1477,7 @@ create_scrolled_win() {
       "signal::populate-popup",                       (GCallback)populate_popup_cb,       NULL,
       "signal::focus-in-event",                       (GCallback)focus_cb,                NULL,
       "signal::focus-out-event",                      (GCallback)focus_cb,                NULL,
+      "signal::window-object-cleared",                (GCallback)window_object_cleared_cb,NULL,
       NULL);
 
     g_object_connect (G_OBJECT (wf),