Rename user-facing bits of Dillo to Flenser.

I dunno if I got them all.

This is also now version 0.0.0
This commit is contained in:
2025-04-12 00:42:01 -04:00
parent 564567d389
commit e595830fab
32 changed files with 161 additions and 155 deletions

View File

@ -44,7 +44,7 @@ const char *const AboutSplash=
"right corner at any time. Here are some tips to get you started:</p>\n"
"\n"
"<ul>\n"
" <li>The main configuration file is at <code>~/.dillo/dillorc</code>.</li>\n"
" <li>The main configuration file is at <code>~/.flenser/flenserrc</code>.</li>\n"
" <li>Most actions can also be done by using the <em>keyboard</em>.</li>\n"
" <li>Cookies are <em>disabled by default</em>.</li>\n"
"</ul>\n"

View File

@ -349,7 +349,7 @@ static int Dpi_start_dpid(void)
pid = fork();
if (pid == 0) {
/* This is the child process. Execute the command. */
char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
char *path1 = dStrconcat(dGethomedir(), "/.flenser/dpid", NULL);
dClose(st_pipe[0]);
if (execl(path1, "dpid", (char*)NULL) == -1) {
dFree(path1);
@ -397,7 +397,7 @@ static int Dpi_read_comm_keys(int *port)
char *fname, *rcline = NULL, *tail;
int i, ret = -1;
fname = dStrconcat(dGethomedir(), "/.dillo/dpid_comm_keys", NULL);
fname = dStrconcat(dGethomedir(), "/.flenser/dpid_comm_keys", NULL);
if ((In = fopen(fname, "r")) == NULL) {
MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno));
} else if ((rcline = dGetline(In)) == NULL) {

View File

@ -294,7 +294,7 @@ static void Tls_load_certificates()
}
}
userpath = dStrconcat(dGethomedir(), "/.dillo/certs/", NULL);
userpath = dStrconcat(dGethomedir(), "/.flenser/certs/", NULL);
Tls_load_certificates_from_path(userpath);
dFree(userpath);

View File

@ -240,7 +240,7 @@ static void Tls_load_certificates(void)
X509_LOOKUP_add_dir(lookup, ca_paths[u], X509_FILETYPE_PEM);
}
userpath = dStrconcat(dGethomedir(), "/.dillo/certs/", NULL);
userpath = dStrconcat(dGethomedir(), "/.flenser/certs/", NULL);
X509_LOOKUP_add_dir(lookup, userpath, X509_FILETYPE_PEM);
dFree(userpath);
@ -330,14 +330,14 @@ static int Tls_save_certificate_home(X509 * cert)
uint_t i = 0;
int ret = 1;
/* Attempt to create .dillo/certs blindly - check later */
snprintf(buf, 4096, "%s/.dillo/", dGethomedir());
/* Attempt to create .flenser/certs blindly - check later */
snprintf(buf, 4096, "%s/.flenser/", dGethomedir());
mkdir(buf, 01777);
snprintf(buf, 4096, "%s/.dillo/certs/", dGethomedir());
snprintf(buf, 4096, "%s/.flenser/certs/", dGethomedir());
mkdir(buf, 01777);
do {
snprintf(buf, 4096, "%s/.dillo/certs/%lx.%u",
snprintf(buf, 4096, "%s/.flenser/certs/%lx.%u",
dGethomedir(), X509_subject_name_hash(cert), i);
fp=fopen(buf, "r");

View File

@ -10,9 +10,9 @@ AM_CXXFLAGS = @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
SUBDIRS = IO
bin_PROGRAMS = dillo
bin_PROGRAMS = flenser
dillo_LDADD = \
flenser_LDADD = \
$(top_builddir)/dlib/libDlib.a \
$(top_builddir)/dpip/libDpip.a \
IO/libDiof.a \
@ -23,8 +23,8 @@ dillo_LDADD = \
@LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBWEBP_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ \
@LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBX11_LIBS@ @LIBSSL_LIBS@
dillo_SOURCES = \
dillo.cc \
flenser_SOURCES = \
flenser.cc \
version.cc \
version.hh \
paths.cc \
@ -141,8 +141,8 @@ dillo_SOURCES = \
xembed.hh
# https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html
nodist_dillo_SOURCES = commit.h
version.$(OBJEXT) dillo.$(OBJEXT): commit.h
nodist_flenser_SOURCES = commit.h
version.$(OBJEXT) flenser.$(OBJEXT): commit.h
CLEANFILES = commit.h
if GIT_AVAILABLE

View File

@ -249,7 +249,7 @@ static int Cookie_control_init(void)
bool_t enabled = FALSE;
/* Get a file pointer */
filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL);
filename = dStrconcat(dGethomedir(), "/.flenser/cookiesrc", NULL);
stream = Cookies_fopen(filename, const_cast< char * >( "DEFAULT DENY\n" ));
dFree(filename);

View File

@ -1,6 +1,6 @@
# domainrc - Dillo cross-domain request rules file.
# domainrc - Flenser cross-domain request rules file.
#
# Here you can tell Dillo what to do when one site wants to retrieve resources
# Here you can tell Flenser what to do when one site wants to retrieve resources
# (e.g., images, style sheets, redirection) from a different site.
#
# Lines that begin with a '#' are comments.

View File

@ -107,7 +107,7 @@ static const CLI_options Options[] = {
{"-v", "--version", 0, DILLO_CLI_VERSION,
" -v, --version Display version info and exit."},
{"-x", "--xid", 1, DILLO_CLI_XID,
" -x, --xid XID Open first Dillo window in an existing\n"
" -x, --xid XID Open first Flenser window in an existing\n"
" window whose window ID is XID."},
{NULL, NULL, 0, DILLO_CLI_NONE, NULL}
};
@ -460,13 +460,13 @@ int main(int argc, char **argv)
// set the default values for the preferences
a_Prefs_init();
// create ~/.dillo if not present
// create ~/.flenser if not present
Paths::init();
// initialize default key bindings
Keys::init();
// parse dillorc
// parse flenserrc
if ((fp = Paths::getPrefsFP(PATHS_RC_PREFS))) {
PrefsParser::parse(fp);
}
@ -518,7 +518,7 @@ int main(int argc, char **argv)
}
// Sets WM_CLASS hint on X11
Fl_Window::default_xclass("dillo");
Fl_Window::default_xclass("flenser");
Fl::scheme(prefs.theme);
@ -545,7 +545,7 @@ int main(int argc, char **argv)
// only way to set the
// default font in fltk1.3
fl_message_title_default("Dillo: Message");
fl_message_title_default("Flenser: Message");
// Create a new UI/bw pair
BrowserWindow *bw = a_UIcmd_browser_window_new(0, 0, xid, NULL);

