summaryrefslogtreecommitdiff
path: root/monkey
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-01-11 22:34:12 +0000
committerVincent Sanders <vince@kyllikki.org>2014-01-11 22:34:12 +0000
commitc8496df3df7d059528f2d5e735be5c55bfa75ef6 (patch)
tree7979e63f7e548c7a9d6bb024afde7b1bc785ff44 /monkey
parentd3c392c3d3b516f05fbf71020b2f6774ce20ce8c (diff)
downloadnetsurf-c8496df3df7d059528f2d5e735be5c55bfa75ef6.tar.gz
netsurf-c8496df3df7d059528f2d5e735be5c55bfa75ef6.tar.bz2
move window creation and destruction into table
Diffstat (limited to 'monkey')
-rw-r--r--monkey/browser.c5
-rw-r--r--monkey/browser.h5
-rw-r--r--monkey/main.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/monkey/browser.c b/monkey/browser.c
index 73549f36a..b9e583c1f 100644
--- a/monkey/browser.c
+++ b/monkey/browser.c
@@ -88,8 +88,9 @@ monkey_kill_browser_windows(void)
}
struct gui_window *
-gui_create_browser_window(struct browser_window *bw,
- struct browser_window *clone, bool new_tab)
+gui_window_create(struct browser_window *bw,
+ struct browser_window *clone,
+ bool new_tab)
{
struct gui_window *ret = calloc(sizeof(*ret), 1);
if (ret == NULL)
diff --git a/monkey/browser.h b/monkey/browser.h
index 3ccbe7a91..0b1fd8d13 100644
--- a/monkey/browser.h
+++ b/monkey/browser.h
@@ -42,4 +42,9 @@ void monkey_window_process_reformats(void);
void monkey_window_handle_command(int argc, char **argv);
void monkey_kill_browser_windows(void);
+
+
+struct gui_window *gui_window_create(struct browser_window *bw, struct browser_window *clone, bool new_tab);
+void gui_window_destroy(struct gui_window *g);
+
#endif /* NETSURF_MONKEY_BROWSER_H */
diff --git a/monkey/main.c b/monkey/main.c
index 2e23f55d6..2ef3bb98f 100644
--- a/monkey/main.c
+++ b/monkey/main.c
@@ -55,7 +55,7 @@ nsmonkey_init_resource(const char *resource_path)
return respath;
}
-static void gui_quit(void)
+static void monkey_quit(void)
{
urldb_save_cookies(nsoption_charp(cookie_jar));
urldb_save(nsoption_charp(url_file));
@@ -114,8 +114,10 @@ static bool nslog_stream_configure(FILE *fptr)
}
static struct gui_table monkey_gui_table = {
- .poll = &monkey_poll,
- .quit = &gui_quit,
+ .poll = monkey_poll,
+ .quit = monkey_quit,
+ .window_create = gui_window_create,
+ .window_destroy = gui_window_destroy,
};
int