open.source/rosenrot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting & tweaks pass

Browse Source
This commit is contained in:
NunoSempere 2024-03-23 17:48:42 -03:00
parent 978c7ca1cc
commit 5097a1982b
6 changed files with 174 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -19,7 +19,7 @@ include plugins/plugins.mk
# PLUGINS=./plugins/stand_in/stand_in.c
## Formatter
STYLE_BLUEPRINT="{BasedOnStyle: webkit, AllowShortIfStatementsOnASingleLine: true}"
STYLE_BLUEPRINT="{BasedOnStyle: webkit, AllowShortIfStatementsOnASingleLine: true, IndentCaseLabels: true}"
FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT)
# Runtime files

5
plugins/readability/readability.h
View File

@ -1,8 +1,5 @@
#ifndef READABILITY
#define READABILITY
#pragma once
#define READABILITY_N 88067 + 1000
void read_readability_js(char* string);
#endif

2
plugins/strings/strings.h
View File

@ -1,2 +1,4 @@
#pragma once
void str_init(char* str, int n);
int str_replace_start(const char* string, const char* target, const char* replacement, char* output);

5
plugins/style/style.h
View File

@ -1,8 +1,5 @@
#ifndef STYLE
#define STYLE
#pragma once
#define STYLE_N 7624 + 1000
void read_style_js(char* string);
#endif

43
rosenrot.c
View File

