nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

opening new windows works now.

Browse source
This commit is contained in:
Enno Boland (Gottox) 2009-06-06 17:26:43 +02:00
parent 58322c0b11
commit 20c257e90c
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
surf.c
View file

@ -45,7 +45,8 @@ static void progresschange(WebKitWebView *view, gint p, gpointer d);
static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d); static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d); static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d);
static void destroyclient(Client *c); static void destroyclient(Client *c);
static gboolean newwindow(WebKitWebView *view, WebKitWebFrame *f, WebKitWebView newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d);
static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f,
WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
WebKitWebPolicyDecision *p, gpointer d); WebKitWebPolicyDecision *p, gpointer d);
static gboolean download(WebKitWebView *view, GObject *o, gpointer d); static gboolean download(WebKitWebView *view, GObject *o, gpointer d);
@ -123,16 +124,19 @@ download(WebKitWebView *view, GObject *o, gpointer d) {
} }
gboolean gboolean
newwindow(WebKitWebView *view, WebKitWebFrame *f, decidewindow(WebKitWebView *view, WebKitWebFrame *f,
WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
WebKitWebPolicyDecision *p, gpointer d) { WebKitWebPolicyDecision *p, gpointer d) {
/* TODO */ /* TODO */
puts("new");
Client *c = newclient();
webkit_web_view_load_request(c->view, r);
return TRUE; return TRUE;
} }
WebKitWebView newwindow(WebKitWebView *v, WebKitWebFrame *f, gpointer d) {
/* TODO */
Client *c = newclient();
return *c->view;
}
void void
linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) { linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
Client *c = (Client *)d; Client *c = (Client *)d;
@ -316,7 +320,8 @@ newclient(void) {
g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c); g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c); g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c); g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(newwindow), c); g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(newwindow), c);
g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c); g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c);
/* urlbar */ /* urlbar */