aw/surf
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add newview() and forward related views

Browse Source 
View creation is now done in a separate function.
That helps identifying the workflow and let us easily carry related
view (client) when asked by the WebKit for a new one.
This commit is contained in:
Quentin Rameau 2015-11-18 16:53:37 +01:00
parent 421486db18
commit ad538bb00a
1 changed files with 78 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
surf.c
View File

@ -155,7 +155,8 @@ static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec,
Client *c);
static void loaduri(Client *c, const Arg *arg);
static void navigate(Client *c, const Arg *arg);
static Client *newclient(void);
static Client *newclient(Client *c);
static WebKitWebView *newview(Client *c, WebKitWebView *rv);
static void showview(WebKitWebView *v, Client *c);
static void newwindow(Client *c, const Arg *arg, gboolean noembed);
static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
@ -775,12 +776,10 @@ navigate(Client *c, const Arg *arg)
}
Client *
newclient(void)
newclient(Client *rc)
{
Client *c;
WebKitWebSettings *settings;
gdouble dpi;
char *ua;
if (!(c = calloc(1, sizeof(Client))))
die("Cannot malloc!\n");
@ -788,55 +787,29 @@ newclient(void)
c->title = NULL;
c->progress = 100;
c->next = clients;
clients = c;
c->view = newview(c, rc ? rc->view : NULL);
return c;
}
WebKitWebView *
newview(Client *c, WebKitWebView *rv)
{
WebKitWebView *v;
WebKitSettings *settings;
char *ua;
/* Webview */
c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
if (rv) {
v = WEBKIT_WEB_VIEW(
webkit_web_view_new_with_related_view(rv));
} else {
v = WEBKIT_WEB_VIEW(webkit_web_view_new());
g_signal_connect(G_OBJECT(c->view),
"notify::title",
G_CALLBACK(titlechange), c);
g_signal_connect(G_OBJECT(c->view),
"hovering-over-link",
G_CALLBACK(linkhover), c);
g_signal_connect(G_OBJECT(c->view),
"geolocation-policy-decision-requested",
G_CALLBACK(geopolicyrequested), c);
g_signal_connect(G_OBJECT(c->view),
"create-web-view",
G_CALLBACK(createwindow), c);
g_signal_connect(G_OBJECT(v), "ready-to-show",
G_CALLBACK(showview), c);
g_signal_connect(G_OBJECT(c->view),
"new-window-policy-decision-requested",
G_CALLBACK(decidewindow), c);
g_signal_connect(G_OBJECT(c->view),
"mime-type-policy-decision-requested",
G_CALLBACK(decidedownload), c);
g_signal_connect(G_OBJECT(c->view),
"window-object-cleared",
G_CALLBACK(windowobjectcleared), c);
g_signal_connect(G_OBJECT(c->view),
"notify::load-status",
G_CALLBACK(loadstatuschange), c);
g_signal_connect(G_OBJECT(c->view),
"notify::progress",
G_CALLBACK(progresschange), c);
g_signal_connect(G_OBJECT(c->view),
"download-requested",
G_CALLBACK(initdownload), c);
g_signal_connect(G_OBJECT(c->view),
"button-release-event",
G_CALLBACK(buttonrelease), c);
g_signal_connect(G_OBJECT(c->view),
"context-menu",
G_CALLBACK(contextmenu), c);
g_signal_connect(G_OBJECT(c->view),
"resource-request-starting",
G_CALLBACK(beforerequest), c);
g_signal_connect(G_OBJECT(c->view),
"should-show-delete-interface-for-element",
G_CALLBACK(deletion_interface), c);
settings = webkit_web_view_get_settings(c->view);
settings = webkit_web_view_get_settings(v);
if (!(ua = getenv("SURF_USERAGENT")))
ua = useragent;
g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
@ -860,7 +833,7 @@ newclient(void)
setstyle(c, getstyle("about:blank"));
if (enableinspector) {
c->inspector = webkit_web_view_get_inspector(c->view);
c->inspector = webkit_web_view_get_inspector(v);
g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view",
G_CALLBACK(inspector_new), c);
g_signal_connect(G_OBJECT(c->inspector), "show-window",
@ -871,11 +844,54 @@ newclient(void)
G_CALLBACK(inspector_finished), c);
c->isinspecting = false;
}
}
c->next = clients;
clients = c;
g_signal_connect(G_OBJECT(v),
"notify::title",
G_CALLBACK(titlechange), c);
g_signal_connect(G_OBJECT(v),
"hovering-over-link",
G_CALLBACK(linkhover), c);
g_signal_connect(G_OBJECT(v),
"geolocation-policy-decision-requested",
G_CALLBACK(geopolicyrequested), c);
g_signal_connect(G_OBJECT(v),
"create-web-view",
G_CALLBACK(createwindow), c);
g_signal_connect(G_OBJECT(v), "ready-to-show",
G_CALLBACK(showview), c);
g_signal_connect(G_OBJECT(v),
"new-window-policy-decision-requested",
G_CALLBACK(decidewindow), c);
g_signal_connect(G_OBJECT(v),
"mime-type-policy-decision-requested",
G_CALLBACK(decidedownload), c);
g_signal_connect(G_OBJECT(v),
"window-object-cleared",
G_CALLBACK(windowobjectcleared), c);
g_signal_connect(G_OBJECT(v),
"notify::load-status",
G_CALLBACK(loadstatuschange), c);
g_signal_connect(G_OBJECT(v),
"notify::progress",
G_CALLBACK(progresschange), c);
g_signal_connect(G_OBJECT(v),
"download-requested",
G_CALLBACK(initdownload), c);
g_signal_connect(G_OBJECT(v),
"button-release-event",
G_CALLBACK(buttonrelease), c);
g_signal_connect(G_OBJECT(v),
"context-menu",
G_CALLBACK(contextmenu), c);
g_signal_connect(G_OBJECT(v),
"resource-request-starting",
G_CALLBACK(beforerequest), c);
g_signal_connect(G_OBJECT(v),
"should-show-delete-interface-for-element",
G_CALLBACK(deletion_interface), c);
return c;
return v;
}
void
@ -1589,7 +1605,8 @@ main(int argc, char *argv[])
arg.v = argv[0];
setup();
c = newclient();
c = newclient(NULL);
showview(NULL, c);
if (arg.v)
loaduri(clients, &arg);
else