X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=ab16c98a86fe7032f0a4805b4ed02198f0ef7b0a;hb=03afc9d985bed1dd77576b28a74c45b0abb4804e;hp=3520684dbeab984a7a99b5858ec7f447e2e2d774;hpb=277d11037f1d5e6fafae65dcf38e5822fdef2338;p=surf.git diff --git a/surf.c b/surf.c index 3520684..ab16c98 100644 --- a/surf.c +++ b/surf.c @@ -17,14 +17,14 @@ #include #define LENGTH(x) (sizeof x / sizeof x[0]) +#define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK)) Display *dpy; Atom urlprop; typedef union Arg Arg; union Arg { const gboolean b; - const int i; - const unsigned int ui; + const gint i; const void *v; } ; @@ -68,10 +68,9 @@ gboolean embed = FALSE; gboolean showxid = FALSE; gboolean ignore_once = FALSE; extern char *optarg; -extern int optind; +extern gint optind; static void cleanup(void); -static void proccookies(SoupMessage *m, Client *c); static void clipboard(Client *c, const Arg *arg); static void destroyclient(Client *c); static void destroywin(GtkWidget* w, Client *c); @@ -95,6 +94,7 @@ 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 print(Client *c, const Arg *arg); +static void proccookies(SoupMessage *m, Client *c); static void progresschange(WebKitWebView *view, gint p, Client *c); static void request(SoupSession *s, SoupMessage *m, Client *c); static void reload(Client *c, const Arg *arg); @@ -103,7 +103,9 @@ static void setcookie(char *name, char *val, char *dom, char *path, long exp); static void setup(); static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c); +static void scroll(Client *c, const Arg *arg); static void searchtext(Client *c, const Arg *arg); +static void source(Client *c, const Arg *arg); static void showsearch(Client *c, const Arg *arg); static void showurl(Client *c, const Arg *arg); static void stop(Client *c, const Arg *arg); @@ -120,21 +122,6 @@ cleanup(void) { destroyclient(clients); } -void -proccookies(SoupMessage *m, Client *c) { - GSList *l; - SoupCookie *co; - long t; - - rereadcookies(); - for (l = soup_cookies_from_response(m); l; l = l->next){ - co = (SoupCookie *)l->data; - t = co->expires ? soup_date_to_time_t(co->expires) : 0; - setcookie(co->name, co->value, co->domain, co->value, t); - } - g_slist_free(l); -} - void clipboard(Client *c, const Arg *arg) { gboolean paste = *(gboolean *)arg; @@ -177,30 +164,24 @@ die(char *str) { void drawindicator(Client *c) { - GtkWidget *w; gint width; - GdkGC *gc; gchar *uri; - + GtkWidget *w; + GdkGC *gc; + GdkColor fg; uri = geturi(c); w = c->indicator; width = c->progress * w->allocation.width / 100; - gc = gdk_gc_new(w->window); - - if(strstr(uri, "https://") == uri) - gdk_gc_set_rgb_fg_color(gc, &progress_trust); - else - gdk_gc_set_rgb_fg_color(gc, &progress); + gdk_color_parse(strstr(uri, "https://") == uri ? + progress_trust : progress, &fg); + gdk_gc_set_rgb_fg_color(gc, &fg); gdk_draw_rectangle(w->window, w->style->bg_gc[GTK_WIDGET_STATE(w)], - TRUE, - 0, 0, w->allocation.width, w->allocation.height); - gdk_draw_rectangle(w->window, - gc, - TRUE, - 0, 0, width, w->allocation.height); + TRUE, 0, 0, w->allocation.width, w->allocation.height); + gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width, + w->allocation.height); g_object_unref(gc);/*g_free(gc);*/ } @@ -216,7 +197,7 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) { status = webkit_download_get_status(c->download); if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) { - c->progress = (int)(webkit_download_get_progress(c->download)*100); + c->progress = (gint)(webkit_download_get_progress(c->download)*100); } update(c, NULL); } @@ -270,7 +251,7 @@ hideurl(Client *c, const Arg *arg) { gboolean keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { - unsigned int i, focus; + guint i, focus; gboolean processed = FALSE; if(ev->type != GDK_KEY_PRESS) @@ -282,8 +263,9 @@ keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { else focus = BROWSER; for(i = 0; i < LENGTH(keys); i++) { - if(focus & keys[i].focus && ev->keyval == keys[i].keyval && - (ev->state == keys[i].mod || ev->state & keys[i].mod) + if(focus & keys[i].focus + && gdk_keyval_to_lower(ev->keyval) == keys[i].keyval + && CLEANMASK(ev->state) == keys[i].mod && keys[i].func) { keys[i].func(c, &(keys[i].arg)); processed = TRUE; @@ -449,8 +431,11 @@ newclient(void) { c->title = NULL; c->next = clients; clients = c; - if(showxid) - printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); + if(showxid) { + gdk_display_sync(gtk_widget_get_display(c->win)); + printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); + fflush(NULL); + } return c; } @@ -473,7 +458,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { Client *c = (Client *)d; XPropertyEvent *ev; Atom adummy; - int idummy; + gint idummy; unsigned long ldummy; unsigned char *buf = NULL; Arg arg; @@ -501,6 +486,21 @@ print(Client *c, const Arg *arg) { webkit_web_frame_print(webkit_web_view_get_main_frame(c->view)); } +void +proccookies(SoupMessage *m, Client *c) { + GSList *l; + SoupCookie *co; + long t; + + rereadcookies(); + for (l = soup_cookies_from_response(m); l; l = l->next){ + co = (SoupCookie *)l->data; + t = co->expires ? soup_date_to_time_t(co->expires) : 0; + setcookie(co->name, co->value, co->domain, co->value, t); + } + g_slist_free(l); +} + void progresschange(WebKitWebView* view, gint p, Client *c) { c->progress = p; @@ -530,6 +530,19 @@ rereadcookies() { filename = g_build_filename(home, ".surf", "cookies", NULL); } +void +scroll(Client *c, const Arg *arg) { + gdouble v; + GtkAdjustment *a; + + a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(c->scroll)); + v = gtk_adjustment_get_value(a); + v += gtk_adjustment_get_step_increment(a) * arg->i; + v = MAX(v, 0.0); + v = MIN(v, gtk_adjustment_get_upper(a) - gtk_adjustment_get_page_size(a)); + gtk_adjustment_set_value(a, v); +} + void setcookie(char *name, char *val, char *dom, char *path, long exp) { @@ -549,6 +562,16 @@ showsearch(Client *c, const Arg *arg) { gtk_widget_grab_focus(c->searchbar); } +void +source(Client *c, const Arg *arg) { + Arg a = { .b = FALSE }; + /*gboolean s; + + s = webkit_web_view_get_view_source_mode(c->view); + webkit_web_view_set_view_source_mode(c->view, c->source);*/ + reload(c, &a); +} + void searchtext(Client *c, const Arg *arg) { gboolean forward = *(gboolean *)arg; @@ -622,7 +645,7 @@ zoom(Client *c, const Arg *arg) { int main(int argc, char *argv[]) { SoupSession *s; Client *c; - int o; + gint o; const gchar *home, *filename; Arg arg; @@ -661,8 +684,6 @@ int main(int argc, char *argv[]) { /* make dirs */ home = g_get_home_dir(); - filename = g_build_filename(home, ".surf", NULL); - g_mkdir_with_parents(filename, 0711); filename = g_build_filename(home, ".surf", "dl", NULL); g_mkdir_with_parents(filename, 0755);