tabbed

commit e6feabb4f6ef0a19202fb1e3b11ad8b9f4771dc7
parent a122748ae79d46b841c221669cf6a33cb6641b30
Author: Enno Boland (Gottox) <gottox@s01.de>
Date:   Tue,  9 Jun 2009 22:08:59 +0200

added apos p/y-patch, thanks :)
Diffstat:
surf.c
 | 
14
++++++++++++++

1 file changed, 14 insertions(+), 0 deletions(-)
diff --git a/surf.c b/surf.c
@@ -53,6 +53,7 @@ static void loadfile(Client *c, const gchar *f);
 static void loaduri(Client *c, const gchar *uri);
 static Client *newclient();
 static WebKitWebView *newwindow(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);
 static void progresschange(WebKitWebView *view, gint p, Client *c);
 static void setup(void);
@@ -198,6 +199,12 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
 	}
 	if(ev->state & GDK_CONTROL_MASK) {
 		switch(ev->keyval) {
+		case GDK_p:
+			gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), pasteurl, c);
+			return TRUE;
+		case GDK_y:
+			gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), webkit_web_view_get_uri(c->view), -1);
+			return TRUE;
 		case GDK_r:
 		case GDK_R:
 			if((ev->state & GDK_SHIFT_MASK))
@@ -399,6 +406,13 @@ newwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
 	return n->view;
 }
 
+ 
+void
+pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
+	if(text!=NULL)
+		loaduri((Client *)d, text);
+}
+
 GdkFilterReturn
 processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 	Client *c = (Client *)d;