diff options
| -rw-r--r-- | sb.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -25,6 +25,7 @@ typedef struct tab { static struct { WebKitWebSettings *webkitsettings; + WebKitWebWindowFeatures *webkitwindowfeatures; gboolean hide; GtkWidget *win; GtkWidget *bar; @@ -162,6 +163,7 @@ gtk_entry_set_text (GTK_ENTRY (w.bar), uri); FILE *history = fopen(g_strconcat(g_get_home_dir(), DEFAULT_HISTORY_FILE, NULL), "a+"); fprintf(history, "%s \n", uri); fclose(history); + } @@ -198,10 +200,10 @@ static void tab_zoom (gboolean b) { /* if the bar isn't visible, show it and set the w.hide flag to TRUE*/ static void grab_bar( ) { if(!gtk_widget_get_visible(w.bar)) { - gtk_widget_grab_focus(GTK_WIDGET(w.bar)); gtk_widget_show(w.bar); w.hide = TRUE; } + gtk_widget_grab_focus(GTK_WIDGET(w.bar)); } @@ -246,7 +248,8 @@ gint(current) = gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook)); /* when a new tab is requested, return the t->view */ WebKitWebView * tab_new_requested(WebKitWebView *v, WebKitWebFrame *f) { - tab_new(TRUE); + puts("lol"); + tab_new(FALSE); struct tab *t = get_tab(NULL, gtk_notebook_get_current_page(GTK_NOTEBOOK(w.notebook))); return t->view; } @@ -291,11 +294,12 @@ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(w.notebook), FALSE); } else { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(w.notebook), TRUE); } g_object_set(G_OBJECT(w.webkitsettings), "enable-page-cache", TRUE, NULL); +g_object_set(G_OBJECT(w.webkitwindowfeatures), "scrollbar-visible", FALSE, NULL); g_object_set(G_OBJECT(w.webkitsettings), "enable-java-applet", FALSE, NULL); g_object_set(G_OBJECT(w.webkitsettings), "user-stylesheet-uri", "file:///home/calvin/.surf/style.css", NULL); //webkit_web_view_set_settings (WEBKIT_WEB_VIEW(t->view), w.webkitsettings); gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, ""); -gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_NEVER, GTK_POLICY_NEVER); +gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); webkit_web_view_set_zoom_level(t->view, .80); @@ -315,6 +319,7 @@ if (!b) { gtk_notebook_set_current_page(GTK_NOTEBOOK(w.notebook), index); } gtk_widget_grab_focus(w.bar); } + /* call the history command. should we do it ASYNC?*/ static void history_command() { gchar *returned; @@ -372,7 +377,7 @@ gtk_box_pack_start(GTK_BOX(w.vbox), w.status, FALSE, FALSE, 0); w.win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size(GTK_WINDOW(w.win), 800, 800); w.webkitsettings = webkit_web_settings_new(); - +w.webkitwindowfeatures = webkit_web_window_features_new(); tab_new(FALSE); g_signal_connect (G_OBJECT (w.search), "activate", G_CALLBACK (search), GINT_TO_POINTER(1)); @@ -425,7 +430,7 @@ return FALSE; } /* main function */ -int main (int argc,- char* argv[]) { +int main (int argc, char* argv[]) { gtk_init (&argc, &argv); window_setup(); |