View File

@ -42,7 +42,7 @@ void Paths::init(void)
dStrerror(errno));
}
path = dStrconcat(dGethomedir(), "/.dillo", NULL);
path = dStrconcat(dGethomedir(), "/.flenser", NULL);
if (stat(path, &st) == -1) {
if (errno == ENOENT) {
MSG("paths: Creating directory '%s/'\n", path);
@ -80,7 +80,7 @@ void Paths::free(void)
FILE *Paths::getPrefsFP(const char *rcFile)
{
FILE *fp;
char *path = dStrconcat(dGethomedir(), "/.dillo/", rcFile, NULL);
char *path = dStrconcat(dGethomedir(), "/.flenser/", rcFile, NULL);
if (!(fp = fopen(path, "r"))) {
MSG("paths: Cannot open file '%s': %s\n", path, dStrerror(errno));

View File

@ -12,7 +12,7 @@
#ifndef __PATHS_HH__
#define __PATHS_HH__
#define PATHS_RC_PREFS "dillorc"
#define PATHS_RC_PREFS "flenserrc"
#define PATHS_RC_KEYS "keysrc"
#define PATHS_RC_DOMAIN "domainrc"
#define PATHS_HSTS_PRELOAD "hsts_preload"

View File

@ -1077,7 +1077,7 @@ void StyleEngine::init () {
void StyleEngine::buildUserStyle () {
Dstr *style;
char *filename = dStrconcat(dGethomedir(), "/.dillo/style.css", NULL);
char *filename = dStrconcat(dGethomedir(), "/.flenser/style.css", NULL);
if ((style = a_Misc_file2dstr(filename))) {
CssParser::parse (NULL,NULL,cssContext,style->str, style->len,CSS_ORIGIN_USER);

View File

@ -298,7 +298,7 @@ UI *CustTabs::add_new_tab(UI *old_ui, int focus)
/* The UI is constructed in a comfortable fitting size, and then resized
* so FLTK doesn't get confused later with even smaller dimensions! */
current(0);
UI *new_ui = new UI(0,0,UI_MIN_W,UI_MIN_H,"Dillo:",old_ui);
UI *new_ui = new UI(0,0,UI_MIN_W,UI_MIN_H,"Flenser:",old_ui);
new_ui->resize(0,ctab_h,Wizard->w(),Wizard->h());
new_ui->tabs(this);
Wizard->add(new_ui);
@ -565,7 +565,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh,
Fl_Window *win;
if (ww <= 0 || wh <= 0) {
// Set default geometry from dillorc.
// Set default geometry from flenserrc.
ww = prefs.width;
wh = prefs.height;
}

View File

@ -1,6 +1,7 @@
/*
* Dillo web browser
* Flenser web browser
*
* Copyright 2025 ADAM David Alan Martin <adam@recursive.engineer>
* Copyright 2024 Rodrigo Arias Mallo <rodarima@gmail.com>
*
* This program is free software; you can redistribute it and/or modify