[hackers] [surf] renaming newproc to newwindow; make it usable within keys; begin implementing contextmenu || Enno Boland (tox)

changeset: 124:ffd764d75ccd
user: Enno Boland (tox) <tox_AT_s01.de>
date: Fri Oct 16 14:19:25 2009 +0200
files: config.def.h surf.c
description:
renaming newproc to newwindow; make it usable within keys; begin implementing contextmenu

diff -r 483ffcf1304e -r ffd764d75ccd config.def.h
--- a/config.def.h Fri Oct 16 14:03:39 2009 +0200
+++ b/config.def.h Fri Oct 16 14:19:25 2009 +0200
@@ -35,3 +35,9 @@
     { 0, GDK_Return, hideurl, { 0 }, UrlBar },
 };
 
+static Context context[] = {
+ { "<===", navigate, { .i = -1 } }
+ { "===>", navigate, { .i = -1 } }
+ { "Stop", navigate, { .i = -1 } }
+ { "Open", navigate, { .i = -1 } }
+};
diff -r 483ffcf1304e -r ffd764d75ccd surf.c
--- a/surf.c Fri Oct 16 14:03:39 2009 +0200
+++ b/surf.c Fri Oct 16 14:19:25 2009 +0200
@@ -82,6 +82,7 @@
 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, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c);
 static void destroyclient(Client *c);
@@ -101,7 +102,7 @@
 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 *c);
 static void pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
@@ -174,6 +175,12 @@
                 gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
 }
 
+void
+context(WebKitWebView *v, GtkMenu *m, Client *c) {
+
+ //gtk_menu_shell_append ((GtkMenuShell *)(menu),(child))
+}
+
 gchar *
 copystr(gchar **str, const gchar *src) {
         gchar *tmp;
@@ -208,9 +215,11 @@
 
 gboolean
 decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
+ Arg arg;
         if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
                 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;
@@ -426,6 +435,7 @@
         g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
         g_signal_connect_after(session, "request-started", G_CALLBACK(request), c);
         g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
+ g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 
         /* urlbar */
         c->urlbar = gtk_entry_new();
@@ -484,10 +494,10 @@
 }
 
 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;
@@ -501,10 +511,10 @@
         }
         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 *
Received on Fri Oct 16 2009 - 13:32:56 UTC