aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README4
-rw-r--r--events.c3
-rw-r--r--events.h2
-rw-r--r--uzbl-core.c7
4 files changed, 11 insertions, 5 deletions
diff --git a/README b/README
index 0be6ca9..3c7b3fc 100644
--- a/README
+++ b/README
@@ -529,6 +529,10 @@ Reported events and their specific format:
EVENT [uzbl_instance_name] ROOT_ACTIVE
+- when the include commands succesfully loads a file
+
+ EVENT [uzbl_instance_name] FILE_INCLUDED /path/to/file
+
### COMMAND LINE ARGUMENTS
diff --git a/events.c b/events.c
index 966cd15..e9f51ac 100644
--- a/events.c
+++ b/events.c
@@ -39,7 +39,8 @@ const char *event_table[LAST_EVENT] = {
"FORM_ACTIVE" ,
"ROOT_ACTIVE" ,
"FOCUS_LOST" ,
- "FOCUS_GAINED"
+ "FOCUS_GAINED" ,
+ "FILE_INCLUDED"
};
void
diff --git a/events.h b/events.h
index 9a3225b..24305e1 100644
--- a/events.h
+++ b/events.h
@@ -12,7 +12,7 @@ enum event_type {
VARIABLE_SET, FIFO_SET, SOCKET_SET,
INSTANCE_START, INSTANCE_EXIT, LOAD_PROGRESS,
LINK_UNHOVER, FORM_ACTIVE, ROOT_ACTIVE,
- FOCUS_LOST, FOCUS_GAINED,
+ FOCUS_LOST, FOCUS_GAINED, FILE_INCLUDED,
/* must be last entry */
LAST_EVENT
diff --git a/uzbl-core.c b/uzbl-core.c
index 1383cc9..5e91eb9 100644
--- a/uzbl-core.c
+++ b/uzbl-core.c
@@ -889,10 +889,7 @@ include(WebKitWebView *page, GArray *argv, GString *result) {
pe = parseenv(argv_idx(argv, 0));
if((path = find_existing_file(pe))) {
- g_free(pe);
-
GArray* lines = read_file_by_line(path);
- g_free(path);
while ((line = g_array_index(lines, gchar*, i))) {
parse_cmd_line (line, NULL);
@@ -900,7 +897,11 @@ include(WebKitWebView *page, GArray *argv, GString *result) {
g_free (line);
}
g_array_free (lines, TRUE);
+
+ send_event(FILE_INCLUDED, path, NULL);
+ g_free(path);
}
+ g_free(pe);
}
void