diff options
| Commit | 12cbd061058a5e5a23380fce66169d34af3de746 (patch) | |
|---|---|---|
| Author | 2022-07-19 14:18:16 +0300 | |
| Committer | 2022-07-19 14:18:16 +0300 | |
| Files | 7cabb04515ad4ed21f6f190922ff48c5ad9a23b5 | |
| goodwolf-12cbd061058a5e5a23380fce66169d34af3de746.tar goodwolf-12cbd061058a5e5a23380fce66169d34af3de746.tar.gz goodwolf-12cbd061058a5e5a23380fce66169d34af3de746.zip | ||
| Parent | ccbc83e827e11c7deb2959a6752452691c4165a1 (diff) | |
code: Renamed codebase to goodwolf
32 files changed, 321 insertions, 323 deletions
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 42 | ||||
| -rw-r--r-- | bookmarks.c | 6 | ||||
| -rw-r--r-- | bookmarks_test.fixtures/full/goodwolf/bookmarks.xbel (renamed from bookmarks_test.fixtures/full/badwolf/bookmarks.xbel) | 0 | ||||
| -rw-r--r-- | config.h | 66 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | downloads.c | 12 | ||||
| -rw-r--r-- | downloads.h | 6 | ||||
| -rw-r--r-- | fmt.c | 4 | ||||
| -rw-r--r-- | fmt.h | 2 | ||||
| -rw-r--r-- | goodwolf.1 (renamed from badwolf.1) | 26 | ||||
| -rw-r--r-- | goodwolf.c (renamed from badwolf.c) | 112 | ||||
| -rw-r--r-- | goodwolf.desktop (renamed from badwolf.desktop) | 4 | ||||
| -rw-r--r-- | goodwolf.fr.1 (renamed from badwolf.fr.1) | 36 | ||||
| -rw-r--r-- | goodwolf.h (renamed from badwolf.h) | 14 | ||||
| -rw-r--r-- | goodwolf.inkscape.svg (renamed from badwolf.inkscape.svg) | 2 | ||||
| -rw-r--r-- | goodwolf.svg (renamed from badwolf.svg) | 0 | ||||
| -rw-r--r-- | icons/hicolor/128x128/apps/goodwolf.png (renamed from icons/hicolor/128x128/apps/badwolf.png) | bin | 8666 -> 8666 bytes | |||
| -rw-r--r-- | icons/hicolor/24x24/apps/goodwolf.png (renamed from icons/hicolor/24x24/apps/badwolf.png) | bin | 1054 -> 1054 bytes | |||
| -rw-r--r-- | icons/hicolor/256x256/apps/goodwolf.png (renamed from icons/hicolor/256x256/apps/badwolf.png) | bin | 20138 -> 20138 bytes | |||
| -rw-r--r-- | icons/hicolor/32x32/apps/goodwolf.png (renamed from icons/hicolor/32x32/apps/badwolf.png) | bin | 1506 -> 1506 bytes | |||
| -rw-r--r-- | icons/hicolor/48x48/apps/goodwolf.png (renamed from icons/hicolor/48x48/apps/badwolf.png) | bin | 2552 -> 2552 bytes | |||
| -rw-r--r-- | icons/hicolor/64x64/apps/goodwolf.png (renamed from icons/hicolor/64x64/apps/badwolf.png) | bin | 3693 -> 3693 bytes | |||
| -rw-r--r-- | icons/hicolor/scalable/apps/goodwolf.svg (renamed from icons/hicolor/scalable/apps/badwolf.svg) | 0 | ||||
| -rw-r--r-- | keybindings.c | 14 | ||||
| -rw-r--r-- | keybindings.h | 2 | ||||
| -rw-r--r-- | po/manpage.pot | 184 | ||||
| -rw-r--r-- | po/messages.pot | 74 | ||||
| -rw-r--r-- | uri.c | 2 | ||||
| -rw-r--r-- | uri.h | 4 | ||||
| -rw-r--r-- | uri_test.c | 10 | ||||
| -rw-r--r-- | usr.bin.goodwolf (renamed from usr.bin.badwolf) | 14 |
@@ -1,4 +1,4 @@ -/badwolf +/goodwolf /locale /config.mk *.o @@ -5,16 +5,16 @@ include config.mk -SRCS = bookmarks.c fmt.c fmt_test.c uri.c uri_test.c keybindings.c downloads.c badwolf.c -OBJS = bookmarks.o fmt.o uri.o keybindings.o downloads.o badwolf.o +SRCS = bookmarks.c fmt.c fmt_test.c uri.c uri_test.c keybindings.c downloads.c goodwolf.c +OBJS = bookmarks.o fmt.o uri.o keybindings.o downloads.o goodwolf.o OBJS_test = fmt_test.o uri_test.o bookmarks_test.o -EXE = badwolf +EXE = goodwolf EXE_test = fmt_test uri_test bookmarks_test TRANS = fr.mo pt_BR.mo tr.mo de.mo vi.mo -TRANS_MAN = badwolf.fr.1 -DOCS = usr.bin.badwolf README.md KnowledgeBase.md interface.txt +TRANS_MAN = goodwolf.fr.1 +DOCS = usr.bin.goodwolf README.md KnowledgeBase.md interface.txt -GETTEXT_OPTS = --copyright-holder="Badwolf Authors <https://hacktivis.me/projects/badwolf>" --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" +GETTEXT_OPTS = --copyright-holder="Goodwolf Authors <https://hacktivis.me/projects/goodwolf>" --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+goodwolf-msgid@hacktivis.me" all: config.mk $(EXE) $(TRANS) po/messages.pot $(TRANS_MAN) po/manpage.pot @@ -24,22 +24,22 @@ config.mk: configure icons: $(ICON_SIZES) -icons/hicolor/scalable/apps/badwolf.svg: badwolf.svg +icons/hicolor/scalable/apps/goodwolf.svg: goodwolf.svg mkdir -p icons/hicolor/scalable/apps scour --no-line-breaks --enable-id-stripping --remove-metadata $< $@ -icons/hicolor/%/apps/badwolf.png: icons/hicolor/scalable/apps/badwolf.svg +icons/hicolor/%/apps/goodwolf.png: icons/hicolor/scalable/apps/goodwolf.svg mkdir -p `dirname $@` $(INKSCAPE) `echo $@ | cut -d/ -f3 | ./icons_size.sh` $< -o $@ po/messages.pot: $(SRCS) xgettext --keyword=_ --language=C --from-code=UTF-8 -o $@ --add-comments --sort-output $(GETTEXT_OPTS) $(SRCS) -po/manpage.pot: badwolf.1 - po4a-gettextize --format man -M utf-8 --master badwolf.1 $(GETTEXT_OPTS) --po $@ +po/manpage.pot: goodwolf.1 + po4a-gettextize --format man -M utf-8 --master goodwolf.1 $(GETTEXT_OPTS) --po $@ -po/%_man.po: po/manpage.pot badwolf.1 - po4a-updatepo --format man -M utf-8 --master badwolf.1 --msgmerge-opt '--update' $(GETTEXT_OPTS) --po $@ +po/%_man.po: po/manpage.pot goodwolf.1 + po4a-updatepo --format man -M utf-8 --master goodwolf.1 --msgmerge-opt '--update' $(GETTEXT_OPTS) --po $@ po/%.po: po/messages.pot msgmerge --update --backup=off $@ $< @@ -48,10 +48,10 @@ ${TRANS}: po/${@:.mo=.po} mkdir -p locale/${@:.mo=}/LC_MESSAGES $(MSGFMT) -o locale/${@:.mo=}/LC_MESSAGES/$(PACKAGE).mo po/${@:.mo=.po} -badwolf.fr.1: po/fr_man.po badwolf.1 - po4a-translate --format man -M utf-8 --master badwolf.1 --po po/fr_man.po --localized $@ +goodwolf.fr.1: po/fr_man.po goodwolf.1 + po4a-translate --format man -M utf-8 --master goodwolf.1 --po po/fr_man.po --localized $@ -badwolf: $(OBJS) +goodwolf: $(OBJS) $(CC) -std=c11 -o $@ $(OBJS) $(LDFLAGS) $(LIBS) .c: @@ -78,29 +78,29 @@ test: $(EXE_test) .PHONY: lint lint: - $(MANDOC) -Tlint -Wunsupp,error,warning ./badwolf.1 $(TRANS_MAN) + $(MANDOC) -Tlint -Wunsupp,error,warning ./goodwolf.1 $(TRANS_MAN) $(SHELLCHECK) ./configure $(FLAWFINDER) . .PHONY: install install: all mkdir -p $(DESTDIR)$(BINDIR) - cp -p badwolf $(DESTDIR)$(BINDIR)/ + cp -p goodwolf $(DESTDIR)$(BINDIR)/ mkdir -p $(DESTDIR)$(MANDIR)/man1 - cp -p badwolf.1 $(DESTDIR)$(MANDIR)/man1/ + cp -p goodwolf.1 $(DESTDIR)$(MANDIR)/man1/ # TODO: use $TRANS_MAN mkdir -p $(DESTDIR)$(MANDIR)/fr/man1 - cp -p badwolf.fr.1 $(DESTDIR)$(MANDIR)/fr/man1/badwolf.1 + cp -p goodwolf.fr.1 $(DESTDIR)$(MANDIR)/fr/man1/goodwolf.1 mkdir -p $(DESTDIR)$(DATADIR)/locale cp -r locale/ $(DESTDIR)$(DATADIR)/ cp interface.css $(DESTDIR)$(DATADIR)/ mkdir -p $(DESTDIR)$(APPSDIR) - cp -p badwolf.desktop $(DESTDIR)$(APPSDIR)/ + cp -p goodwolf.desktop $(DESTDIR)$(APPSDIR)/ mkdir -p $(DESTDIR)$(DOCDIR) cp -p $(DOCS) $(DESTDIR)$(DOCDIR)/ mkdir -p $(DESTDIR)$(PREFIX)/share cp -r icons $(DESTDIR)$(PREFIX)/share/ - @printf '\nNote: An example AppArmor profile has been installed at '$(DOCDIR)/usr.bin.badwolf'\n' + @printf '\nNote: An example AppArmor profile has been installed at '$(DOCDIR)/usr.bin.goodwolf'\n' .PHONY: clean clean: diff --git a/bookmarks.c b/bookmarks.c index 2a772cc..d662236 100644 --- a/bookmarks.c +++ b/bookmarks.c @@ -1,6 +1,6 @@ #include "bookmarks.h" -#include "badwolf.h" +#include "goodwolf.h" #include "config.h" #include <glib/gi18n.h> /* _() and other internationalization/localization helpers */ @@ -37,7 +37,7 @@ bookmarks_completion_setup(GtkEntryCompletion *location_completion, GtkTreeModel gtk_entry_completion_set_model(location_completion, tree_model); gtk_entry_completion_set_text_column(location_completion, 0); gtk_entry_completion_set_match_func(location_completion, location_completion_matches, NULL, NULL); - gtk_entry_completion_set_inline_selection(location_completion, BADWOLF_LOCATION_INLINE_SELECTION); + gtk_entry_completion_set_inline_selection(location_completion, GOODWOLF_LOCATION_INLINE_SELECTION); } static void @@ -74,7 +74,7 @@ bookmarks_completion_init() xmlXPathObjectPtr xpathObj = NULL; const xmlChar *xpathExpr = (const xmlChar *)"//bookmark/@href"; - char *filename = g_build_filename(g_get_user_data_dir(), "badwolf", "bookmarks.xbel", NULL); + char *filename = g_build_filename(g_get_user_data_dir(), "goodwolf", "bookmarks.xbel", NULL); GtkListStore *list_store = gtk_list_store_new(1, G_TYPE_STRING); /* flawfinder: ignore, just a presence check */ diff --git a/bookmarks_test.fixtures/full/badwolf/bookmarks.xbel b/bookmarks_test.fixtures/full/goodwolf/bookmarks.xbel index 192cfb2..192cfb2 100644 --- a/bookmarks_test.fixtures/full/badwolf/bookmarks.xbel +++ b/bookmarks_test.fixtures/full/goodwolf/bookmarks.xbel @@ -1,6 +1,6 @@ #ifndef CONFIG_H_INCLUDED #define CONFIG_H_INCLUDED -/* BADWOLF_TAB_POSITION: Position of the tab listing, can be one of: +/* GOODWOLF_TAB_POSITION: Position of the tab listing, can be one of: * - GTK_POS_TOP * - GTK_POS_BOTTOM * - GTK_POS_RIGHT @@ -8,22 +8,22 @@ * * See https://developer.gnome.org/gtk3/stable/gtk3-Standard-Enumerations.html#GtkPositionType */ -#define BADWOLF_TAB_POSITION GTK_POS_TOP +#define GOODWOLF_TAB_POSITION GTK_POS_TOP -/* BADWOLF_TAB_LABEL_CHARWIDTH: Amount of characters the tab label text fits - * Quite conflicts with BADWOLF_TAB_BOX_WIDTH, recommended to only define one +/* GOODWOLF_TAB_LABEL_CHARWIDTH: Amount of characters the tab label text fits + * Quite conflicts with GOODWOLF_TAB_BOX_WIDTH, recommended to only define one */ -#define BADWOLF_TAB_LABEL_CHARWIDTH 26 +#define GOODWOLF_TAB_LABEL_CHARWIDTH 26 -/* BADWOLF_TAB_BOX_WIDTH: Requested width (in pixels) for the whole tab - * Quite conflicts with BADWOLF_TAB_LABEL_CHARWIDTH, recommended to only define one +/* GOODWOLF_TAB_BOX_WIDTH: Requested width (in pixels) for the whole tab + * Quite conflicts with GOODWOLF_TAB_LABEL_CHARWIDTH, recommended to only define one */ -//#define BADWOLF_TAB_BOX_WIDTH 120 +//#define GOODWOLF_TAB_BOX_WIDTH 120 -// BADWOLF_TAB_HEXPAND: Should the tab try to fill the available horizontal space? -#define BADWOLF_TAB_HEXPAND FALSE +// GOODWOLF_TAB_HEXPAND: Should the tab try to fill the available horizontal space? +#define GOODWOLF_TAB_HEXPAND FALSE -/* BADWOLF_TAB_LABEL_ELLIPSIZE: pango ellipsize mode of the tab label text, can be one of: +/* GOODWOLF_TAB_LABEL_ELLIPSIZE: pango ellipsize mode of the tab label text, can be one of: * - PANGO_ELLIPSIZE_NONE * - PANGO_ELLIPSIZE_START * - PANGO_ELLIPSIZE_MIDDLE @@ -31,40 +31,40 @@ * * See https://developer.gnome.org/pango/stable/pango-Layout-Objects.html#PangoEllipsizeMode */ -#define BADWOLF_TAB_LABEL_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE +#define GOODWOLF_TAB_LABEL_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE -// BADWOLF_BOX_PADDING: Amount of padding between browser’s box (tab child) elements -#define BADWOLF_BOX_PADDING 0 +// GOODWOLF_BOX_PADDING: Amount of padding between browser’s box (tab child) elements +#define GOODWOLF_BOX_PADDING 0 -// BADWOLF_TOOLBAR_PADDING: Amount of padding between toolbar elements -#define BADWOLF_TOOLBAR_PADDING 0 +// GOODWOLF_TOOLBAR_PADDING: Amount of padding between toolbar elements +#define GOODWOLF_TOOLBAR_PADDING 0 -// BADWOLF_TOOLBAR_PADDING: Amount of padding between toolbar elements -#define BADWOLF_TOOLBAR_SEPARATOR_PADDING 4 +// GOODWOLF_TOOLBAR_PADDING: Amount of padding between toolbar elements +#define GOODWOLF_TOOLBAR_SEPARATOR_PADDING 4 -// BADWOLF_STATUSBAR_PADDING: Amount of padding between statusbar elements -#define BADWOLF_STATUSBAR_PADDING 0 +// GOODWOLF_STATUSBAR_PADDING: Amount of padding between statusbar elements +#define GOODWOLF_STATUSBAR_PADDING 0 -// BADWOLF_DOWNLOAD_PADDING: Amount of padding between download list row-elements -#define BADWOLF_DOWNLOAD_PADDING 5 +// GOODWOLF_DOWNLOAD_PADDING: Amount of padding between download list row-elements +#define GOODWOLF_DOWNLOAD_PADDING 5 -/* BADWOLF_DEFAULT_WIDTH / BADWOLF_DEFAULT_HEIGHT: +/* GOODWOLF_DEFAULT_WIDTH / GOODWOLF_DEFAULT_HEIGHT: * Used to define the default width/height of the window, * useful for floating Window Managers, probably useless in tiling ones * * See https://developer.gnome.org/gtk3/stable/GtkWindow.html#gtk-window-set-default-size */ -#define BADWOLF_DEFAULT_WIDTH 800 -#define BADWOLF_DEFAULT_HEIGHT 600 +#define GOODWOLF_DEFAULT_WIDTH 800 +#define GOODWOLF_DEFAULT_HEIGHT 600 -/* BADWOLF_WEBKIT_SETTINGS: +/* GOODWOLF_WEBKIT_SETTINGS: * Used when creating a new view with webkit_settings_new_with_settings the usage is: * setting-name, setting-value, setting-name, …, NULL * * See: https://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */ // clang-format off -#define BADWOLF_WEBKIT_SETTINGS \ +#define GOODWOLF_WEBKIT_SETTINGS \ "default-charset", "utf-8", \ "enable-accelerated-2d-canvas", FALSE, \ "enable-caret-browsing", FALSE, \ @@ -83,7 +83,7 @@ NULL // clang-format on -/* BADWOLF_STATUSLABEL_ELLIPSIZE: pango ellipsize mode of the status bar label text, can be one of: +/* GOODWOLF_STATUSLABEL_ELLIPSIZE: pango ellipsize mode of the status bar label text, can be one of: * - PANGO_ELLIPSIZE_NONE * - PANGO_ELLIPSIZE_START * - PANGO_ELLIPSIZE_MIDDLE @@ -91,9 +91,9 @@ * * See https://developer.gnome.org/pango/stable/pango-Layout-Objects.html#PangoEllipsizeMode */ -#define BADWOLF_STATUSLABEL_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE +#define GOODWOLF_STATUSLABEL_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE -/* BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE: pango ellipsize mode of the download destination path, +/* GOODWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE: pango ellipsize mode of the download destination path, * can be one of: * - PANGO_ELLIPSIZE_NONE * - PANGO_ELLIPSIZE_START @@ -102,9 +102,9 @@ * * See https://developer.gnome.org/pango/stable/pango-Layout-Objects.html#PangoEllipsizeMode */ -#define BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE +#define GOODWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE -// BADWOLF_LOCATION_INLINE_SELECTION: show selected completion as a selection in location entry -#define BADWOLF_LOCATION_INLINE_SELECTION TRUE +// GOODWOLF_LOCATION_INLINE_SELECTION: show selected completion as a selection in location entry +#define GOODWOLF_LOCATION_INLINE_SELECTION TRUE #endif /* CONFIG_H_INCLUDED */ @@ -1,7 +1,7 @@ #!/bin/sh VERSION=1.2.0 VERSION_FULL=${VERSION}$(./version.sh) -ICON_SIZES="$(for i in 24 32 48 64 128 256; do printf 'icons/hicolor/%sx%s/apps/badwolf.png ' $i $i ; done)" +ICON_SIZES="$(for i in 24 32 48 64 128 256; do printf 'icons/hicolor/%sx%s/apps/goodwolf.png ' $i $i ; done)" DEPS="gtk+-3.0 libxml-2.0" min_webkitgtk=2.32.0 @@ -103,8 +103,8 @@ done # Fallback definitions for dirs, based on $PREFIX BINDIR="${BINDIR:-${PREFIX}/bin}" MANDIR="${MANDIR:-${PREFIX}/share/man}" -DOCDIR="${DOCDIR:-${PREFIX}/share/doc/badwolf-${VERSION}}" -DATADIR="${DATADIR:-${PREFIX}/share/badwolf}" +DOCDIR="${DOCDIR:-${PREFIX}/share/doc/goodwolf-${VERSION}}" +DATADIR="${DATADIR:-${PREFIX}/share/goodwolf}" APPSDIR="${APPSDIR:-${PREFIX}/share/applications}" # Add some extra CFLAGS diff --git a/downloads.c b/downloads.c index 707505f..098282b 100644 --- a/downloads.c +++ b/downloads.c @@ -4,7 +4,7 @@ #include "downloads.h" -#include "badwolf.h" +#include "goodwolf.h" #include "config.h" #include <glib/gi18n.h> /* _() and other internationalization/localization helpers */ @@ -37,7 +37,7 @@ void download_new_entry(WebKitDownload *webkit_download, struct Download *download) { download->error = 0; - download->container = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, BADWOLF_DOWNLOAD_PADDING); + download->container = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, GOODWOLF_DOWNLOAD_PADDING); download->progress = gtk_progress_bar_new(); download->file_path = gtk_label_new(NULL); download->status = gtk_label_new(_("Download starting…")); @@ -46,7 +46,7 @@ download_new_entry(WebKitDownload *webkit_download, struct Download *download) download->stop_icon = gtk_button_new_from_icon_name("process-stop", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(download->progress), TRUE); - gtk_label_set_ellipsize(GTK_LABEL(download->file_path), BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE); + gtk_label_set_ellipsize(GTK_LABEL(download->file_path), GOODWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE); g_signal_connect( download->stop_icon, "clicked", G_CALLBACK(download_stop_iconCb_clicked), webkit_download); @@ -182,13 +182,13 @@ downloadCb_received_data(WebKitDownload *webkit_download, guint64 data_lenght, g } GtkWidget * -badwolf_downloads_tab_new() +goodwolf_downloads_tab_new() { return gtk_list_box_new(); } void -badwolf_downloads_tab_attach(struct Window *window) +goodwolf_downloads_tab_attach(struct Window *window) { GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_name(scrolled_window, "browser__scrollwin_downloads"); @@ -202,7 +202,7 @@ badwolf_downloads_tab_attach(struct Window *window) GtkWidget *icon = gtk_image_new_from_icon_name("emblem-downloads", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_widget_set_name(icon, "browser__tabbox__icon"); - gtk_widget_set_hexpand(tab_box, BADWOLF_TAB_HEXPAND); + gtk_widget_set_hexpand(tab_box, GOODWOLF_TAB_HEXPAND); gtk_box_pack_start(GTK_BOX(tab_box), icon, FALSE, FALSE, 0); diff --git a/downloads.h b/downloads.h index fa5513e..5c34009 100644 --- a/downloads.h +++ b/downloads.h @@ -1,4 +1,4 @@ -#include "badwolf.h" +#include "goodwolf.h" #include <gtk/gtk.h> @@ -24,5 +24,5 @@ gboolean downloadCb_decide_destination(WebKitDownload *download, void downloadCb_failed(WebKitDownload *webkit_download, GError *error, gpointer user_data); void downloadCb_finished(WebKitDownload *download, gpointer user_data); void downloadCb_received_data(WebKitDownload *download, guint64 data_lenght, gpointer user_data); -GtkWidget *badwolf_downloads_tab_new(); -void badwolf_downloads_tab_attach(struct Window *window); +GtkWidget *goodwolf_downloads_tab_new(); +void goodwolf_downloads_tab_attach(struct Window *window); @@ -10,12 +10,12 @@ void fmt_context_id(uint64_t num, char *out, int withSeparator) { /* flawfinder: ignore. bound checks are done */ - char buf[BADWOLF_CTX_SIZ] = {0, 0, 0, 0, 0, 0, 0}; + char buf[GOODWOLF_CTX_SIZ] = {0, 0, 0, 0, 0, 0, 0}; int len = 2; buf[++len] = alpha_digits[num % 26]; num /= 26; - while(num > 0 && len < (BADWOLF_CTX_SIZ - 1)) + while(num > 0 && len < (GOODWOLF_CTX_SIZ - 1)) { buf[++len] = alpha_digits[(num - 1) % 26]; num /= 26; @@ -1,4 +1,4 @@ #include <stdint.h> // uint64_t -#define BADWOLF_CTX_SIZ 7 +#define GOODWOLF_CTX_SIZ 7 void fmt_context_id(uint64_t num, char *out, int withSeparator); @@ -2,10 +2,10 @@ .\" Copyright © 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> .\" SPDX-License-Identifier: BSD-3-Clause .Dd 2022-04-06 -.Dt BADWOLF 1 +.Dt GOODWOLF 1 .Os .Sh NAME -.Nm badwolf +.Nm goodwolf .Nd minimalist and privacy-oriented web browser based on WebKitGTK .Sh SYNOPSIS .Nm @@ -67,10 +67,10 @@ Cancels current search .El .Sh ENVIRONMENT .Bl -tag -width Ds -.It Ev BADWOLF_L10N +.It Ev GOODWOLF_L10N A colon-separated list in the form lang_COUNTRY where lang is in ISO-639 and COUNTRY in ISO-3166. For example -.Ic BADWOLF_L10N="en_GB:fr_FR:de_DE" . +.Ic GOODWOLF_L10N="en_GB:fr_FR:de_DE" . When this variable isn't set, spelling isn't activated. A more generic variable name is also intended to be used in the future. .Pp @@ -87,7 +87,7 @@ syntax to correctly support XDG Base Directory Specification, you can use the command to check where it is on your system. .Pp .Bl -tag -width Ds -compact -.It Pa ${XDG_CONFIG_HOME:-$HOME/.config}/badwolf/content-filters.json +.It Pa ${XDG_CONFIG_HOME:-$HOME/.config}/goodwolf/content-filters.json WebKit-specific content-filter file, this allows to block unwanted content (ads, nagware, ...). For some introductory information about the format see: .Lk https://webkit.org/blog/3476/content-blockers-first-look/ @@ -99,10 +99,10 @@ For a converter using AblockPlus-style filters, try: .Pp For a ready-to-use file (that you should update periodically), try: .Lk https://easylist-downloads.adblockplus.org/easylist_min_content_blocker.json -.It Pa ${XDG_CACHE_HOME:-$HOME/.cache}/badwolf/filters +.It Pa ${XDG_CACHE_HOME:-$HOME/.cache}/goodwolf/filters This is where the compiled filters are stored, the file(s) in it are automatically generated and so shouldn't be edited. Documented here only for sandboxing / access-control purposes. -.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/bookmarks.xbel +.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/bookmarks.xbel XBEL (XML Bookmark Exchange Language) file, known to be currently supported by: .Xr elinks 1 , .Xr konqueror 1 , @@ -113,16 +113,16 @@ For more information about this format see: .Pp For an example XBEL file see: .Lk https://hacktivis.me/bookmarks.xbel -.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/webkit-web-extension/ +.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/webkit-web-extension/ Directory containing the .Lk https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebExtension.html WebKitWebExtensions to be loaded into .Nm . Note: They aren't the JavaScript-based Web-Extensions supported by Firefox or Chrome, but native code in shared objects using the WebKitGTK API. .Pp Examples of useful extensions may be found at: -.Lk https://hacktivis.me/git/badwolf-extensions -.It Pa ${DATADIR:-/usr/local/share}/badwolf/interface.css -.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/interface.css +.Lk https://hacktivis.me/git/goodwolf-extensions +.It Pa ${DATADIR:-/usr/local/share}/goodwolf/interface.css +.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/interface.css CSS files (respectively system and user-level) for styling .Nm interface. @@ -138,10 +138,10 @@ environment variable on launching and going to the CSS tab. .El .Sh AUTHORS -.An Haelwenn (lanodan) Monnier Aq Mt contact+badwolf@hacktivis.me +.An Haelwenn (lanodan) Monnier Aq Mt contact+goodwolf@hacktivis.me .Sh BUGS You can submit contributions or tickets to -.Lk https://sr.ht/~lanodan/badwolf/ +.Lk https://sr.ht/~lanodan/goodwolf/ with .Xr git-send-email 1 for patches. @@ -2,7 +2,7 @@ // Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause -#include "badwolf.h" +#include "goodwolf.h" #include "bookmarks.h" #include "config.h" @@ -19,7 +19,7 @@ #include <stdlib.h> /* malloc() */ #include <unistd.h> /* access() */ -const gchar *homepage = "https://hacktivis.me/projects/badwolf"; +const gchar *homepage = "https://hacktivis.me/projects/goodwolf"; const gchar *version = VERSION; static gchar *web_extensions_directory; @@ -169,11 +169,11 @@ cairo_surface_t* scale_favicon(cairo_surface_t *f) } GtkWidget * -badwolf_new_tab_box(const gchar *title, struct Client *browser) +goodwolf_new_tab_box(const gchar *title, struct Client *browser) { (void)browser; /* flawfinder: ignore. bound checks are done */ - char context_id_str[BADWOLF_CTX_SIZ] = {0, 0, 0, 0, 0, 0, 0}; + char context_id_str[GOODWOLF_CTX_SIZ] = {0, 0, 0, 0, 0, 0, 0}; fmt_context_id(browser->context_id, context_id_str, 1); @@ -206,15 +206,15 @@ badwolf_new_tab_box(const gchar *title, struct Client *browser) GtkWidget *playing_event_box = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(playing_event_box), playing); -#ifdef BADWOLF_TAB_BOX_WIDTH - gtk_widget_set_size_request(label, BADWOLF_TAB_BOX_WIDTH, -1); +#ifdef GOODWOLF_TAB_BOX_WIDTH + gtk_widget_set_size_request(label, GOODWOLF_TAB_BOX_WIDTH, -1); #endif -#ifdef BADWOLF_TAB_LABEL_CHARWIDTH - gtk_label_set_width_chars(GTK_LABEL(label), BADWOLF_TAB_LABEL_CHARWIDTH); +#ifdef GOODWOLF_TAB_LABEL_CHARWIDTH + gtk_label_set_width_chars(GTK_LABEL(label), GOODWOLF_TAB_LABEL_CHARWIDTH); #endif - gtk_widget_set_hexpand(tab_box, BADWOLF_TAB_HEXPAND); + gtk_widget_set_hexpand(tab_box, GOODWOLF_TAB_HEXPAND); - gtk_label_set_ellipsize(GTK_LABEL(label), BADWOLF_TAB_LABEL_ELLIPSIZE); + gtk_label_set_ellipsize(GTK_LABEL(label), GOODWOLF_TAB_LABEL_ELLIPSIZE); gtk_label_set_single_line_mode(GTK_LABEL(label), TRUE); if (tabs_context_label) { @@ -292,7 +292,7 @@ webView_tab_label_change(struct Client *browser, const gchar *title) if(title_IS_EMPTY) title = "BadWolf"; gtk_notebook_set_tab_label( - GTK_NOTEBOOK(notebook), browser->box, badwolf_new_tab_box(title, browser)); + GTK_NOTEBOOK(notebook), browser->box, goodwolf_new_tab_box(title, browser)); gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(notebook), browser->box, title); // Set the window title if the title change was on the current tab @@ -376,7 +376,7 @@ WebViewCb_create(WebKitWebView *related_web_view, browser = new_browser(old_browser->window, NULL, old_browser); - if(badwolf_new_tab(GTK_NOTEBOOK(old_browser->window->notebook), browser, FALSE) < 0) + if(goodwolf_new_tab(GTK_NOTEBOOK(old_browser->window->notebook), browser, FALSE) < 0) return NULL; else return browser->webView; @@ -576,7 +576,7 @@ locationCb_activate(GtkEntry *location, gpointer user_data) struct Client *browser = (struct Client *)user_data; webkit_web_view_load_uri(browser->webView, - badwolf_ensure_uri_scheme(gtk_entry_get_text(location), TRUE)); + goodwolf_ensure_uri_scheme(gtk_entry_get_text(location), TRUE)); return TRUE; } @@ -702,8 +702,8 @@ struct Client * new_browser(struct Window *window, const gchar *target_url, struct Client *old_browser) { struct Client *browser = malloc(sizeof(struct Client)); - target_url = badwolf_ensure_uri_scheme(target_url, (old_browser == NULL)); - char *badwolf_l10n = NULL; + target_url = goodwolf_ensure_uri_scheme(target_url, (old_browser == NULL)); + char *goodwolf_l10n = NULL; WebKitWebContext *web_context; @@ -765,17 +765,17 @@ new_browser(struct Window *window, const gchar *target_url, struct Client *old_b webkit_web_context_set_web_extensions_directory(web_context, web_extensions_directory); webkit_web_context_set_favicon_database_directory(web_context, NULL); if (persistent_storage) { - char context_id_str[BADWOLF_CTX_SIZ] = {0, 0, 0, 0, 0, 0, 0}; + char context_id_str[GOODWOLF_CTX_SIZ] = {0, 0, 0, 0, 0, 0, 0}; if (separated_storage) { fmt_context_id(browser->context_id, context_id_str, 0); g_mkdir_with_parents( - g_build_filename(g_get_user_config_dir(), "badwolf", context_id_str, NULL), + g_build_filename(g_get_user_config_dir(), "goodwolf", context_id_str, NULL), 0755); } webkit_cookie_manager_set_persistent_storage( webkit_website_data_manager_get_cookie_manager(website_data_manager), - g_build_filename(g_get_user_config_dir(), "badwolf", context_id_str, "cookies.txt", NULL), + g_build_filename(g_get_user_config_dir(), "goodwolf", context_id_str, "cookies.txt", NULL), WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT); webkit_cookie_manager_set_accept_policy( webkit_website_data_manager_get_cookie_manager(website_data_manager), @@ -793,18 +793,18 @@ new_browser(struct Window *window, const gchar *target_url, struct Client *old_b } /* flawfinder: ignore. Consider that g_strsplit is safe enough */ - badwolf_l10n = getenv("BADWOLF_L10N"); + goodwolf_l10n = getenv("GOODWOLF_L10N"); - if(badwolf_l10n != NULL) + if(goodwolf_l10n != NULL) { - gchar **languages = g_strsplit(badwolf_l10n, ":", -1); + gchar **languages = g_strsplit(goodwolf_l10n, ":", -1); webkit_web_context_set_spell_checking_languages(web_context, (const gchar *const *)languages); g_strfreev(languages); webkit_web_context_set_spell_checking_enabled(web_context, TRUE); } - WebKitSettings *settings = webkit_settings_new_with_settings(BADWOLF_WEBKIT_SETTINGS); + WebKitSettings *settings = webkit_settings_new_with_settings(GOODWOLF_WEBKIT_SETTINGS); if (alt_useragent == TRUE) webkit_settings_set_user_agent(settings, "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:74.0) Gecko/20100101 Firefox/74.0"); @@ -831,60 +831,60 @@ new_browser(struct Window *window, const gchar *target_url, struct Client *old_b g_object_unref(settings); gtk_box_pack_start( - GTK_BOX(browser->toolbar), GTK_WIDGET(browser->back), FALSE, FALSE, BADWOLF_TOOLBAR_PADDING); + GTK_BOX(browser->toolbar), GTK_WIDGET(browser->back), FALSE, FALSE, GOODWOLF_TOOLBAR_PADDING); gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->forward), FALSE, FALSE, - BADWOLF_TOOLBAR_PADDING); + GOODWOLF_TOOLBAR_PADDING); gtk_box_pack_start(GTK_BOX(browser->toolbar), toolbar_separator, FALSE, FALSE, - BADWOLF_TOOLBAR_SEPARATOR_PADDING); + GOODWOLF_TOOLBAR_SEPARATOR_PADDING); gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->javascript), FALSE, FALSE, - BADWOLF_TOOLBAR_PADDING); + GOODWOLF_TOOLBAR_PADDING); gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->auto_load_images), FALSE, FALSE, - BADWOLF_TOOLBAR_PADDING); + GOODWOLF_TOOLBAR_PADDING); gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->location), TRUE, TRUE, - BADWOLF_TOOLBAR_PADDING); - gtk_box_pack_start(GTK_BOX(browser->toolbar), print, FALSE, FALSE, BADWOLF_TOOLBAR_PADDING); + GOODWOLF_TOOLBAR_PADDING); + gtk_box_pack_start(GTK_BOX(browser->toolbar), print, FALSE, FALSE, GOODWOLF_TOOLBAR_PADDING); gtk_container_set_focus_child(GTK_CONTAINER(browser->box), browser->toolbar); gtk_container_set_focus_child(GTK_CONTAINER(browser->toolbar), browser->location); gtk_box_pack_start( - GTK_BOX(browser->box), GTK_WIDGET(browser->toolbar), FALSE, FALSE, BADWOLF_BOX_PADDING); + GTK_BOX(browser->box), GTK_WIDGET(browser->toolbar), FALSE, FALSE, GOODWOLF_BOX_PADDING); gtk_box_pack_start( - GTK_BOX(browser->box), GTK_WIDGET(browser->webView), TRUE, TRUE, BADWOLF_BOX_PADDING); + GTK_BOX(browser->box), GTK_WIDGET(browser->webView), TRUE, TRUE, GOODWOLF_BOX_PADDING); gtk_box_pack_start( - GTK_BOX(browser->box), GTK_WIDGET(browser->statusbar), FALSE, FALSE, BADWOLF_BOX_PADDING); + GTK_BOX(browser->box), GTK_WIDGET(browser->statusbar), FALSE, FALSE, GOODWOLF_BOX_PADDING); gtk_box_pack_start(GTK_BOX(browser->statusbar), GTK_WIDGET(browser->search), FALSE, FALSE, - BADWOLF_STATUSBAR_PADDING); + GOODWOLF_STATUSBAR_PADDING); gtk_box_pack_start(GTK_BOX(browser->statusbar), GTK_WIDGET(browser->statuslabel), FALSE, FALSE, - BADWOLF_STATUSBAR_PADDING); + GOODWOLF_STATUSBAR_PADDING); gtk_widget_set_halign(browser->statusbar, GTK_ALIGN_START); gtk_label_set_single_line_mode(GTK_LABEL(browser->statuslabel), TRUE); - gtk_label_set_ellipsize(GTK_LABEL(browser->statuslabel), BADWOLF_STATUSLABEL_ELLIPSIZE); + gtk_label_set_ellipsize(GTK_LABEL(browser->statuslabel), GOODWOLF_STATUSLABEL_ELLIPSIZE); if(bookmarks_completion_model != NULL) { @@ -998,7 +998,7 @@ new_browser(struct Window *window, const gchar *target_url, struct Client *old_b return browser; } -/* badwolf_new_tab: Inserts struct Client *browser in GtkNotebook *notebook +/* goodwolf_new_tab: Inserts struct Client *browser in GtkNotebook *notebook * and optionally switches selected tab to it. * * returns: @@ -1007,7 +1007,7 @@ new_browser(struct Window *window, const gchar *target_url, struct Client *old_b * -2 : browser is NULL */ int -badwolf_new_tab(GtkNotebook *notebook, struct Client *browser, bool auto_switch) +goodwolf_new_tab(GtkNotebook *notebook, struct Client *browser, bool auto_switch) { gint current_page = gtk_notebook_get_current_page(notebook); gchar *title = _("New tab"); @@ -1019,7 +1019,7 @@ badwolf_new_tab(GtkNotebook *notebook, struct Client *browser, bool auto_switch) if(gtk_notebook_insert_page(notebook, browser->box, NULL, (current_page + 1)) == -1) return -1; gtk_notebook_set_tab_reorderable(notebook, browser->box, TRUE); - gtk_notebook_set_tab_label(notebook, browser->box, badwolf_new_tab_box(title, browser)); + gtk_notebook_set_tab_label(notebook, browser->box, goodwolf_new_tab_box(title, browser)); gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(notebook), browser->box, title); gtk_widget_queue_draw(GTK_WIDGET(notebook)); @@ -1039,7 +1039,7 @@ new_tabCb_clicked(GtkButton *new_tab, gpointer user_data) struct Window *window = (struct Window *)user_data; struct Client *browser = new_browser(window, NULL, NULL); - badwolf_new_tab(GTK_NOTEBOOK(window->notebook), browser, TRUE); + goodwolf_new_tab(GTK_NOTEBOOK(window->notebook), browser, TRUE); } static void @@ -1076,19 +1076,19 @@ content_managerCb_ready(GObject *store, GAsyncResult *result, gpointer user_data { if(err == NULL) { - fprintf(stderr, _("badwolf: failed to load content-filter, err: [%d] %s\n"), -1, "unknown"); + fprintf(stderr, _("goodwolf: failed to load content-filter, err: [%d] %s\n"), -1, "unknown"); } else { fprintf(stderr, - _("badwolf: failed to load content-filter, err: [%d] %s\n"), + _("goodwolf: failed to load content-filter, err: [%d] %s\n"), err->code, err->message); } } else { - fprintf(stderr, _("badwolf: content-filter loaded, adding to content-manager…\n")); + fprintf(stderr, _("goodwolf: content-filter loaded, adding to content-manager…\n")); webkit_user_content_manager_add_filter(window->content_manager, filter); } } @@ -1108,14 +1108,14 @@ storeCb_finish(WebKitUserContentFilterStore *store, GAsyncResult *result, gpoint if(err == NULL) { fprintf(stderr, - _("badwolf: failed to compile content-filters.json, err: [%d] %s\n"), + _("goodwolf: failed to compile content-filters.json, err: [%d] %s\n"), -1, "unknown"); } else { fprintf(stderr, - _("badwolf: failed to compile content-filters.json, err: [%d] %s\n"), + _("goodwolf: failed to compile content-filters.json, err: [%d] %s\n"), err->code, err->message); } @@ -1142,7 +1142,7 @@ static GtkStatusIcon *create_tray_icon(const struct Window *window) { tray_icon = gtk_status_icon_new(); g_signal_connect(G_OBJECT(tray_icon), "activate", G_CALLBACK(tray_icon_on_click), window->main_window); - gtk_status_icon_set_from_icon_name(tray_icon, "badwolf"); + gtk_status_icon_set_from_icon_name(tray_icon, "goodwolf"); gtk_status_icon_set_tooltip_text(tray_icon, "Badwolf"); gtk_status_icon_set_visible(tray_icon, TRUE); @@ -1154,7 +1154,7 @@ main(int argc, char *argv[]) { if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'h') { printf("\ -badwolf [OPTIONS] [URLs]\n\n\ +goodwolf [OPTIONS] [URLs]\n\n\ Options:\n\ -s DD Specifies a custom favicon size, where DD is a two digit number\n\ -nl Tabs won't have a label (page title)\n\ @@ -1177,7 +1177,7 @@ Options:\n\ bind_textdomain_codeset(PACKAGE, "UTF-8"); textdomain(PACKAGE); - application = g_application_new("me.hacktivis.badwolf", + application = g_application_new("me.hacktivis.goodwolf", G_APPLICATION_HANDLES_COMMAND_LINE | G_APPLICATION_SEND_ENVIRONMENT | G_APPLICATION_NON_UNIQUE); g_application_register(application, NULL, NULL); @@ -1198,7 +1198,7 @@ Options:\n\ webkit_get_micro_version()); web_extensions_directory = - g_build_filename(g_get_user_data_dir(), "badwolf", "webkit-web-extension", NULL); + g_build_filename(g_get_user_data_dir(), "goodwolf", "webkit-web-extension", NULL); fprintf(stderr, _("webkit-web-extension directory set to: %s\n"), web_extensions_directory); bookmarks_completion_model = bookmarks_completion_init(); @@ -1207,7 +1207,7 @@ Options:\n\ window->main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); window->notebook = gtk_notebook_new(); window->new_tab = gtk_button_new_from_icon_name("tab-new-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR); - window->downloads_tab = badwolf_downloads_tab_new(); + window->downloads_tab = goodwolf_downloads_tab_new(); window->content_manager = webkit_user_content_manager_new(); gchar *contentFilterPath = @@ -1226,9 +1226,9 @@ Options:\n\ window); gtk_window_set_default_size( - GTK_WINDOW(window->main_window), BADWOLF_DEFAULT_WIDTH, BADWOLF_DEFAULT_HEIGHT); + GTK_WINDOW(window->main_window), GOODWOLF_DEFAULT_WIDTH, GOODWOLF_DEFAULT_HEIGHT); gtk_window_set_role(GTK_WINDOW(window->main_window), "browser"); - gtk_window_set_icon_name(GTK_WINDOW(window->main_window), "badwolf"); + gtk_window_set_icon_name(GTK_WINDOW(window->main_window), "goodwolf"); gchar *provider_path_app = g_build_filename(DATADIR, "interface.css", NULL); /* flawfinder: ignore, just a presence check */ @@ -1244,7 +1244,7 @@ Options:\n\ g_free(provider_path_app); gchar *provider_path_user = - g_build_filename(g_get_user_data_dir(), "badwolf", "interface.css", NULL); + g_build_filename(g_get_user_data_dir(), "goodwolf", "interface.css", NULL); /* flawfinder: ignore, just a presence check */ if(access(provider_path_user, R_OK) == 0) { @@ -1261,13 +1261,13 @@ Options:\n\ gtk_notebook_set_action_widget(GTK_NOTEBOOK(window->notebook), window->new_tab, GTK_PACK_END); gtk_notebook_set_scrollable(GTK_NOTEBOOK(window->notebook), TRUE); - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(window->notebook), BADWOLF_TAB_POSITION); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(window->notebook), GOODWOLF_TAB_POSITION); gtk_notebook_popup_enable(GTK_NOTEBOOK(window->notebook)); gtk_container_add(GTK_CONTAINER(window->main_window), window->notebook); gtk_widget_queue_draw(window->notebook); - badwolf_downloads_tab_attach(window); + goodwolf_downloads_tab_attach(window); g_signal_connect( window->main_window, "key-press-event", G_CALLBACK(main_windowCb_key_press_event), window); @@ -1306,10 +1306,10 @@ Options:\n\ gtk_widget_show_all(window->main_window); if(argc == 1) - badwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, NULL, NULL), FALSE); + goodwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, NULL, NULL), FALSE); else for(int i = 1; i < argc; ++i) - badwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, argv[i], NULL), TRUE); + goodwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, argv[i], NULL), TRUE); gtk_notebook_set_current_page(GTK_NOTEBOOK(window->notebook), 1); diff --git a/badwolf.desktop b/goodwolf.desktop index 5bf865b..c597ece 100644 --- a/badwolf.desktop +++ b/goodwolf.desktop @@ -5,10 +5,10 @@ Type=Application Categories=Network;WebBrowser Comment=A minimalist and privacy-oriented web browser Comment[fr]=Un navigateur web minimaliste et orienté vers le respect de la vie privée -Exec=badwolf %U +Exec=goodwolf %U GenericName=Web Browser GenericName[fr]=Navigateur Web -Icon=badwolf +Icon=goodwolf Keywords=Internet;WWW;Browser;Web;WebKit;WebKitGTK Keywords[fr]=Internet;WWW;Browser;Web;Surfer;Navigateur;WebKit;WebKitGTK MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https diff --git a/badwolf.fr.1 b/goodwolf.fr.1 index 7a96a99..8252127 100644 --- a/badwolf.fr.1 +++ b/goodwolf.fr.1 @@ -7,10 +7,10 @@ .\" .\"******************************************************************* .Dd 2022-04-06 -.Dt BADWOLF 1 +.Dt GOODWOLF 1 .Os .Sh NAME -.Nm badwolf +.Nm goodwolf .Nd navigateur minimaliste et orienté vie-privée basé sur WebKitGTK .Sh SYNOPSIS .Nm @@ -79,14 +79,12 @@ Annule la recherche actuelle. .El .Sh ENVIRONMENT .Bl -tag -width Ds -.It Ev BADWOLF_L10N -Une liste séparé par des deux-points dans le format langue_PAYS où la langue -est en ISO-639 et le PAYS en ISO-3166. -Par example -.Ic BADWOLF_L10N="en_GB:fr_FR:de_DE" . -Quand cette variable n'est pas configuré, la correction orthographique est -désactivée. -Un nom plus générique est voulu pour le futur. +.It Ev GOODWOLF_L10N +A colon-separated list in the form lang_COUNTRY where lang is in ISO-639 and +COUNTRY in ISO-3166. For example +.Ic GOODWOLF_L10N="en_GB:fr_FR:de_DE" . +When this variable isn't set, spelling isn't activated. A more generic +variable name is also intended to be used in the future. .Pp Pour avoir la liste des dictionaires installés, executez: .Ic enchant-lsmod-2 -list-dicts @@ -103,7 +101,7 @@ commande pour vérifier où cela se trouve sur votre système. .Pp .Bl -tag -width Ds -compact -.It Pa ${XDG_CONFIG_HOME:-$HOME/.config}/badwolf/content-filters.json +.It Pa ${XDG_CONFIG_HOME:-$HOME/.config}/goodwolf/content-filters.json Fichier content-filter spécifique à WebKit, cela permet de blocker le contenu indésirable (pubs, nagware, …). Pour une introduction au format, voir (en anglais): @@ -117,12 +115,12 @@ Pour un convertiseur de filtres compatibles AdBlockPlus, essayez: Pour un fichier prêt à l'usage (que vous devrez mettre à jour périodiquement), essayez: .Lk https://easylist-downloads.adblockplus.org/easylist_min_content_blocker.json -.It Pa ${XDG_CACHE_HOME:-$HOME/.cache}/badwolf/filters +.It Pa ${XDG_CACHE_HOME:-$HOME/.cache}/goodwolf/filters Stockage des filtres compilés, les fichiers présents sont automatiquement générés et ne doivent pas être édité. Documenté ici seulement pour les isolations ou la gestion des contrôle d'accès. -.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/bookmarks.xbel +.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/bookmarks.xbel Fichier XBEL (XML Bookmark Exchange Language; Language XML d'Échange de Marques-Pages), connu pour être supporté par: .Xr elinks 1 , @@ -134,16 +132,16 @@ Pour plus d'information à propos du format, voir (en anglais): .Pp Pour un example de fichier XBEL voir: .Lk https://hacktivis.me/bookmarks.xbel -.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/webkit-web-extension/ +.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/webkit-web-extension/ Répertoire contenant les .Lk https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebExtension.html WebKitWebExtensions pour être chargés dans .Nm . Note\ : Ce ne sont pas les Web-Extensions basé sur JavaScript et supporté par Firefox ou Chrome, mais du code natif dans des shared objects qui utilisent l'API WebKitGTK. .Pp Des examples de quelques extensions utiles peuvent être trouvés sur: -.Lk https://hacktivis.me/git/badwolf-extensions -.It Pa ${DATADIR:-/usr/local/share}/badwolf/interface.css -.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/interface.css +.Lk https://hacktivis.me/git/goodwolf-extensions +.It Pa ${DATADIR:-/usr/local/share}/goodwolf/interface.css +.It Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/interface.css .\" GNOME can't even into doing any redirections of the few docs available Fichiers CSS (respectivement système et utilisateur) pour changer le style de l'interface de @@ -157,10 +155,10 @@ Pour tester les styles je recommende d'utiliser la variable d'environemnt et d'aller à l'onglet CSS. .El .Sh AUTHORS -.An Haelwenn (lanodan) Monnier Aq Mt contact+badwolf@hacktivis.me +.An Haelwenn (lanodan) Monnier Aq Mt contact+goodwolf@hacktivis.me .Sh BUGS Vous pouvez soumettre des contributions ou des tickets à -.Lk https://sr.ht/~lanodan/badwolf/ +.Lk https://sr.ht/~lanodan/goodwolf/ avec .Xr git-send-email 1 pour les modifications. @@ -1,12 +1,12 @@ -#ifndef BADWOLF_H_INCLUDED -#define BADWOLF_H_INCLUDED +#ifndef GOODWOLF_H_INCLUDED +#define GOODWOLF_H_INCLUDED #include <gtk/gtk.h> #include <inttypes.h> /* uint64_t */ #include <webkit2/webkit2.h> #if !WEBKIT_CHECK_VERSION(2, 32, 0) -#error WebkitGTK 2.32.0 is the latest supported version for badwolf. +#error WebkitGTK 2.32.0 is the latest supported version for goodwolf. #endif extern const gchar *homepage; @@ -42,10 +42,10 @@ struct Client GtkWidget *search; }; -GtkWidget *badwolf_new_tab_box(const gchar *title, struct Client *browser); +GtkWidget *goodwolf_new_tab_box(const gchar *title, struct Client *browser); void webView_tab_label_change(struct Client *browser, const gchar *title); struct Client * new_browser(struct Window *window, const gchar *target_url, struct Client *old_browser); -int badwolf_new_tab(GtkNotebook *notebook, struct Client *browser, bool auto_switch); -gint badwolf_get_tab_position(GtkContainer *notebook, GtkWidget *child); -#endif /* BADWOLF_H_INCLUDED */ +int goodwolf_new_tab(GtkNotebook *notebook, struct Client *browser, bool auto_switch); +gint goodwolf_get_tab_position(GtkContainer *notebook, GtkWidget *child); +#endif /* GOODWOLF_H_INCLUDED */ diff --git a/badwolf.inkscape.svg b/goodwolf.inkscape.svg index b28266a..973f85b 100644 --- a/badwolf.inkscape.svg +++ b/goodwolf.inkscape.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" - sodipodi:docname="badwolf.inkscape.svg" + sodipodi:docname="goodwolf.inkscape.svg" id="svg17" viewBox="0 0 16.93333 16.93333" version="1.1" diff --git a/badwolf.svg b/goodwolf.svg index bbf3777..bbf3777 100644 --- a/badwolf.svg +++ b/goodwolf.svg diff --git a/icons/hicolor/128x128/apps/badwolf.png b/icons/hicolor/128x128/apps/goodwolf.png Binary files differindex 922295a..922295a 100644 --- a/icons/hicolor/128x128/apps/badwolf.png +++ b/icons/hicolor/128x128/apps/goodwolf.png diff --git a/icons/hicolor/24x24/apps/badwolf.png b/icons/hicolor/24x24/apps/goodwolf.png Binary files differindex 1e5bb8c..1e5bb8c 100644 --- a/icons/hicolor/24x24/apps/badwolf.png +++ b/icons/hicolor/24x24/apps/goodwolf.png diff --git a/icons/hicolor/256x256/apps/badwolf.png b/icons/hicolor/256x256/apps/goodwolf.png Binary files differindex c2d2519..c2d2519 100644 --- a/icons/hicolor/256x256/apps/badwolf.png +++ b/icons/hicolor/256x256/apps/goodwolf.png diff --git a/icons/hicolor/32x32/apps/badwolf.png b/icons/hicolor/32x32/apps/goodwolf.png Binary files differindex 8dc45c8..8dc45c8 100644 --- a/icons/hicolor/32x32/apps/badwolf.png +++ b/icons/hicolor/32x32/apps/goodwolf.png diff --git a/icons/hicolor/48x48/apps/badwolf.png b/icons/hicolor/48x48/apps/goodwolf.png Binary files differindex 09c7d59..09c7d59 100644 --- a/icons/hicolor/48x48/apps/badwolf.png +++ b/icons/hicolor/48x48/apps/goodwolf.png diff --git a/icons/hicolor/64x64/apps/badwolf.png b/icons/hicolor/64x64/apps/goodwolf.png Binary files differindex fdbcb59..fdbcb59 100644 --- a/icons/hicolor/64x64/apps/badwolf.png +++ b/icons/hicolor/64x64/apps/goodwolf.png diff --git a/icons/hicolor/scalable/apps/badwolf.svg b/icons/hicolor/scalable/apps/goodwolf.svg index fccd2ea..fccd2ea 100644 --- a/icons/hicolor/scalable/apps/badwolf.svg +++ b/icons/hicolor/scalable/apps/goodwolf.svg diff --git a/keybindings.c b/keybindings.c index 7108acd..e7e0846 100644 --- a/keybindings.c +++ b/keybindings.c @@ -4,7 +4,7 @@ #include "keybindings.h" -#include "badwolf.h" +#include "goodwolf.h" #include <glib/gi18n.h> /* _() */ @@ -14,7 +14,7 @@ about_dialogCb_activate_link(GtkAboutDialog *about_dialog, gchar *uri, gpointer (void)about_dialog; struct Window *window = (struct Window *)user_data; - badwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, uri, NULL), TRUE); + goodwolf_new_tab(GTK_NOTEBOOK(window->notebook), new_browser(window, uri, NULL), TRUE); gtk_window_close(GTK_WINDOW(about_dialog)); @@ -22,7 +22,7 @@ about_dialogCb_activate_link(GtkAboutDialog *about_dialog, gchar *uri, gpointer } static void -badwolf_about_dialog(GtkWindow *main_window, gpointer user_data) +goodwolf_about_dialog(GtkWindow *main_window, gpointer user_data) { struct Window *window = (struct Window *)user_data; GtkWidget *about_dialog = gtk_about_dialog_new(); @@ -42,11 +42,11 @@ badwolf_about_dialog(GtkWindow *main_window, gpointer user_data) "SPDX-License-Identifier: BSD-3-Clause"); gtk_about_dialog_set_copyright( GTK_ABOUT_DIALOG(about_dialog), - "2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf>"); + "2019-2021 Badwolf Authors <https://hacktivis.me/projects/goodwolf>"); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about_dialog), homepage); gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about_dialog), comments); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_dialog), version); - gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(about_dialog), "badwolf"); + gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(about_dialog), "goodwolf"); g_signal_connect(about_dialog, "activate-link", G_CALLBACK(about_dialogCb_activate_link), window); @@ -112,7 +112,7 @@ commonCb_key_press_event(struct Window *window, GdkEvent *event, struct Client * { case GDK_KEY_Page_Down: gtk_notebook_next_page(notebook); return TRUE; case GDK_KEY_Page_Up: gtk_notebook_prev_page(notebook); return TRUE; - case GDK_KEY_t: badwolf_new_tab(notebook, new_browser(window, NULL, NULL), TRUE); return TRUE; + case GDK_KEY_t: goodwolf_new_tab(notebook, new_browser(window, NULL, NULL), TRUE); return TRUE; } } } @@ -151,7 +151,7 @@ commonCb_key_press_event(struct Window *window, GdkEvent *event, struct Client * { switch(((GdkEventKey *)event)->keyval) { - case GDK_KEY_F1: badwolf_about_dialog(GTK_WINDOW(window->main_window), window); return TRUE; + case GDK_KEY_F1: goodwolf_about_dialog(GTK_WINDOW(window->main_window), window); return TRUE; } } diff --git a/keybindings.h b/keybindings.h index bec9189..a690ee0 100644 --- a/keybindings.h +++ b/keybindings.h @@ -1,6 +1,6 @@ #ifndef KEYBINDINGS_H_INCLUDED #define KEYBINDINGS_H_INCLUDED -#include "badwolf.h" +#include "goodwolf.h" #include <gtk/gtk.h> #include <webkit2/webkit2.h> diff --git a/po/manpage.pot b/po/manpage.pot index c41e121..dce2850 100644 --- a/po/manpage.pot +++ b/po/manpage.pot @@ -18,53 +18,53 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. type: Dd -#: badwolf.1:4 +#: goodwolf.1:4 #, no-wrap msgid "2022-04-06" msgstr "" #. type: Dt -#: badwolf.1:5 +#: goodwolf.1:5 #, no-wrap -msgid "BADWOLF 1" +msgid "GOODWOLF 1" msgstr "" #. type: Sh -#: badwolf.1:7 +#: goodwolf.1:7 #, no-wrap msgid "NAME" msgstr "" #. type: Plain text -#: badwolf.1:9 -msgid "E<.Nm badwolf>" +#: goodwolf.1:9 +msgid "E<.Nm goodwolf>" msgstr "" #. type: Nd -#: badwolf.1:9 +#: goodwolf.1:9 #, no-wrap msgid "minimalist and privacy-oriented web browser based on WebKitGTK" msgstr "" #. type: Sh -#: badwolf.1:10 +#: goodwolf.1:10 #, no-wrap msgid "SYNOPSIS" msgstr "" #. type: Plain text -#: badwolf.1:14 +#: goodwolf.1:14 msgid "E<.Nm> E<.Op Ar webkit/gtk options> E<.Op Ar URLs or paths>" msgstr "" #. type: Sh -#: badwolf.1:14 +#: goodwolf.1:14 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: Plain text -#: badwolf.1:17 +#: goodwolf.1:17 msgid "" "E<.Nm> is a minimalist browser that cares about privacy, it is based on " "WebKitGTK and thus also accepts WebKitGTK (and dependencies) flags and " @@ -73,20 +73,20 @@ msgid "" msgstr "" #. type: Plain text -#: badwolf.1:21 +#: goodwolf.1:21 msgid "" "Runtime configuration specific to E<.Nm> will probably get added at a later " "release." msgstr "" #. type: Sh -#: badwolf.1:21 +#: goodwolf.1:21 #, no-wrap msgid "KEYBINDINGS" msgstr "" #. type: Plain text -#: badwolf.1:25 +#: goodwolf.1:25 msgid "" "The following section lists the keybinding by their action, each item is " "described by the widget the focus is on or E<.Aq any> if it works for the " @@ -94,246 +94,246 @@ msgid "" msgstr "" #. type: It -#: badwolf.1:26 +#: goodwolf.1:26 #, no-wrap msgid "webview Ctrl-Scroll" msgstr "" #. type: Plain text -#: badwolf.1:28 +#: goodwolf.1:28 msgid "Zooms the webpage in/out." msgstr "" #. type: It -#: badwolf.1:28 +#: goodwolf.1:28 #, no-wrap msgid "webview Ctrl-0" msgstr "" #. type: Plain text -#: badwolf.1:30 +#: goodwolf.1:30 msgid "Resets webpage zoom to 100%." msgstr "" #. type: It -#: badwolf.1:30 +#: goodwolf.1:30 #, no-wrap msgid "any Ctrl-t" msgstr "" #. type: Plain text -#: badwolf.1:32 +#: goodwolf.1:32 msgid "Creates a new tab (in a new session, similar as pressing the button)" msgstr "" #. type: It -#: badwolf.1:32 +#: goodwolf.1:32 #, no-wrap msgid "browser Ctrl-F4, browser Alt-d" msgstr "" #. type: Plain text -#: badwolf.1:34 +#: goodwolf.1:34 msgid "Closes the current tab" msgstr "" #. type: It -#: badwolf.1:34 +#: goodwolf.1:34 #, no-wrap msgid "browser Ctrl-f" msgstr "" #. type: Plain text -#: badwolf.1:36 +#: goodwolf.1:36 msgid "Focuses on the search entry" msgstr "" #. type: It -#: badwolf.1:36 +#: goodwolf.1:36 #, no-wrap msgid "browser Ctrl-l" msgstr "" #. type: Plain text -#: badwolf.1:38 +#: goodwolf.1:38 msgid "Focuses on the location(URL) entry" msgstr "" #. type: It -#: badwolf.1:38 +#: goodwolf.1:38 #, no-wrap msgid "browser Ctrl-Shift-r / Ctrl-r, browser F5" msgstr "" #. type: Plain text -#: badwolf.1:40 +#: goodwolf.1:40 msgid "Reloads the content in the current tab (with/without clearing cache)" msgstr "" #. type: It -#: badwolf.1:40 +#: goodwolf.1:40 #, no-wrap msgid "browser Escape" msgstr "" #. type: Plain text -#: badwolf.1:42 +#: goodwolf.1:42 msgid "Stops loading the content in the current tab" msgstr "" #. type: It -#: badwolf.1:42 +#: goodwolf.1:42 #, no-wrap msgid "browser F7" msgstr "" #. type: Plain text -#: badwolf.1:44 +#: goodwolf.1:44 msgid "Toggles caret browsing." msgstr "" #. type: It -#: badwolf.1:44 +#: goodwolf.1:44 #, no-wrap msgid "browser F12" msgstr "" #. type: Plain text -#: badwolf.1:46 +#: goodwolf.1:46 msgid "Opens the web inspector." msgstr "" #. type: It -#: badwolf.1:46 +#: goodwolf.1:46 #, no-wrap msgid "browser Ctrl-[ / Ctrl-]" msgstr "" #. type: Plain text -#: badwolf.1:48 +#: goodwolf.1:48 msgid "Go back/forward in current tab's history" msgstr "" #. type: It -#: badwolf.1:48 +#: goodwolf.1:48 #, no-wrap msgid "browser Ctrl-p" msgstr "" #. type: Plain text -#: badwolf.1:50 +#: goodwolf.1:50 msgid "Print the current page. (spawns a dialog)" msgstr "" #. type: It -#: badwolf.1:50 +#: goodwolf.1:50 #, no-wrap msgid "any Alt-Left / Alt-Right" msgstr "" #. type: Plain text -#: badwolf.1:52 badwolf.1:63 +#: goodwolf.1:52 goodwolf.1:63 msgid "Go to the previous/next tab" msgstr "" #. type: It -#: badwolf.1:52 +#: goodwolf.1:52 #, no-wrap msgid "any F1" msgstr "" #. type: Plain text -#: badwolf.1:54 +#: goodwolf.1:54 msgid "Shows the about dialog" msgstr "" #. type: It -#: badwolf.1:54 +#: goodwolf.1:54 #, no-wrap msgid "any Alt-n" msgstr "" #. type: Plain text -#: badwolf.1:57 +#: goodwolf.1:57 msgid "Where n is any numeric-row key. Go to the n-th tab, 0 goes to the last one." msgstr "" #. type: Ss -#: badwolf.1:58 +#: goodwolf.1:58 #, no-wrap msgid "DEFAULT ONES" msgstr "" #. type: Plain text -#: badwolf.1:60 +#: goodwolf.1:60 msgid "Here is a incomplete list of the default Webkit/GTK keybindings:" msgstr "" #. type: It -#: badwolf.1:61 +#: goodwolf.1:61 #, no-wrap msgid "any Ctrl-PageUp / Ctrl-PageDown" msgstr "" #. type: It -#: badwolf.1:63 +#: goodwolf.1:63 #, no-wrap msgid "search Ctrl-g / Ctrl-Shift-g" msgstr "" #. type: Plain text -#: badwolf.1:65 +#: goodwolf.1:65 msgid "When the search box is focused it goes to the Next/Previous search term." msgstr "" #. type: It -#: badwolf.1:65 +#: goodwolf.1:65 #, no-wrap msgid "search Escape" msgstr "" #. type: Plain text -#: badwolf.1:67 +#: goodwolf.1:67 msgid "Cancels current search" msgstr "" #. type: Sh -#: badwolf.1:68 +#: goodwolf.1:68 #, no-wrap msgid "ENVIRONMENT" msgstr "" #. type: It -#: badwolf.1:70 +#: goodwolf.1:70 #, no-wrap -msgid "Ev BADWOLF_L10N" +msgid "Ev GOODWOLF_L10N" msgstr "" #. type: Plain text -#: badwolf.1:76 +#: goodwolf.1:76 msgid "" "A colon-separated list in the form lang_COUNTRY where lang is in ISO-639 and " "COUNTRY in ISO-3166. For example E<.Ic " -"BADWOLF_L10N=\"en_GB:fr_FR:de_DE\">. When this variable isn't set, spelling " -"isn't activated. A more generic variable name is also intended to be used " -"in the future." +"GOODWOLF_L10N=\"en_GB:fr_FR:de_DE\">. When this variable isn't set, " +"spelling isn't activated. A more generic variable name is also intended to " +"be used in the future." msgstr "" #. type: Plain text -#: badwolf.1:81 +#: goodwolf.1:81 msgid "" "To get the list of supported dictionaries execute E<.Ic enchant-lsmod-2 " "-list-dicts> or before enchant 2.0: E<.Ic enchant-lsmod -list-dicts>" msgstr "" #. type: Sh -#: badwolf.1:82 +#: goodwolf.1:82 #, no-wrap msgid "FILES" msgstr "" #. type: Plain text -#: badwolf.1:88 +#: goodwolf.1:88 msgid "" "The following paths are using E<.Xr sh 1> syntax to correctly support XDG " "Base Directory Specification, you can use the E<.Xr echo 1> command to check " @@ -341,13 +341,13 @@ msgid "" msgstr "" #. type: It -#: badwolf.1:90 +#: goodwolf.1:90 #, no-wrap -msgid "Pa ${XDG_CONFIG_HOME:-$HOME/.config}/badwolf/content-filters.json" +msgid "Pa ${XDG_CONFIG_HOME:-$HOME/.config}/goodwolf/content-filters.json" msgstr "" #. type: Plain text -#: badwolf.1:93 +#: goodwolf.1:93 msgid "" "WebKit-specific content-filter file, this allows to block unwanted content " "(ads, nagware, ...). For some introductory information about the format " @@ -355,23 +355,23 @@ msgid "" msgstr "" #. type: Plain text -#: badwolf.1:98 +#: goodwolf.1:98 msgid "For a converter using AblockPlus-style filters, try:" msgstr "" #. type: Plain text -#: badwolf.1:101 +#: goodwolf.1:101 msgid "For a ready-to-use file (that you should update periodically), try:" msgstr "" #. type: It -#: badwolf.1:102 +#: goodwolf.1:102 #, no-wrap -msgid "Pa ${XDG_CACHE_HOME:-$HOME/.cache}/badwolf/filters" +msgid "Pa ${XDG_CACHE_HOME:-$HOME/.cache}/goodwolf/filters" msgstr "" #. type: Plain text -#: badwolf.1:105 +#: goodwolf.1:105 msgid "" "This is where the compiled filters are stored, the file(s) in it are " "automatically generated and so shouldn't be edited. Documented here only " @@ -379,13 +379,13 @@ msgid "" msgstr "" #. type: It -#: badwolf.1:105 +#: goodwolf.1:105 #, no-wrap -msgid "Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/bookmarks.xbel" +msgid "Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/bookmarks.xbel" msgstr "" #. type: Plain text -#: badwolf.1:110 +#: goodwolf.1:110 msgid "" "XBEL (XML Bookmark Exchange Language) file, known to be currently supported " "by: E<.Xr elinks 1>, E<.Xr konqueror 1>, E<.Xr kbookmarkeditor 1 . Doing a " @@ -394,28 +394,28 @@ msgid "" msgstr "" #. type: Plain text -#: badwolf.1:112 +#: goodwolf.1:112 msgid "For more information about this format see:" msgstr "" #. type: Plain text -#: badwolf.1:115 +#: goodwolf.1:115 msgid "For an example XBEL file see:" msgstr "" #. type: It -#: badwolf.1:116 +#: goodwolf.1:116 #, no-wrap -msgid "Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/webkit-web-extension/" +msgid "Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/webkit-web-extension/" msgstr "" #. type: Plain text -#: badwolf.1:118 +#: goodwolf.1:118 msgid "Directory containing the" msgstr "" #. type: Plain text -#: badwolf.1:121 +#: goodwolf.1:121 msgid "" "to be loaded into E<.Nm . Note: They aren't the JavaScript-based " "Web-Extensions supported by Firefox or Chrome, but native code in shared " @@ -423,37 +423,37 @@ msgid "" msgstr "" #. type: Plain text -#: badwolf.1:123 +#: goodwolf.1:123 msgid "Examples of useful extensions may be found at:" msgstr "" #. type: It -#: badwolf.1:124 +#: goodwolf.1:124 #, no-wrap -msgid "Pa ${DATADIR:-/usr/local/share}/badwolf/interface.css" +msgid "Pa ${DATADIR:-/usr/local/share}/goodwolf/interface.css" msgstr "" #. type: It -#: badwolf.1:125 +#: goodwolf.1:125 #, no-wrap -msgid "Pa ${XDG_DATA_HOME:-$HOME/.local/share}/badwolf/interface.css" +msgid "Pa ${XDG_DATA_HOME:-$HOME/.local/share}/goodwolf/interface.css" msgstr "" #. GNOME can't even into doing any redirections of the few docs available #. type: Plain text -#: badwolf.1:131 +#: goodwolf.1:131 msgid "" "CSS files (respectively system and user-level) for styling E<.Nm> " "interface. See" msgstr "" #. type: Plain text -#: badwolf.1:133 +#: goodwolf.1:133 msgid "for the properties being available." msgstr "" #. type: Plain text -#: badwolf.1:139 +#: goodwolf.1:139 msgid "" "For testing your styles I would recommend using the E<.Ev " "GTK_DEBUG=interactive> environment variable on launching E<.Nm> and going to " @@ -461,28 +461,28 @@ msgid "" msgstr "" #. type: Sh -#: badwolf.1:140 +#: goodwolf.1:140 #, no-wrap msgid "AUTHORS" msgstr "" #. type: Plain text -#: badwolf.1:142 -msgid "E<.An Haelwenn (lanodan) Monnier Aq Mt contact+badwolf@hacktivis.me>" +#: goodwolf.1:142 +msgid "E<.An Haelwenn (lanodan) Monnier Aq Mt contact+goodwolf@hacktivis.me>" msgstr "" #. type: Sh -#: badwolf.1:142 +#: goodwolf.1:142 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: badwolf.1:144 +#: goodwolf.1:144 msgid "You can submit contributions or tickets to" msgstr "" #. type: Plain text -#: badwolf.1:147 +#: goodwolf.1:147 msgid "with E<.Xr git-send-email 1> for patches." msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 32905ff..8147786 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -74,23 +74,23 @@ msgstr "" msgid "Bookmarks: unable to parse file \"%s\"\n" msgstr "" -#: badwolf.c:1190 +#: goodwolf.c:1190 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:497 +#: goodwolf.c:497 msgid "Continue" msgstr "" -#: badwolf.c:442 +#: goodwolf.c:442 msgid "" "Couldn't verify the TLS certificate to ensure a better security of the " "connection. You might want to verify your machine and network.\n" "\n" msgstr "" -#: badwolf.c:113 +#: goodwolf.c:113 msgid "Crashed" msgstr "" @@ -98,31 +98,31 @@ msgstr "" msgid "Download starting…" msgstr "" -#: badwolf.c:465 +#: goodwolf.c:465 msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" -#: badwolf.c:446 +#: goodwolf.c:446 msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "" -#: badwolf.c:459 +#: goodwolf.c:459 msgid "Error: The certificate has been revoked.\n" msgstr "" -#: badwolf.c:456 +#: goodwolf.c:456 msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "" -#: badwolf.c:462 +#: goodwolf.c:462 msgid "Error: The certificate is considered to be insecure.\n" msgstr "" -#: badwolf.c:453 +#: goodwolf.c:453 msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "" -#: badwolf.c:449 +#: goodwolf.c:449 msgid "Error: The given identity doesn't match the expected one.\n" msgstr "" @@ -133,99 +133,99 @@ msgid "" "Runtime WebKit version: %d.%d.%d" msgstr "" -#: badwolf.c:1013 +#: goodwolf.c:1013 msgid "New tab" msgstr "" -#: badwolf.c:1260 +#: goodwolf.c:1260 msgid "Open new tab" msgstr "" -#: badwolf.c:117 +#: goodwolf.c:117 msgid "Out of Memory" msgstr "" -#: badwolf.c:1188 +#: goodwolf.c:1188 #, c-format msgid "Running Badwolf version: %s\n" msgstr "" -#: badwolf.c:1195 +#: goodwolf.c:1195 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:494 +#: goodwolf.c:494 #, c-format msgid "TLS Error for %s." msgstr "" -#: badwolf.c:497 +#: goodwolf.c:497 msgid "Temporarily Add Exception" msgstr "" -#: badwolf.c:731 +#: goodwolf.c:731 msgid "Toggle javascript" msgstr "" -#: badwolf.c:736 +#: goodwolf.c:736 msgid "Toggle loading images automatically" msgstr "" -#: badwolf.c:121 +#: goodwolf.c:121 msgid "Unknown Crash" msgstr "" -#: badwolf.c:734 +#: goodwolf.c:734 msgid "_IMG" msgstr "" -#: badwolf.c:729 +#: goodwolf.c:729 msgid "_JS" msgstr "" -#: badwolf.c:1091 +#: goodwolf.c:1216 #, c-format -msgid "badwolf: content-filter loaded, adding to content-manager…\n" +msgid "content-filters file set to: %s\n" msgstr "" -#: badwolf.c:1111 badwolf.c:1118 +#: goodwolf.c:1091 #, c-format -msgid "badwolf: failed to compile content-filters.json, err: [%d] %s\n" +msgid "goodwolf: content-filter loaded, adding to content-manager…\n" msgstr "" -#: badwolf.c:1079 badwolf.c:1084 +#: goodwolf.c:1111 goodwolf.c:1118 #, c-format -msgid "badwolf: failed to load content-filter, err: [%d] %s\n" +msgid "goodwolf: failed to compile content-filters.json, err: [%d] %s\n" msgstr "" -#: badwolf.c:1216 +#: goodwolf.c:1079 goodwolf.c:1084 #, c-format -msgid "content-filters file set to: %s\n" +msgid "goodwolf: failed to load content-filter, err: [%d] %s\n" msgstr "" -#: badwolf.c:901 +#: goodwolf.c:901 msgid "search in current page" msgstr "" -#: badwolf.c:112 +#: goodwolf.c:112 msgid "the web process crashed.\n" msgstr "" -#: badwolf.c:116 +#: goodwolf.c:116 msgid "the web process exceeded the memory limit.\n" msgstr "" -#: badwolf.c:120 +#: goodwolf.c:120 msgid "the web process terminated for an unknown reason.\n" msgstr "" -#: badwolf.c:1202 +#: goodwolf.c:1202 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "" #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. -#: badwolf.c:1325 +#: goodwolf.c:1325 msgid "ø" msgstr "" @@ -9,7 +9,7 @@ #include <unistd.h> /* access() */ const gchar * -badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file) +goodwolf_ensure_uri_scheme(const gchar *text, gboolean try_file) { const gchar *fallback = "about:blank"; char *path = NULL; @@ -2,7 +2,7 @@ #define URI_H_INCLUDED #include <glib.h> -/* badwolf_ensure_uri_scheme: tries to add a scheme on a pseudo-URL missing a scheme +/* goodwolf_ensure_uri_scheme: tries to add a scheme on a pseudo-URL missing a scheme * - gchar text: pseudo-URL missing a scheme * - gboolean try_file: when TRUE check try first if it can be a file:// path * @@ -13,5 +13,5 @@ * In the end use the fallback (`http://` for now, might get configuration), * might get some safeguard. */ -const gchar *badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file); +const gchar *goodwolf_ensure_uri_scheme(const gchar *text, gboolean try_file); #endif /* URI_H_INCLUDED */ @@ -8,7 +8,7 @@ #include <glib/gi18n.h> static void -badwolf_ensure_uri_scheme_test(void) +goodwolf_ensure_uri_scheme_test(void) { const gchar *fallback = "about:blank"; @@ -37,16 +37,16 @@ badwolf_ensure_uri_scheme_test(void) {"http://example.org", "example.org", TRUE}, {"http://", "http://", FALSE}, {"http://", "http://", TRUE}, - {"http://badwolf.c", "badwolf.c", FALSE} // + {"http://goodwolf.c", "goodwolf.c", FALSE} // }; for(size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) { - g_info("badwolf_ensure_uri_scheme(\"%s\", %s)", + g_info("goodwolf_ensure_uri_scheme(\"%s\", %s)", cases[i].text, cases[i].try_file ? "TRUE" : "FALSE"); - const gchar *got = badwolf_ensure_uri_scheme(cases[i].text, cases[i].try_file); + const gchar *got = goodwolf_ensure_uri_scheme(cases[i].text, cases[i].try_file); if(g_strcmp0(got, cases[i].expect) != 0) { @@ -60,7 +60,7 @@ main(int argc, char *argv[]) { g_test_init(&argc, &argv, NULL); - g_test_add_func("/badwolf_ensure_uri_scheme/test", badwolf_ensure_uri_scheme_test); + g_test_add_func("/goodwolf_ensure_uri_scheme/test", goodwolf_ensure_uri_scheme_test); return g_test_run(); } diff --git a/usr.bin.badwolf b/usr.bin.goodwolf index 861ee9f..0b7f556 100644 --- a/usr.bin.badwolf +++ b/usr.bin.goodwolf @@ -5,14 +5,14 @@ # Made on Gentoo Linux with PREFIX=/usr #include <tunables/global> -/usr/bin/badwolf { +/usr/bin/goodwolf { #include <abstractions/enchant> #include <abstractions/gnome> #include <abstractions/ibus> #include <abstractions/uim> #include <abstractions/private-files-strict> - /usr/bin/badwolf mr, + /usr/bin/goodwolf mr, /usr/bin/bwrap Cx, /usr/libexec/webkit2gtk-4.0/WebKitNetworkProcess Cx, /usr/libexec/webkit2gtk-4.0/WebKitWebProcess Cx, @@ -20,15 +20,15 @@ owner @{PROC}/@{pid}/cmdline r, owner @{PROC}/@{pid}/fd/ r, - owner @{HOME}/.local/share/badwolf/ r, - owner @{HOME}/.local/share/badwolf/** r, + owner @{HOME}/.local/share/goodwolf/ r, + owner @{HOME}/.local/share/goodwolf/** r, deny @{HOME}/.local/share/webkitgtk/** rwmlk, / r, /** r, - #include <local/usr.bin.badwolf> + #include <local/usr.bin.goodwolf> profile /usr/libexec/webkit2gtk-4.0/WebKitNetworkProcess { #include <abstractions/base> @@ -64,8 +64,8 @@ /etc/nsswitch.conf r, /dev/ r, - owner @{HOME}/.local/share/badwolf/webkit-web-extension/ r, - owner @{HOME}/.local/share/badwolf/webkit-web-extension/** mr, + owner @{HOME}/.local/share/goodwolf/webkit-web-extension/ r, + owner @{HOME}/.local/share/goodwolf/webkit-web-extension/** mr, } profile /usr/bin/bwrap { |