From b69fdc25af59f23a4219f94e645370dc00dd6d74 Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Tue, 14 Feb 2012 11:41:17 -0500 Subject: huh --- callbacks.c | 3 +++ config.mk | 2 +- sb.c | 23 ++++++++++++++--------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/callbacks.c b/callbacks.c index 39556f7..f91d80c 100644 --- a/callbacks.c +++ b/callbacks.c @@ -7,6 +7,7 @@ #include #include "defaults.h" #include "callbacks.h" + #include "sb.h" @@ -19,6 +20,8 @@ if ( (event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK ) { case GDK_KEY_l: grab_bar(); return TRUE; break; case GDK_KEY_f: show_search(TRUE); return TRUE; break; case GDK_KEY_g: tab_and_go(); return TRUE; break; + case GDK_KEY_Back: cb_go(FALSE); return TRUE; break; + case GDK_KEY_Forward: cb_go(TRUE); return TRUE; break; case GDK_KEY_comma: cb_go(FALSE); return TRUE; break; case GDK_KEY_period: cb_go(TRUE); return TRUE; break; case GDK_KEY_o: history_command(); return TRUE; break; diff --git a/config.mk b/config.mk index 212d9ca..79710fb 100644 --- a/config.mk +++ b/config.mk @@ -18,7 +18,7 @@ LIBS = -L/usr/lib -lc ${GTKLIB} # flags CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} CFLAGS = -std=c99 -O2 -Wall -march=native ${INCS} ${CPPFLAGS} -LDFLAGS = -s -O1 ${LIBS} +LDFLAGS = ${LIBS} # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" diff --git a/sb.c b/sb.c index 1e099f0..4a503d4 100644 --- a/sb.c +++ b/sb.c @@ -43,18 +43,21 @@ if(b) { /* Basic reload function */ void tab_reload(gboolean b) { + struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(w.notebook)); + if(b) { -webkit_web_view_reload(t->view); -} -else { -webkit_web_view_reload_bypass_cache(t->view); -} + webkit_web_view_reload(t->view); + } + else { + webkit_web_view_reload_bypass_cache(t->view); + } } /* close tab, and quit if there are no tabs */ void tab_close() { + struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(w.notebook)); gtk_notebook_remove_page(w.notebook, gtk_notebook_get_current_page(w.notebook)); g_free(t); @@ -64,7 +67,10 @@ if(gtk_notebook_get_n_pages(w.notebook) == 1) { gtk_widget_grab_focus(gtk_notebook_get_nth_page(w.notebook, gtk_notebook_get_current_page(w.notebook))); focus_view(); } -if (gtk_notebook_get_n_pages(w.notebook) == 0) { gtk_main_quit(); } + +if(gtk_notebook_get_n_pages(w.notebook) == 0) { + gtk_main_quit(); + } } @@ -87,7 +93,7 @@ u = g_strrstr(uri, "://") ? g_strdup(uri) : g_strdup_printf("http://%s", uri); webkit_web_view_load_uri(t->view, u); g_free(u); -}; +} /*increase or decrease the zoom of the page */ @@ -202,7 +208,7 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_NEVER, stylesheet = g_strconcat("file://", g_get_home_dir(), "/", DEFAULT_STYLE_SHEET, NULL); -g_object_set(G_OBJECT(w.webkitsettings), "enable-page-cache", TRUE, +g_object_set(G_OBJECT(w.webkitsettings), "disable-page-cache", TRUE, "enable-java-applet", FALSE, "user-stylesheet-uri", stylesheet , NULL); g_free(stylesheet); @@ -278,7 +284,6 @@ gtk_notebook_set_scrollable(w.notebook, TRUE); gtk_notebook_set_show_border(w.notebook, FALSE); //gtk_notebook_set_tab_border(w.notebook, 0); -gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(w.status), FALSE); gtk_box_pack_start(GTK_BOX (w.vbox), w.bar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(w.vbox), GTK_WIDGET(w.notebook), TRUE, TRUE, 0); -- cgit v1.2.1