From 8d2811c5f9a725960aee703b21c5d8b814feac18 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Sat, 10 Jun 2023 20:10:42 -0600 Subject: add max number of tabs --- README.md | 1 + config.h | 1 + rose | Bin 47864 -> 47896 bytes rose.c | 68 ++++++++++++++++++++++++++++++++++++-------------------------- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 7af4db8..171a89e 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ You can also create a rose.desktop file so that it will show up in your desktop - Customize appearance of the browser through css - Built-in rose-mklink script for in-shell static links - Optional adblocking through [wyebadblock](https://github.com/jun7/wyebadblock) +- Max number of tabs (by default 8), configurable. - Plugin system, seeded with: - Libre redirect: Redirect annoying websites to open source frontends - Readability: Strip webpages of unnecessary elements for ease of reading with a custom shortcut diff --git a/config.h b/config.h index d8cb22d..05fad90 100644 --- a/config.h +++ b/config.h @@ -21,6 +21,7 @@ #define ZOOM_VAL .1 /* Zooming value in zoomin/zoomout functions */ #define BG_COLOR "#FEFEFE" /* "FEFEFE", "#1E1E2E" */ #define DEBUG false +#define MAX_NUM_TABS 8 // set to 0 or false if you want unlimited tabs, or look at the relevant rose.c code. typedef enum { goback, diff --git a/rose b/rose index 5c165d2..8a271d3 100755 Binary files a/rose and b/rose differ diff --git a/rose.c b/rose.c index 5aedc6a..8d7ce42 100644 --- a/rose.c +++ b/rose.c @@ -16,6 +16,7 @@ int LIBRE_REDIRECT_ENABLED = true; int READABILITY_ENABLED = true; int CUSTOM_STYLE_ENABLED = true; int CUSTOM_USER_AGENT = true; +int NUM_TABS = 0; // to enable plugins, // 1. Enable them: @@ -193,13 +194,18 @@ void notebook_append(GtkNotebook* notebook, const char* uri); GtkWidget* handle_create_new_tab(WebKitWebView* self, WebKitNavigationAction* navigation_action, GtkNotebook* notebook) -{ - 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; +{ + 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. @@ -210,27 +216,33 @@ GtkWidget* handle_create_new_tab(WebKitWebView* self, void notebook_append(GtkNotebook* notebook, const char* uri) { - 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); - 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); + 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); + 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) -- cgit v1.2.3