Add LOAD_CANCELLED event

Split from the LOAD_ERROR event.

Author: mathstuf

README.md

@@ -1294,6 +1294,9 @@ uzbl itself and will be emitted based on what is happening within uzbl-core.
     request has been sent to the server.
 * `LOAD_PROGRESS <PROGRESS>`
   - Sent when the load percentage changes. The progress is in percentage.
+* `LOAD_CANCELLED <URI>`
+  - Sent when the user has cancelled a load (e.g., by setting the URI in the
+    middle of another load).
 * `LOAD_ERROR <URI> <CODE> <MESSAGE>`
   - Sent when WebKit has failed to load a page.
 * `LOAD_FINISH <URI>`

UPGRADING.md

@@ -280,6 +280,10 @@ for these events. Also check the event manager for built-in handlers.
   - *Rationale*: The data is available and may be useful.
   - *Porting*: Expect a second argument in any `LINK_HOVER` event
     handlers.
+* `LOAD_ERROR`
+  - *Change*: Cancelled loads are now `LOAD_CANCELLED`.
+  - *Rationale*: Better diagnostics as to why things are happening.
+  - *Porting*: Look for `LOAD_CANCELLED` for user-triggered cancellations.
 * `NEW_WINDOW`
   - *Change*: Renamed to `REQ_NEW_WINDOW`.
   - *Rationale*: Replaced with `REQ_NEW_WINDOW` for better interoperability

src/events.h

@@ -9,6 +9,7 @@
     call (LOAD_REDIRECTED),     \
     call (LOAD_COMMIT),         \
     call (LOAD_FINISH),         \
+    call (LOAD_CANCELLED),      \
     call (LOAD_ERROR),          \
     call (REQUEST_QUEUED),      \
     call (REQUEST_STARTING),    \

src/gui.c

@@ -1769,11 +1769,17 @@ send_load_status (WebKitLoadStatus status, const gchar *uri)
 gboolean
 send_load_error (const gchar *uri, GError *err)
 {
-    uzbl_events_send (LOAD_ERROR, NULL,
-        TYPE_STR, uri,
-        TYPE_INT, err->code,
-        TYPE_STR, err->message,
-        NULL);
+    if (err->code == WEBKIT_NETWORK_ERROR_CANCELLED) {
+        uzbl_events_send (LOAD_CANCELLED, NULL,
+            TYPE_STR, uri,
+            NULL);
+    } else {
+        uzbl_events_send (LOAD_ERROR, NULL,
+            TYPE_STR, uri,
+            TYPE_INT, err->code,
+            TYPE_STR, err->message,
+            NULL);
+    }
 
     return FALSE;
 }