@ -41,7 +41,6 @@ void load_uri(WebKitWebView* view, const char* uri)
char tmp[strlen("https://") + strlen(uri)];
snprintf(tmp, sizeof(tmp), "https://%s", uri);
webkit_web_view_load_uri(view, tmp);
} else {
// Check for shortcuts
int l = SHORTCUT_N + strlen(uri) + 1;
@ -68,10 +67,7 @@ void redirect_if_annoying(WebKitWebView* view, const char* uri)
str_init(uri_filtered, l);
int check = libre_redirect(uri, uri_filtered);
if (check == 2) {
webkit_web_view_load_uri(view, uri_filtered);
}
if (check == 2) webkit_web_view_load_uri(view, uri_filtered);
}
}
void set_custom_style(WebKitWebView* view)
@ -90,16 +86,11 @@ void handle_signal_load_changed(WebKitWebView* self, WebKitLoadEvent load_event,
/* see <https://webkitgtk.org/reference/webkit2gtk/2.5.1/WebKitWebView.html>
*/
case WEBKIT_LOAD_STARTED:
case WEBKIT_LOAD_COMMITTED:
set_custom_style(self);
redirect_if_annoying(self, webkit_web_view_get_uri(self));
break;
case WEBKIT_LOAD_REDIRECTED:
redirect_if_annoying(self, webkit_web_view_get_uri(self));
break;
case WEBKIT_LOAD_COMMITTED:
redirect_if_annoying(self, webkit_web_view_get_uri(self));
set_custom_style(self);
break;
case WEBKIT_LOAD_FINISHED: {
/* Add gtk tab title */
const char* webpage_title = webkit_web_view_get_title(self);
@ -137,11 +128,10 @@ GtkWidget* handle_signal_create_new_tab(WebKitWebView* self,
printf("Creating new window: %s\n", uri);
notebook_create_new_tab(notebook, uri);
gtk_notebook_set_show_tabs(notebook, true);
return NULL;
} else {
webkit_web_view_evaluate_javascript(self, "alert('Too many tabs, not opening a new one')", -1, NULL, "rosenrot-alert-numtabs", NULL, NULL, NULL);
return NULL;
}
return NULL;
/*
WebKitGTK documentation recommends returning the new webview.
I imagine that this might allow e.g., to go back in a new tab
@ -171,25 +161,20 @@ WebKitWebView* create_new_webview()
contentmanager = webkit_user_content_manager_new();
cookiemanager = webkit_web_context_get_cookie_manager(web_context);
webkit_cookie_manager_set_persistent_storage(
cookiemanager, DATA_DIR "/cookies.sqlite",
WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
webkit_cookie_manager_set_persistent_storage(cookiemanager, DATA_DIR "/cookies.sqlite", WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
webkit_cookie_manager_set_accept_policy(cookiemanager,
WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
webkit_cookie_manager_set_accept_policy(cookiemanager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
if (g_file_get_contents("~/.config/rose/style.css", &style, NULL, NULL))
if (g_file_get_contents("~/.config/rose/style.css", &style, NULL, NULL)) {
webkit_user_content_manager_add_style_sheet(
contentmanager, webkit_user_style_sheet_new(style, WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, WEBKIT_USER_STYLE_LEVEL_USER, NULL, NULL));
}
return g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, "web-context",
web_context, "user-content-manager", contentmanager,
NULL);
return g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, "web-context", web_context, "user-content-manager", contentmanager, NULL);
}
void notebook_create_new_tab(GtkNotebook* notebook, const char* uri)
{
if (num_tabs < MAX_NUM_TABS || MAX_NUM_TABS == 0) {
WebKitWebView* view = create_new_webview();
g_signal_connect(view, "load_changed", G_CALLBACK(handle_signal_load_changed), notebook);
@ -208,7 +193,6 @@ void notebook_create_new_tab(GtkNotebook* notebook, const char* uri)
webkit_web_view_set_zoom_level(view, ZOOM);
num_tabs += 1;
} else {
webkit_web_view_evaluate_javascript(notebook_get_webview(notebook), "alert('Too many tabs, not opening a new one')", -1, NULL, "rosenrot-alert-numtabs", NULL, NULL, NULL);
}
}
@ -241,7 +225,6 @@ void toggle_bar(GtkNotebook* notebook)
// fallthrough
case _HIDDEN:
gtk_widget_hide(GTK_WIDGET(bar.widget));
break; // not needed now, but might reorder
}
}
// Handle what happens when the user is on the bar and presses enter
@ -292,12 +275,10 @@ int handle_shortcut(func id, GtkNotebook* notebook)
webkit_web_view_set_zoom_level(view,
(zoom += ZOOM_VAL));
break;
case zoomout:
webkit_web_view_set_zoom_level(view,
(zoom -= ZOOM_VAL));
break;
case zoom_reset:
webkit_web_view_set_zoom_level(view,
(zoom = ZOOM));
@ -310,14 +291,12 @@ int handle_shortcut(func id, GtkNotebook* notebook)
int l = (n + k - 1) % n;
gtk_notebook_set_current_page(notebook, l);
break;
case next_tab:;
int m = gtk_notebook_get_n_pages(notebook);
int i = gtk_notebook_get_current_page(notebook);
int j = (i + 1) % m;
gtk_notebook_set_current_page(notebook, j);
break;
case close_tab:
gtk_notebook_remove_page(notebook, gtk_notebook_get_current_page(notebook));
num_tabs -= 1;
@ -346,7 +325,6 @@ int handle_shortcut(func id, GtkNotebook* notebook)
bar.entry_mode = _SEARCH;
toggle_bar(notebook);
break;
case show_finder:
bar.entry_mode = _FIND;
toggle_bar(notebook);
@ -356,7 +334,6 @@ int handle_shortcut(func id, GtkNotebook* notebook)
webkit_find_controller_search_next(
webkit_web_view_get_find_controller(view));
break;
case finder_prev:
webkit_find_controller_search_previous(
webkit_web_view_get_find_controller(view));
@ -462,9 +439,7 @@ int main(int argc, char** argv)
/* Show to user */
gtk_widget_show_all(GTK_WIDGET(window));
if (argc != 0) {
gtk_widget_hide(GTK_WIDGET(bar.widget));
}
if (argc != 0) gtk_widget_hide(GTK_WIDGET(bar.widget));
/* Deal with more tabs */
if (argc > 2) {