tweak: cleanup after adding "plugin"

This commit is contained in:
NunoSempere 2022-12-13 22:10:34 +00:00
parent 21e5800bbe
commit a6835ab2ae
5 changed files with 15 additions and 26 deletions

View File

@ -29,6 +29,7 @@
#define BG_COLOR "#1E1E2E" /* or "#FEFEFE" if you are not using the dark theme. */ #define BG_COLOR "#1E1E2E" /* or "#FEFEFE" if you are not using the dark theme. */
#define WIDTH 500 #define WIDTH 500
#define HEIGHT 400 #define HEIGHT 400
#define DEBUG false
typedef enum { typedef enum {
goback, goback,

View File

@ -10,6 +10,7 @@
*/ */
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <stdbool.h>
/* See more: /* See more:
* https://webkitgtk.org/reference/webkit2gtk/stable/class.Settings.html */ * https://webkitgtk.org/reference/webkit2gtk/stable/class.Settings.html */
@ -29,6 +30,7 @@
#define ZOOM 1.4 /* Starting zoom level.*/ #define ZOOM 1.4 /* Starting zoom level.*/
#define ZOOM_VAL .1 /* Zooming value in zoomin/zoomout functions */ #define ZOOM_VAL .1 /* Zooming value in zoomin/zoomout functions */
#define BG_COLOR "#FEFEFE" /*"#1E1E2E" */ #define BG_COLOR "#FEFEFE" /*"#1E1E2E" */
#define DEBUG false
typedef enum { typedef enum {
goback, goback,

View File

@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#define LIBRE_N 12 #define LIBRE_N 12
#define DEBUG true #define DEBUG false
/* Inspired by https://libredirect.github.io/, but in C. */ /* Inspired by https://libredirect.github.io/, but in C. */
@ -28,8 +28,7 @@ int libre_redirect(const char* uri, char* output){
strcpy(tmp_output, output); strcpy(tmp_output, output);
char* sites[] = { char* sites[] = {
"https://youtube.com", "https://www.youtube.com",
"https://reddit.com",
"https://www.reddit.com", "https://www.reddit.com",
"https://medium.com", "https://medium.com",
"https://translate.google.com" "https://translate.google.com"
@ -37,7 +36,6 @@ int libre_redirect(const char* uri, char* output){
char* alternatives[] = { char* alternatives[] = {
"https://yt.artemislena.eu", "https://yt.artemislena.eu",
"https://teddit.nunosempere.com", "https://teddit.nunosempere.com",
"https://teddit.nunosempere.com",
"https://scribe.rip", "https://scribe.rip",
"https://simplytranslate.org/" "https://simplytranslate.org/"
}; };

View File

@ -1,7 +1,7 @@
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#define DEBUG true #define DEBUG false
/* /*
See also: See also:

30
rose.c
View File

@ -9,11 +9,12 @@
* *
*/ */
#include <string.h>
#include <stdbool.h>
#include <webkit2/webkit2.h>
#include "config.h" #include "config.h"
#include "plugins/libre_redirect/libre_redirect.h" #include "plugins/libre_redirect/libre_redirect.h"
#include <webkit2/webkit2.h>
#include <string.h>
#define CACHE \ #define CACHE \
"base-cache-directory", CACHE_DIR, \ "base-cache-directory", CACHE_DIR, \
@ -26,7 +27,6 @@
"local-storage-directory", CACHE_DIR, \ "local-storage-directory", CACHE_DIR, \
"offline-application-cache-directory", CACHE_DIR, \ "offline-application-cache-directory", CACHE_DIR, \
"service-worker-registrations-directory", CACHE_DIR "service-worker-registrations-directory", CACHE_DIR
#define DEBUG false
enum { _SEARCH, _FIND }; enum { _SEARCH, _FIND };
@ -86,15 +86,14 @@ void redirect_if_annoying(WebKitWebView *view, const char *uri){
char uri_filtered[l]; char uri_filtered[l];
str_init(uri_filtered, l); str_init(uri_filtered, l);
printf("Uri: %s\n", uri); if(DEBUG) printf("libre_redirect uri received : %s\n", uri);
int check = libre_redirect(uri, uri_filtered); int check = libre_redirect(uri, uri_filtered);
if(check == 2){ if(check == 2){
webkit_web_view_load_uri(view, uri_filtered); webkit_web_view_load_uri(view, uri_filtered);
} }
printf("uri_filtered: %s\n", uri_filtered); if(DEBUG) printf("libre_redirect uri_filtered: %s\n", uri_filtered);
printf("check: %d\n", check); if(DEBUG) printf("libre_redirect check: %d\n", check);
} }
void load_changed(WebKitWebView *self, WebKitLoadEvent load_event, GtkNotebook *notebook) void load_changed(WebKitWebView *self, WebKitLoadEvent load_event, GtkNotebook *notebook)
@ -102,27 +101,16 @@ void load_changed(WebKitWebView *self, WebKitLoadEvent load_event, GtkNotebook *
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:
/* New load, we have now a provisional URI */
//const char* provisional_uri = webkit_web_view_get_uri(self);
// printf("%s", provisional_uri);
redirect_if_annoying(self, webkit_web_view_get_uri(self)); redirect_if_annoying(self, webkit_web_view_get_uri(self));
printf("Load started with uri: %s\n", webkit_web_view_get_uri (self)); if(DEBUG) printf("Load started with uri: %s\n", webkit_web_view_get_uri (self));
//provisional_uri);
/* Here we could start a spinner or update the
* location bar with the provisional URI */
break; break;
case WEBKIT_LOAD_REDIRECTED: case WEBKIT_LOAD_REDIRECTED:
redirect_if_annoying(self, webkit_web_view_get_uri(self)); redirect_if_annoying(self, webkit_web_view_get_uri(self));
printf("Load redirected to uri: %s\n", webkit_web_view_get_uri (self)); if(DEBUG) printf("Load redirected to uri: %s\n", webkit_web_view_get_uri (self));
break; break;
case WEBKIT_LOAD_COMMITTED: case WEBKIT_LOAD_COMMITTED:
/* The load is being performed. Current URI is
* the final one and it won't change unless a new
* load is requested or a navigation within the
* same page is performed */
redirect_if_annoying(self, webkit_web_view_get_uri(self)); redirect_if_annoying(self, webkit_web_view_get_uri(self));
printf("Load committed with: %s\n", webkit_web_view_get_uri (self)); if(DEBUG) printf("Load committed with: %s\n", webkit_web_view_get_uri (self));
//printf("%s", uri);
break; break;
case WEBKIT_LOAD_FINISHED: case WEBKIT_LOAD_FINISHED:
gtk_notebook_set_tab_label_text(notebook, GTK_WIDGET(self), gtk_notebook_set_tab_label_text(notebook, GTK_WIDGET(self),