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

added apos p/y-patch, thanks :)

Browse source
This commit is contained in:
Enno Boland (Gottox) 2009-06-09 22:08:59 +02:00
parent a122748ae7
commit e6feabb4f6
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
surf.c
View file

@ -53,6 +53,7 @@ static void loadfile(Client *c, const gchar *f);
static void loaduri(Client *c, const gchar *uri); static void loaduri(Client *c, const gchar *uri);
static Client *newclient(); static Client *newclient();
static WebKitWebView *newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c); 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 GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
static void progresschange(WebKitWebView *view, gint p, Client *c); static void progresschange(WebKitWebView *view, gint p, Client *c);
static void setup(void); static void setup(void);
@ -198,6 +199,12 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
} }
if(ev->state & GDK_CONTROL_MASK) { if(ev->state & GDK_CONTROL_MASK) {
switch(ev->keyval) { 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:
case GDK_R: case GDK_R:
if((ev->state & GDK_SHIFT_MASK)) if((ev->state & GDK_SHIFT_MASK))
@ -399,6 +406,13 @@ newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
return n->view; return n->view;
} }
void
pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
if(text!=NULL)
loaduri((Client *)d, text);
}
GdkFilterReturn GdkFilterReturn
processx(GdkXEvent *e, GdkEvent *event, gpointer d) { processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
Client *c = (Client *)d; Client *c = (Client *)d;