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

formatting pass

Browse Source
This commit is contained in:
NunoSempere 2024-03-12 14:16:29 -03:00
parent 0f940a7460
commit 8907cbb063
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.h
View File

@ -40,8 +40,8 @@ To remove plugins completely;
"enable-smooth-scrolling", false, \ "enable-smooth-scrolling", false, \
"default-charset", "utf-8" "default-charset", "utf-8"
/* CACHE */ /* CACHE */
#define CACHE_DIR "/home/nuno/.cache/rose" #define DATA_DIR "/home/nuno/.cache/rose"
#define DATA_MANAGER_OPTS "base-cache-directory", CACHE_DIR, "base-data-directory", CACHE_DIR, #define DATA_MANAGER_OPTS "base-cache-directory", DATA_DIR, "base-data-directory", DATA_DIR
// GTK // GTK
#define GTK_SETTINGS_CONFIG_H "gtk-application-prefer-dark-theme", false, "gtk-enable-animations", false #define GTK_SETTINGS_CONFIG_H "gtk-application-prefer-dark-theme", false, "gtk-enable-animations", false

15
makefile
View File

@ -31,8 +31,8 @@ FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT)
# Change hardcoded paths when building # Change hardcoded paths when building
## Cache ## Cache
USER=`whoami` USER=`whoami`
DEFAULT_CACHE_DIR=/home/loki/.cache/rose DEFAULT_DATA_DIR=/home/nuno/.cache/rose
CURRENT_CACHE_DIR=/home/$(USER)/.cache/rose CURRENT_DATA_DIR=/home/$(USER)/.cache/rose
## dir ## dir
DEFAULT_DIR=/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot DEFAULT_DIR=/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot
CURRENT_DIR=`pwd` CURRENT_DIR=`pwd`
@ -42,10 +42,10 @@ build: $(SRC) $(PLUGINS) $(CONFIG)
cd plugins/readability/ && sh recompute_READABILITY_N.sh cd plugins/readability/ && sh recompute_READABILITY_N.sh
cd plugins/style && sh recompute_STYLE_N.sh cd plugins/style && sh recompute_STYLE_N.sh
# Make cache # Make cache
mkdir -p $(CURRENT_CACHE_DIR) mkdir -p $(CURRENT_DATA_DIR)
# Hardcode cache path # Hardcode cache path
find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \ find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
sed -i "s|$(DEFAULT_CACHE_DIR)|$(CURRENT_CACHE_DIR)|g" {} + sed -i "s|$(DEFAULT_DATA_DIR)|$(CURRENT_DATA_DIR)|g" {} +
# Hardcode git repository path # Hardcode git repository path
find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \ find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
sed -i "s|$(DEFAULT_DIR)|$(CURRENT_DIR)|g" {} + sed -i "s|$(DEFAULT_DIR)|$(CURRENT_DIR)|g" {} +
@ -82,11 +82,14 @@ uninstall:
rm -r /usr/share/themes/rose rm -r /usr/share/themes/rose
rm /usr/bin/rose rm /usr/bin/rose
rm /usr/bin/rose-mklink rm /usr/bin/rose-mklink
rm $(CACHE_DIR) rm $(DATA_DIR)
clean: clean:
rm rose rm rose
rm $(CACHE_DIR) rm $(DATA_DIR)
format: $(SRC) $(PLUGINS) format: $(SRC) $(PLUGINS)
$(FORMATTER) $(SRC) $(PLUGINS) $(rose.h) $(FORMATTER) $(SRC) $(PLUGINS) $(rose.h)
diagnose_deprecations:
make && G_ENABLE_DIAGNOSTIC=1 ./rose

BIN
rose
View File

Binary file not shown.

8
rose.c
View File

@ -78,7 +78,7 @@ void handle_signal_load_changed(WebKitWebView* self, WebKitLoadEvent load_event,
{ {
switch (load_event) { switch (load_event) {
/* see <https://webkitgtk.org/reference/webkit2gtk/2.5.1/WebKitWebView.html> /* see <https://webkitgtk.org/reference/webkit2gtk/2.5.1/WebKitWebView.html>
*/ */
case WEBKIT_LOAD_STARTED: case WEBKIT_LOAD_STARTED:
set_custom_style(self); set_custom_style(self);
redirect_if_annoying(self, webkit_web_view_get_uri(self)); redirect_if_annoying(self, webkit_web_view_get_uri(self));
@ -132,7 +132,7 @@ GtkWidget* handle_signal_create_new_tab(WebKitWebView* self,
webkit_web_view_evaluate_javascript(self, "alert('Too many tabs, not opening a new one')", -1, NULL, "rosenrot-alert-numtabs", NULL, NULL, NULL); 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. WebKitGTK documentation recommends returning the new webview.
I imagine that this might allow e.g., to go back in a new tab I imagine that this might allow e.g., to go back in a new tab
or generally to keep track of history. or generally to keep track of history.
@ -385,9 +385,9 @@ int handle_signal_keypress(void* self, GdkEvent* event, GtkNotebook* notebook)
if ((event->key.state == shortcut[i].mod || shortcut[i].mod == 0x0) && event->key.keyval == shortcut[i].key) if ((event->key.state == shortcut[i].mod || shortcut[i].mod == 0x0) && event->key.keyval == shortcut[i].key)
return handle_shortcut(shortcut[i].id, notebook); return handle_shortcut(shortcut[i].id, notebook);
/* /*
If I wanted to bind button presses, like the extra button in the mouse, If I wanted to bind button presses, like the extra button in the mouse,
I would have to bind the button-press-event signal instead. I would have to bind the button-press-event signal instead.
Some links in case I go down that road: Some links in case I go down that road:
- <https://docs.gtk.org/gtk3/signal.Widget.button-press-event.html> - <https://docs.gtk.org/gtk3/signal.Widget.button-press-event.html>
- <https://docs.gtk.org/gdk3/union.Event.html> - <https://docs.gtk.org/gdk3/union.Event.html>
- https://docs.gtk.org/gdk3/struct.EventButton.html - https://docs.gtk.org/gdk3/struct.EventButton.html