From 98f6d5630f6be4f955e308a5c1a91749f8cf7300 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Sat, 17 Jun 2023 00:29:27 -0600 Subject: alerts v2, formatting --- rose.c | 125 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 62 insertions(+), 63 deletions(-) (limited to 'rose.c') diff --git a/rose.c b/rose.c index f764f6c..bb6f6a0 100644 --- a/rose.c +++ b/rose.c @@ -98,20 +98,19 @@ void load_uri(WebKitWebView* view, const char* uri) if (g_str_has_prefix(uri, "http://") || g_str_has_prefix(uri, "https://") || g_str_has_prefix(uri, "file://") || g_str_has_prefix(uri, "about:")) { webkit_web_view_load_uri(view, uri); } else { - // Check for shortcuts - int l = SHORTCUT_N + strlen(uri) + 1; - char uri_expanded[l]; - str_init(uri_expanded, l); - int check = shortcut_expand(uri, uri_expanded); - if (check == 2) { - webkit_web_view_load_uri(view, uri_expanded); - } else { - // Feed into search engine. - char tmp[strlen(uri) + strlen(SEARCH)]; - snprintf(tmp, sizeof(tmp), SEARCH, uri); - webkit_web_view_load_uri(view, tmp); - } - + // Check for shortcuts + int l = SHORTCUT_N + strlen(uri) + 1; + char uri_expanded[l]; + str_init(uri_expanded, l); + int check = shortcut_expand(uri, uri_expanded); + if (check == 2) { + webkit_web_view_load_uri(view, uri_expanded); + } else { + // Feed into search engine. + char tmp[strlen(uri) + strlen(SEARCH)]; + snprintf(tmp, sizeof(tmp), SEARCH, uri); + webkit_web_view_load_uri(view, tmp); + } } } @@ -194,18 +193,18 @@ void notebook_append(GtkNotebook* notebook, const char* uri); GtkWidget* handle_create_new_tab(WebKitWebView* self, WebKitNavigationAction* navigation_action, GtkNotebook* notebook) -{ - if(NUM_TABS < MAX_NUM_TABS || NUM_TABS == 0){ - WebKitURIRequest* uri_request = webkit_navigation_action_get_request(navigation_action); - const char* uri = webkit_uri_request_get_uri(uri_request); - printf("Creating new window: %s\n", uri); - notebook_append(notebook, uri); - gtk_notebook_set_show_tabs(notebook, true); - return NULL; - } else { - webkit_web_view_run_javascript(notebook_get_webview(notebook), - "alert('Too many tabs, not opening a new one')", NULL, NULL, NULL); - } +{ + if (NUM_TABS < MAX_NUM_TABS || NUM_TABS == 0) { + WebKitURIRequest* uri_request = webkit_navigation_action_get_request(navigation_action); + const char* uri = webkit_uri_request_get_uri(uri_request); + printf("Creating new window: %s\n", uri); + notebook_append(notebook, uri); + gtk_notebook_set_show_tabs(notebook, true); + return NULL; + } else { + webkit_web_view_run_javascript(notebook_get_webview(notebook), + "alert('Too many tabs, not opening a new one')", NULL, NULL, NULL); + } /* WebKitGTK documentation recommends returning the new webview. * I imagine that this might allow e.g., to go back in a new tab * or generally to keep track of history. @@ -216,42 +215,42 @@ GtkWidget* handle_create_new_tab(WebKitWebView* self, void notebook_append(GtkNotebook* notebook, const char* uri) { - if(NUM_TABS < MAX_NUM_TABS || NUM_TABS == 0){ - GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(window)); - GdkVisual* rgba_visual = gdk_screen_get_rgba_visual(screen); - GdkRGBA rgba; - - gdk_rgba_parse(&rgba, BG_COLOR); - - WebKitWebView* view = webview_new(); - - gtk_widget_set_visual(GTK_WIDGET(window), rgba_visual); - g_signal_connect(view, "load_changed", G_CALLBACK(load_changed), notebook); - g_signal_connect(view, "create", G_CALLBACK(handle_create_new_tab), notebook); - - int n = gtk_notebook_append_page(notebook, GTK_WIDGET(view), NULL); - gtk_notebook_set_tab_reorderable(notebook, GTK_WIDGET(view), true); - gtk_widget_show_all(GTK_WIDGET(window)); - gtk_widget_hide(GTK_WIDGET(bar)); - webkit_web_view_set_background_color(view, &rgba); - load_uri(view, (uri) ? uri : HOME); - - if (CUSTOM_STYLE_ENABLED) { - char* style_js = malloc(STYLE_N + 1); - read_style_js(style_js); - webkit_web_view_run_javascript(notebook_get_webview(notebook), style_js, - NULL, NULL, NULL); - free(style_js); - } - - gtk_notebook_set_current_page(notebook, n); - gtk_notebook_set_tab_label_text(notebook, GTK_WIDGET(view), "-"); - webkit_web_view_set_zoom_level(view, ZOOM); - NUM_TABS+=1; - } else { - webkit_web_view_run_javascript(notebook_get_webview(notebook), - "alert('Too many tabs, not opening a new one')", NULL, NULL, NULL); - } + if (NUM_TABS < MAX_NUM_TABS || NUM_TABS == 0) { + GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(window)); + GdkVisual* rgba_visual = gdk_screen_get_rgba_visual(screen); + GdkRGBA rgba; + + gdk_rgba_parse(&rgba, BG_COLOR); + + WebKitWebView* view = webview_new(); + + gtk_widget_set_visual(GTK_WIDGET(window), rgba_visual); + g_signal_connect(view, "load_changed", G_CALLBACK(load_changed), notebook); + g_signal_connect(view, "create", G_CALLBACK(handle_create_new_tab), notebook); + + int n = gtk_notebook_append_page(notebook, GTK_WIDGET(view), NULL); + gtk_notebook_set_tab_reorderable(notebook, GTK_WIDGET(view), true); + gtk_widget_show_all(GTK_WIDGET(window)); + gtk_widget_hide(GTK_WIDGET(bar)); + webkit_web_view_set_background_color(view, &rgba); + load_uri(view, (uri) ? uri : HOME); + + if (CUSTOM_STYLE_ENABLED) { + char* style_js = malloc(STYLE_N + 1); + read_style_js(style_js); + webkit_web_view_run_javascript(notebook_get_webview(notebook), style_js, + NULL, NULL, NULL); + free(style_js); + } + + gtk_notebook_set_current_page(notebook, n); + gtk_notebook_set_tab_label_text(notebook, GTK_WIDGET(view), "-"); + webkit_web_view_set_zoom_level(view, ZOOM); + NUM_TABS += 1; + } else { + webkit_web_view_run_javascript(notebook_get_webview(notebook), + "alert('Too many tabs, not opening a new one')", NULL, NULL, NULL); + } } void show_bar(GtkNotebook* notebook) @@ -338,7 +337,7 @@ int handle_key(func id, GtkNotebook* notebook) case close_tab: gtk_notebook_remove_page(notebook, gtk_notebook_get_current_page(notebook)); - NUM_TABS-=1; + NUM_TABS -= 1; switch (gtk_notebook_get_n_pages(notebook)) { case 0: -- cgit v1.2.3