trenaming newproc to newwindow; make it usable within keys; begin implementing … | |
git clone git://src.adamsgaard.dk/surf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit e3690dffed6b6ebd09f53d70d05af6c8504aa0f1 | |
parent f62505a47ab046d5f31ae0d1ec652b94749b785e | |
Author: Enno Boland (tox) <[email protected]> | |
Date: Fri, 16 Oct 2009 14:19:25 +0200 | |
renaming newproc to newwindow; make it usable within keys; begin implementing c… | |
Diffstat: | |
M config.def.h | 6 ++++++ | |
M surf.c | 24 +++++++++++++++++------- | |
2 files changed, 23 insertions(+), 7 deletions(-) | |
--- | |
diff --git a/config.def.h b/config.def.h | |
t@@ -35,3 +35,9 @@ static Key keys[] = { | |
{ 0, GDK_Return, hideurl, { 0 }, UrlBar }, | |
}; | |
+static Context context[] = { | |
+ { "<===", navigate, { .i = -1 } } | |
+ { "===>", navigate, { .i = -1 } } | |
+ { "Stop", navigate, { .i = -1 } } | |
+ { "Open", navigate, { .i = -1 } } | |
+}; | |
diff --git a/surf.c b/surf.c | |
t@@ -82,6 +82,7 @@ static gchar *progname; | |
static gchar *buildpath(const gchar *path); | |
static void cleanup(void); | |
static void clipboard(Client *c, const Arg *arg); | |
+static void context(WebKitWebView *v, GtkMenu *m, Client *c); | |
static gchar *copystr(gchar **str, const gchar *src); | |
static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, WebKitNetwor… | |
static void destroyclient(Client *c); | |
t@@ -101,7 +102,7 @@ static void loadstart(WebKitWebView *v, WebKitWebFrame *f,… | |
static void loaduri(Client *c, const Arg *arg); | |
static void navigate(Client *c, const Arg *arg); | |
static Client *newclient(void); | |
-static void newproc(const gchar *url); | |
+static void newwindow(Client *c, const Arg *arg); | |
static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client… | |
static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d); | |
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d… | |
t@@ -174,6 +175,12 @@ clipboard(Client *c, const Arg *arg) { | |
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY… | |
} | |
+void | |
+context(WebKitWebView *v, GtkMenu *m, Client *c) { | |
+ | |
+ //gtk_menu_shell_append ((GtkMenuShell *)(menu),(child)) | |
+} | |
+ | |
gchar * | |
copystr(gchar **str, const gchar *src) { | |
gchar *tmp; | |
t@@ -208,9 +215,11 @@ destroyclient(Client *c) { | |
gboolean | |
decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, … | |
+ Arg arg; | |
if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION… | |
webkit_web_policy_decision_ignore(p); | |
- newproc(webkit_network_request_get_uri(r)); | |
+ arg.v = (void *)webkit_network_request_get_uri(r); | |
+ newwindow(NULL, &arg); | |
return TRUE; | |
} | |
return FALSE; | |
t@@ -426,6 +435,7 @@ newclient(void) { | |
g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBAC… | |
g_signal_connect_after(session, "request-started", G_CALLBACK(request)… | |
g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focus… | |
+ g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(conte… | |
/* urlbar */ | |
c->urlbar = gtk_entry_new(); | |
t@@ -484,10 +494,10 @@ newclient(void) { | |
} | |
void | |
-newproc(const gchar *url) { | |
+newwindow(Client *c, const Arg *arg) { | |
guint i = 0, urlindex; | |
const gchar *cmd[7]; | |
- const Arg arg = { .v = (void *)cmd }; | |
+ const Arg a = { .v = (void *)cmd }; | |
gchar tmp[64]; | |
cmd[i++] = progname; | |
t@@ -501,10 +511,10 @@ newproc(const gchar *url) { | |
} | |
cmd[i++] = "--"; | |
urlindex = i; | |
- if(url) | |
- cmd[i++] = url; | |
+ if(arg->v) | |
+ cmd[i++] = (char *)arg->v; | |
cmd[i++] = NULL; | |
- spawn(NULL, &arg); | |
+ spawn(NULL, &a); | |
} | |
WebKitWebView * |