adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename user-facing bits of Dillo to Flenser.

Browse Source 
I dunno if I got them all.

This is also now version 0.0.0
This commit is contained in:
ADAM David Alan Martin
2025-04-12 00:42:01 -04:00
parent 564567d389
commit e595830fab
32 changed files with 161 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,8 @@
Flenser project Flenser project
============================================================================= =============================================================================
flenser-0.0.0 [Feb 28, 2025]
flenser-3.2.0 [Feb 28, 2025] flenser-3.2.0 [Feb 28, 2025]
+- Forked from dillo. +- Forked from dillo.
@ -10,6 +12,7 @@ flenser-3.2.0 [Feb 28, 2025]
- The coding style and related guides are hereby "abolished". - The coding style and related guides are hereby "abolished".
- The general architecture of modules and such will remain unchanged for now. - The general architecture of modules and such will remain unchanged for now.
- I'll start by moving to smart pointers and RAII anywhere I can. - I'll start by moving to smart pointers and RAII anywhere I can.
- Not really version 3.2.0. I'll roll the version back to 0.
============================================================================= =============================================================================
Dillo project Dillo project

8
Makefile.am
View File

@ -1,13 +1,13 @@
SUBDIRS = lout dw dlib dpip src doc dpid dpi test SUBDIRS = lout dw dlib dpip src doc dpid dpi test
dist_bin_SCRIPTS = dillo-install-hyphenation dist_bin_SCRIPTS = flenser-install-hyphenation
EXTRA_DIST = README.md Doxyfile dillorc install-dpi-local d_size.h EXTRA_DIST = README.md Doxyfile flenserrc install-dpi-local d_size.h
sysconf_DATA = dillorc sysconf_DATA = flenserrc
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_DATA = dillo.desktop desktop_DATA = flenser.desktop
appicon48dir = $(datadir)/icons/hicolor/48x48/apps/ appicon48dir = $(datadir)/icons/hicolor/48x48/apps/
appicon48_DATA = icons/48x48/dillo.png appicon48_DATA = icons/48x48/dillo.png

4
configure.ac
View File

@ -1,12 +1,12 @@
dnl Process this file with aclocal, autoconf and automake. dnl Process this file with aclocal, autoconf and automake.
AC_INIT([dillo], [3.2.0]) AC_INIT([flenser], [0.0.0])
dnl Detect the canonical target build environment dnl Detect the canonical target build environment
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/dillo.cc]) AC_CONFIG_SRCDIR([src/flenser.cc])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
sysconfdir=${sysconfdir}/${PACKAGE} sysconfdir=${sysconfdir}/${PACKAGE}

140
doc/user_help.in.html
View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Dillo User Manual</title> <title>Flenser User Manual</title>
<style> <style>
body { body {
background: white; background: white;
@ -74,13 +74,13 @@ footer {
<body> <body>
<div class="main"> <div class="main">
<h1>Dillo User Manual</h1> <h1>Flenser User Manual</h1>
<p>Welcome to the user manual of the Dillo browser. The manual is divided into <p>Welcome to the user manual of the Flenser browser. The manual is divided into
<em>sections</em> but is written in a <em>single page</em> to allow search by <em>sections</em> but is written in a <em>single page</em> to allow search by
keywords. Generated for version __VERSION__.</p> keywords. Generated for version __VERSION__.</p>
<details><!-- Not supported in Dillo, but decays ok --> <details><!-- Not supported in Flenser, but decays ok -->
<summary class="toc">Table of contents:</summary> <summary class="toc">Table of contents:</summary>
<ul class="toc"> <ul class="toc">
<li><a href="#introduction">Introduction</a></li> <li><a href="#introduction">Introduction</a></li>
@ -114,7 +114,7 @@ keywords. Generated for version __VERSION__.</p>
</ul> </ul>
<li><a href="#configuration">Configuration</a> <li><a href="#configuration">Configuration</a>
<ul> <ul>
<li><a href="#dillorc">Dillorc</a></li> <li><a href="#flenserrc">Flenserrc</a></li>
<li><a href="#cookiesrc">Cookiesrc</a></li> <li><a href="#cookiesrc">Cookiesrc</a></li>
<li><a href="#domainrc">Domainrc</a></li> <li><a href="#domainrc">Domainrc</a></li>
<li><a href="#style-css">Style.css</a></li> <li><a href="#style-css">Style.css</a></li>
@ -134,13 +134,13 @@ keywords. Generated for version __VERSION__.</p>
</details> </details>
<h2 id="introduction">Introduction</h2> <h2 id="introduction">Introduction</h2>
<p>Dillo is a web browser designed to be fast, use few resources and support <p>Flenser is a web browser designed to be fast, use few resources and support
slow and unreliable networks on resource-constrained machines. It can load local slow and unreliable networks on resource-constrained machines. It can load local
and remote files via HTTP, HTTPS and FTP. Other protocols like Gemini, Gopher, and remote files via HTTP, HTTPS and FTP. Other protocols like Gemini, Gopher,
IPFS and others are available as IPFS and others are available as
<a href="#plugins">plugins</a>.</p> <a href="#plugins">plugins</a>.</p>
<p>Dillo supports a subset of HTML 4.01 and CSS 2.1 but it <b>doesn't support <p>Flenser supports a subset of HTML 4.01 and CSS 2.1 but it <b>doesn't support
JavaScript</b> and only implements some elements of HTML 5 and CSS 3. It also JavaScript</b> and only implements some elements of HTML 5 and CSS 3. It also
renders plain text documents and images in PNG, JPG, GIF, SVG and WebP renders plain text documents and images in PNG, JPG, GIF, SVG and WebP
formats.</p> formats.</p>
@ -155,18 +155,18 @@ device. At the top of the browser window you have the location bar and the main
buttons to control the browser. You can leave the mouse for a brief moment over buttons to control the browser. You can leave the mouse for a brief moment over
any part of the menu to show a tooltip with more information. any part of the menu to show a tooltip with more information.
<p> <p>
Dillo has <em>context sensitive menus</em>, which are opened with the right mouse Flenser has <em>context sensitive menus</em>, which are opened with the right mouse
button, available on pages, links, images, forms, the Back and Forward buttons, button, available on pages, links, images, forms, the Back and Forward buttons,
and the bug meter. They show different actions to be performed specific to the and the bug meter. They show different actions to be performed specific to the
element. For example, to save a page you can right-click on the page and select element. For example, to save a page you can right-click on the page and select
"Save page as...". Or to copy a link URL you can right-click on a link and "Save page as...". Or to copy a link URL you can right-click on a link and
select "Copy link location". select "Copy link location".
<p> <p>
Dillo can hide all panels and use the whole window area to display the page. To Flenser can hide all panels and use the whole window area to display the page. To
switch between modes use the ESC key. You can also choose the control panel size switch between modes use the ESC key. You can also choose the control panel size
by going to the Tools button and selecting a different one under "Panel size". by going to the Tools button and selecting a different one under "Panel size".
<p> <p>
You can open this manual from Dillo by clicking on the top right "?" button. It You can open this manual from Flenser by clicking on the top right "?" button. It
doesn't require a network connection. doesn't require a network connection.
<h3 id="scrolling">Scrolling</h3> <h3 id="scrolling">Scrolling</h3>
@ -211,7 +211,7 @@ doesn't require a network connection.
</ul> </ul>
<p>You can control the <b>size of a <em>step</em></b> by setting the <p>You can control the <b>size of a <em>step</em></b> by setting the
<code>scroll_step</code> option in the <a href="#dillorc">dillorc</a> <code>scroll_step</code> option in the <a href="#flenserrc">flenserrc</a>
configuration file. By default it will scroll 100 pixels per step. The vertical configuration file. By default it will scroll 100 pixels per step. The vertical
scrollbar can be positioned on the left side setting the scrollbar can be positioned on the left side setting the
<code>scrollbar_on_left</code> option to <code>YES</code>, by default it is on <code>scrollbar_on_left</code> option to <code>YES</code>, by default it is on
@ -232,7 +232,7 @@ To find text in a document right-click to open the <em>Page menu</em> and select
<em>Find text</em> or press <code>Ctrl+F</code> on the keyboard. Then type the <em>Find text</em> or press <code>Ctrl+F</code> on the keyboard. Then type the
substring that you want to find and click Next (or the <code>Enter</code> key). substring that you want to find and click Next (or the <code>Enter</code> key).
</p> </p>
Dillo will scroll the page and highlight found text starting from the top. To Flenser will scroll the page and highlight found text starting from the top. To
find a word (not a substring) use spaces around it to limit the search to find a word (not a substring) use spaces around it to limit the search to
matching words only. matching words only.
<p> <p>
@ -248,7 +248,7 @@ button.
If you want to select more than one screen, hold the mouse left button down and If you want to select more than one screen, hold the mouse left button down and
scroll with PgUp, PgDn or the arrow keys. scroll with PgUp, PgDn or the arrow keys.
<P> <P>
If you want to paste an URL into Dillo, do it on the "clear-URL" If you want to paste an URL into Flenser, do it on the "clear-URL"
button (the "X" next to the <a href="#location-bar">location bar</a>). button (the "X" next to the <a href="#location-bar">location bar</a>).
<p> <p>
@ -259,7 +259,7 @@ zoom factor. Use <code>Ctrl +</code> to increase the size, <code>Ctrl -</code>
to decrease it and <code>Ctrl 0</code> to reset the value to 100%. to decrease it and <code>Ctrl 0</code> to reset the value to 100%.
<p> <p>
The initial zoom factor is specified by the <code>zoom_factor</code> option in The initial zoom factor is specified by the <code>zoom_factor</code> option in
the <a href="#dillorc">dillorc</a> configuration file. When a new tab or window the <a href="#flenserrc">flenserrc</a> configuration file. When a new tab or window
is opened, the current zoom factor value is inherited. is opened, the current zoom factor value is inherited.
<h2 id="navigation">Navigation</h2> <h2 id="navigation">Navigation</h2>
@ -327,7 +327,7 @@ You can also select the location bar content from the keyboard by pressing
<p> <p>
Several search engines are available by pressing the magnifying glass icon next Several search engines are available by pressing the magnifying glass icon next
to the location bar or by pressing <code>Ctrl+S</code>. The search engines are to the location bar or by pressing <code>Ctrl+S</code>. The search engines are
configured in <a href="#dillorc">Dillorc</a> with the option configured in <a href="#flenserrc">Flenserrc</a> with the option
<code>search_url</code>. Use it multiple times to define multiple search <code>search_url</code>. Use it multiple times to define multiple search
engines. engines.
<p> <p>
@ -338,19 +338,19 @@ search_url="dd DuckDuckGo http://duckduckgo.com/lite/?kp=-1&amp;kd=-1&amp;q=%s"
</pre> </pre>
<p> <p>
Defines the "DuckDuckGo" search engine with the prefix "<code>dd</code>", so you Defines the "DuckDuckGo" search engine with the prefix "<code>dd</code>", so you
can type in the location bar "<code>dd dillo browser</code>" to search with can type in the location bar "<code>dd flenser browser</code>" to search with
DuckDuckGo for the keywords "dillo browser". DuckDuckGo for the keywords "flenser browser".
<h3 id="tabs">Tabs</h3> <h3 id="tabs">Tabs</h3>
<p> <p>
Dillo can open different web pages into tabs. To open a link in a new tab click Flenser can open different web pages into tabs. To open a link in a new tab click
the middle button instead of the left button. The same applies to buttons to the middle button instead of the left button. The same applies to buttons to
submit a form. A new tab can also be opened from the <code>File</code> menu or submit a form. A new tab can also be opened from the <code>File</code> menu or
using the shortcut <code>Ctrl+T</code>. using the shortcut <code>Ctrl+T</code>.
<p> <p>
Press <code>Shift</code> while middle-clicking a link to automatically focus the Press <code>Shift</code> while middle-clicking a link to automatically focus the
new tab. If you want this behaviour to be the default, set the following option new tab. If you want this behaviour to be the default, set the following option
in the <a href="#dillorc">dillorc</a> configuration file: in the <a href="#flenserrc">flenserrc</a> configuration file:
<pre> <pre>
focus_new_tab=YES focus_new_tab=YES
</pre> </pre>
@ -372,21 +372,21 @@ right_click_closes_tab=NO
<p> <p>
Use the <code>new_tab_page</code> option to control which page is loaded in a Use the <code>new_tab_page</code> option to control which page is loaded in a
newly opened tab, by default is an empty page. To open the newly opened tab, by default is an empty page. To open the
bookmarks page set the following line in <a href="#dillorc">dillorc</a>: bookmarks page set the following line in <a href="#flenserrc">flenserrc</a>:
<pre> <pre>
new_tab_page="dpi:/bm/" new_tab_page="dpi:/bm/"
</pre> </pre>
<h3 id="bookmarks">Bookmarks</h3> <h3 id="bookmarks">Bookmarks</h3>
<p> <p>
Dillo can save URLs of web pages as bookmarks so you can open them later. To Flenser can save URLs of web pages as bookmarks so you can open them later. To
bookmark the current page, open the <em>Page menu</em> by right-clicking on the bookmark the current page, open the <em>Page menu</em> by right-clicking on the
page and select "Bookmark this page" (it also works over a link). page and select "Bookmark this page" (it also works over a link).
<p> <p>
To see or edit the bookmarks, click on the Bookmarks button on the panel or To see or edit the bookmarks, click on the Bookmarks button on the panel or
press <code>Ctrl+B</code>. press <code>Ctrl+B</code>.
<p> <p>
Bookmarks are handled by a built-in Dillo plugin named <code>bm</code> (read more Bookmarks are handled by a built-in Flenser plugin named <code>bm</code> (read more
about plugins in the <a href="#plugins">Plugins section</a>) and are about plugins in the <a href="#plugins">Plugins section</a>) and are
synchronized across all instances of the browser. The list of bookmarks can also synchronized across all instances of the browser. The list of bookmarks can also
be shown by opening the URL <a href="dpi:/bm/"><code>dpi:/bm/</code></a>. be shown by opening the URL <a href="dpi:/bm/"><code>dpi:/bm/</code></a>.
@ -397,24 +397,24 @@ can edit the file directly to change the bookmarks.
<h2 id="privacy-and-network">Privacy and network</h2> <h2 id="privacy-and-network">Privacy and network</h2>
<p>The default privacy policy in Dillo attempts to keep the user safe from <p>The default privacy policy in Flenser attempts to keep the user safe from
tracking, <em>even if this policy breaks a lot of website functionality</em>. In tracking, <em>even if this policy breaks a lot of website functionality</em>. In
this section you can add exceptions or relax the configuration at your own risk. this section you can add exceptions or relax the configuration at your own risk.
<h3 id="https">HTTPS</h3> <h3 id="https">HTTPS</h3>
<p>Dillo has support for <p>Flenser has support for
<a href="https://en.wikipedia.org/wiki/HTTPS">HTTPS</a>, <a href="https://en.wikipedia.org/wiki/HTTPS">HTTPS</a>,
allowing secure connections to remote websites. Use the protocol allowing secure connections to remote websites. Use the protocol
"<code>https:</code>" to specify the use of HTTPS. When a problem is encountered "<code>https:</code>" to specify the use of HTTPS. When a problem is encountered
with the remote certificate, a warning dialog explains the details and allows with the remote certificate, a warning dialog explains the details and allows
you to choose what to do: continue loading the website or cancel. you to choose what to do: continue loading the website or cancel.
<p> <p>
By default Dillo looks for a TLS library at build time, which can be OpenSSL or By default Flenser looks for a TLS library at build time, which can be OpenSSL or
mbedTLS. You can see which library is being used by looking at the console when mbedTLS. You can see which library is being used by looking at the console when
it starts: it starts:
<pre> <pre>
$ dillo $ flenser
dillo_dns_init: Here we go! (threaded) dillo_dns_init: Here we go! (threaded)
TLS library: <u>OpenSSL 3.2.1 30 Jan 2024</u> TLS library: <u>OpenSSL 3.2.1 30 Jan 2024</u>
... ...
@ -426,7 +426,7 @@ Due to privacy concerns, <b>cookies are disabled by default</b> unless
explicitly enabled in the configuration. explicitly enabled in the configuration.
<p> <p>
Support for cookies is implemented using a built-in plugin that shares them Support for cookies is implemented using a built-in plugin that shares them
between several instances of Dillo and follows the between several instances of Flenser and follows the
<a href="http://tools.ietf.org/html/rfc6265">RFC 6265</a> <a href="http://tools.ietf.org/html/rfc6265">RFC 6265</a>
specification. Current cookie limits are 20 per domain and specification. Current cookie limits are 20 per domain and
1200 in total. 1200 in total.
@ -436,17 +436,17 @@ the <a href="#cookiesrc">Cookiesrc section</a> to see how to enable cookies for
some domains or accept them by default.</p> some domains or accept them by default.</p>
<h3 id="proxy">Proxy</h3> <h3 id="proxy">Proxy</h3>
<p>Dillo can use a HTTP proxy by setting the environment variable <p>Flenser can use a HTTP proxy by setting the environment variable
<code>http_proxy</code> or the <code>http_proxy</code> or the
<a href="#dillorc">configuration option</a> with the same name. All HTTP and <a href="#flenserrc">configuration option</a> with the same name. All HTTP and
HTTPS traffic will be sent through the proxy. HTTPS traffic will be sent through the proxy.
<p><b>Note</b>: Plugins may not implement proxy support. <p><b>Note</b>: Plugins may not implement proxy support.
</p> </p>
<h3 id="ad-blocking">Ad blocking</h3> <h3 id="ad-blocking">Ad blocking</h3>
<p>Dillo has the ability to block content when loading a page based on the domain <p>Flenser has the ability to block content when loading a page based on the domain
the embedded content is being loaded from. You can control how Dillo handles the embedded content is being loaded from. You can control how Flenser handles
automatic requests for resources (like images and style sheets) that aren't at automatic requests for resources (like images and style sheets) that aren't at
the same domain as the original page.</p> the same domain as the original page.</p>
@ -468,30 +468,30 @@ You can browse without images now:
An image's alt text (or <code>[IMG]</code> placeholder) will appear in the An image's alt text (or <code>[IMG]</code> placeholder) will appear in the
page. page.
<li>If you want to load an individual image, left click on its text. <li>If you want to load an individual image, left click on its text.
<li>You can set "no images" as the default mode in dillorc. <li>You can set "no images" as the default mode in flenserrc.
</ul> </ul>
<h2 id="configuration">Configuration</h2> <h2 id="configuration">Configuration</h2>
<p>Dillo has <b>several configuration files</b> that control the behavior of the <p>Flenser has <b>several configuration files</b> that control the behavior of the
browser. Each configuration file is searched <em>first</em> in the browser. Each configuration file is searched <em>first</em> in the
<a href="file:~/.dillo"><code>~/.dillo</code></a> directory and, <a href="file:~/.flenser"><code>~/.flenser</code></a> directory and,
<em>if not found</em>, in the default system configuration directory (typically <em>if not found</em>, in the default system configuration directory (typically
<code>/etc/dillo</code>).</p> <code>/etc/flenser</code>).</p>
<p>Most configuration files can include comments by <em>starting</em> a line <p>Most configuration files can include comments by <em>starting</em> a line
with the "<code>#</code>" symbol. Their specific syntax is described in the with the "<code>#</code>" symbol. Their specific syntax is described in the
following sections.</p> following sections.</p>
<h3 id="dillorc">Dillorc</h3> <h3 id="flenserrc">Flenserrc</h3>
<p>The main configuration of Dillo is controlled by the <p>The main configuration of Flenser is controlled by the
<a href="file:~/.dillo/dillorc"><code>dillorc</code></a> file. <a href="file:~/.flenser/flenserrc"><code>flenserrc</code></a> file.
The list of all available options can be found in the system The list of all available options can be found in the system
configuration file, typically configuration file, typically
<a href="file:/etc/dillo/dillorc"><code>/etc/dillo/dillorc</code></a>. You may <a href="file:/etc/flenser/flenserrc"><code>/etc/flenser/flenserrc</code></a>. You may
want to copy it into want to copy it into
<a href="file:~/.dillo/dillorc"><code>~/.dillo/dillorc</code></a> <a href="file:~/.flenser/flenserrc"><code>~/.flenser/flenserrc</code></a>
and edit it to suit your needs.</p> and edit it to suit your needs.</p>
The file is commented to describe what each option does. The default value for The file is commented to describe what each option does. The default value for
@ -511,7 +511,7 @@ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&amp;go=Go"
<h3 id="cookiesrc">Cookiesrc</h3> <h3 id="cookiesrc">Cookiesrc</h3>
<p>Cookies are configured in the <p>Cookies are configured in the
<a href="file:~/.dillo/cookiesrc"><code>~/.dillo/cookiesrc</code></a> <a href="file:~/.flenser/cookiesrc"><code>~/.flenser/cookiesrc</code></a>
file by using rules, with one rule per line. The rule syntax is very simple, file by using rules, with one rule per line. The rule syntax is very simple,
first specify the <em>host</em> and then the <em>action</em>, separated by first specify the <em>host</em> and then the <em>action</em>, separated by
white spaces. Comment lines start with <code>#</code> as the first character and white spaces. Comment lines start with <code>#</code> as the first character and
@ -529,7 +529,7 @@ allow sites to track you over time).
<p> <p>
When the cookies plugin exits, only the accepted cookies by <code>ACCEPT</code> When the cookies plugin exits, only the accepted cookies by <code>ACCEPT</code>
are saved to are saved to
<a href="file:~/.dillo/cookies.txt"><code>~/.dillo/cookies.txt</code></a>, <a href="file:~/.flenser/cookies.txt"><code>~/.flenser/cookies.txt</code></a>,
and ACCEPT_SESSION cookies are and ACCEPT_SESSION cookies are
forgotten. The cookies plugin normally exits after a period of inactivity, but forgotten. The cookies plugin normally exits after a period of inactivity, but
you can force it to exit with the command <code>dpidc stop</code>. you can force it to exit with the command <code>dpidc stop</code>.
@ -552,21 +552,21 @@ fltk.org ACCEPT
save them when the cookie plugin exits.</li> save them when the cookie plugin exits.</li>
</ul> </ul>
<p> <p>
Dillo is especially concerned about privacy and security issues. Our advice is Flenser is especially concerned about privacy and security issues. Our advice is
to <em>avoid cookies whenever possible</em> and at most set ACCEPT_SESSION to to <em>avoid cookies whenever possible</em> and at most set ACCEPT_SESSION to
<em>specific trusted sites</em>. <em>specific trusted sites</em>.
<h3 id="domainrc">Domainrc</h3> <h3 id="domainrc">Domainrc</h3>
<p>With the <p>With the
<code>~/.dillo/domainrc</code> <code>~/.flenser/domainrc</code>
file, you can control how Dillo handles automatic requests for resources file, you can control how Flenser handles automatic requests for resources
(like images and style sheets) that aren't at the same domain as the (like images and style sheets) that aren't at the same domain as the
original page. original page.
<p> <p>
The file contains one rule per line. Comments are specified by starting the line The file contains one rule per line. Comments are specified by starting the line
with the <code>#</code> symbol. The default rule is either with the <code>#</code> symbol. The default rule is either
<code>default accept</code> or <code>default deny</code> and will cause Dillo <code>default accept</code> or <code>default deny</code> and will cause Flenser
to, respectively, accept all requests by default or deny all requests by to, respectively, accept all requests by default or deny all requests by
default. default.
<p> <p>
@ -598,22 +598,22 @@ default accept
<p>Custom <p>Custom
<a href="https://en.wikipedia.org/wiki/CSS">CSS styles</a> can be placed in the <a href="https://en.wikipedia.org/wiki/CSS">CSS styles</a> can be placed in the
<a href="file:~/.dillo/style.css"><code>~/.dillo/style.css</code></a> <a href="file:~/.flenser/style.css"><code>~/.flenser/style.css</code></a>
file to set default web page styles. To override page styles add the file to set default web page styles. To override page styles add the
"<code>!important</code>" flag. "<code>!important</code>" flag.
<h3 id="dpidrc">Dpidrc</h3> <h3 id="dpidrc">Dpidrc</h3>
<p>The configuration for <a href="#plugins">plugins</a> is placed in the <p>The configuration for <a href="#plugins">plugins</a> is placed in the
<a href="file:~/.dillo/dpidrc"><code>~/.dillo/dpidrc</code></a> file.</p> <a href="file:~/.flenser/dpidrc"><code>~/.flenser/dpidrc</code></a> file.</p>
<p>Plugins are searched in the <code>~/.dillo/dpi/</code> directory first, and <p>Plugins are searched in the <code>~/.flenser/dpi/</code> directory first, and
then in the system directory if not found. The <code>dpi_dir</code> option then in the system directory if not found. The <code>dpi_dir</code> option
sets the system <code>dpi</code> directory and must be specified once. Here is sets the system <code>dpi</code> directory and must be specified once. Here is
an example:</p> an example:</p>
<pre> <pre>
dpi_dir=/usr/lib/dillo/dpi dpi_dir=/usr/lib/flenser/dpi
</pre> </pre>
<p>By default, plugins will receive requests at the URL <p>By default, plugins will receive requests at the URL
@ -645,7 +645,7 @@ image inline in a HTML document.
<p>Web page URLs can be saved as bookmarks so they can be accessed in the future. <p>Web page URLs can be saved as bookmarks so they can be accessed in the future.
Bookmarks are stored in a plain text file located at Bookmarks are stored in a plain text file located at
<a href="file:~/.dillo/bm.txt"><code>~/.dillo/bm.txt</code></a>. The file can be <a href="file:~/.flenser/bm.txt"><code>~/.flenser/bm.txt</code></a>. The file can be
modified by using the modified by using the
<a href="dpi:/bm/">Book button</a> <a href="dpi:/bm/">Book button</a>
in the toolbar and the context menu on a page or link, but they can also be in the toolbar and the context menu on a page or link, but they can also be
@ -674,11 +674,11 @@ tool.
<h3 id="keysrc">Keysrc</h3> <h3 id="keysrc">Keysrc</h3>
<p>The mapping of keys in Dillo is controlled by the <p>The mapping of keys in Flenser is controlled by the
<a href="file:~/.dillo/keysrc"><code>~/.dillo/keysrc</code></a> file. <a href="file:~/.flenser/keysrc"><code>~/.flenser/keysrc</code></a> file.
The format is "<code>key = action</code>" or The format is "<code>key = action</code>" or
"<code>&lt;modifier&gt;key = action</code>". Lines that begin with a "#" are comments. "<code>&lt;modifier&gt;key = action</code>". Lines that begin with a "#" are comments.
The commented-out bindings below show the defaults built into Dillo. The commented-out bindings below show the defaults built into Flenser.
<ul> <ul>
<li>Modifiers recognized: Shift, Ctrl, Alt, Meta (on Mac OS X use "Meta" for <li>Modifiers recognized: Shift, Ctrl, Alt, Meta (on Mac OS X use "Meta" for
@ -693,7 +693,7 @@ MediaPlay, MediaPrev, MediaStop, Refresh, Search, Sleep, Stop, VolumeDown,
VolumeMute, VolumeUp. VolumeMute, VolumeUp.
</ul> </ul>
<p>If Dillo is running under X11, keys whose names are not recognized can be <p>If Flenser is running under X11, keys whose names are not recognized can be
specified using their keysym value in hexadecimal. Use <code>xev</code> to get specified using their keysym value in hexadecimal. Use <code>xev</code> to get
the keysym, for example: the keysym, for example:
<pre> <pre>
@ -720,10 +720,10 @@ l = right
<h2 id="advanced-usage">Advanced usage</h2> <h2 id="advanced-usage">Advanced usage</h2>
These sections focus on advanced topics and are recommended for experienced These sections focus on advanced topics and are recommended for experienced
users of Dillo. users of Flenser.
<h3 id="plugins">Plugins</h3> <h3 id="plugins">Plugins</h3>
<p>The functionality of Dillo can be extended by using plugins, which can <p>The functionality of Flenser can be extended by using plugins, which can
translate other formats to HTML, implement new protocols or provide a custom translate other formats to HTML, implement new protocols or provide a custom
service.</p> service.</p>
@ -731,12 +731,12 @@ service.</p>
interact with the browser using the interact with the browser using the
<a href="https://dillo-browser.github.io/old/dpi1.html">DPI protocol</a>. A <a href="https://dillo-browser.github.io/old/dpi1.html">DPI protocol</a>. A
<a href="https://dillo-browser.github.io/#plugins">list of plugins</a> <a href="https://dillo-browser.github.io/#plugins">list of plugins</a>
is available on the Dillo website. Some plugins are just a is available on the Flenser website. Some plugins are just a
<a href="https://raw.githubusercontent.com/dillo-browser/dillo-plugin-man/master/man.filter.dpi">few <a href="https://raw.githubusercontent.com/dillo-browser/dillo-plugin-man/master/man.filter.dpi">few
lines of shell script</a>, so you are encouraged to read them to learn how to lines of shell script</a>, so you are encouraged to read them to learn how to
write your own plugins. Plugins are searched by looking for files that end with write your own plugins. Plugins are searched by looking for files that end with
the <code>.dpi</code> extension (or <code>.dpi.exe</code> in Windows) in the <code>.dpi</code> extension (or <code>.dpi.exe</code> in Windows) in
<code>~/.dillo/dpi</code> and <code>dpi_dir</code> (see the <code>~/.flenser/dpi</code> and <code>dpi_dir</code> (see the
<a href="#dpidrc">Dpidrc</a> configuration section).</p> <a href="#dpidrc">Dpidrc</a> configuration section).</p>
<p>There are two types of plugins: <em>filters</em> and <em>servers</em>. <p>There are two types of plugins: <em>filters</em> and <em>servers</em>.
@ -751,10 +751,10 @@ share information among requests.</p>
<p>You can install plugins from any third party, but you should always <p>You can install plugins from any third party, but you should always
review the source before running code written by others. To install a new review the source before running code written by others. To install a new
plugin, copy the files to <code>~/.dillo/dpi/<em>name</em>/</code> and plugin, copy the files to <code>~/.flenser/dpi/<em>name</em>/</code> and
then associate the <em>name</em> protocol to the program that must run in then associate the <em>name</em> protocol to the program that must run in
the the
<a href="file:~/.dillo/dpidrc"><code>~/.dillo/dpidrc</code></a> file. <a href="file:~/.flenser/dpidrc"><code>~/.flenser/dpidrc</code></a> file.
Plugins may have other software dependencies required for it to work.</p> Plugins may have other software dependencies required for it to work.</p>
<p>Here is an example of how to manually install the <p>Here is an example of how to manually install the
@ -762,20 +762,20 @@ Plugins may have other software dependencies required for it to work.</p>
(it comes with a Makefile that automates the process, so this is not necessary), (it comes with a Makefile that automates the process, so this is not necessary),
which is a filter plugin written in shell script:</p> which is a filter plugin written in shell script:</p>
<pre> <pre>
$ mkdir -p ~/.dillo/dpi/gemini $ mkdir -p ~/.flenser/dpi/gemini
$ cp gemini.filter.dpi ~/.dillo/dpi/gemini/ $ cp gemini.filter.dpi ~/.flenser/dpi/gemini/
$ chmod +x ~/.dillo/dpi/gemini/gemini.filter.dpi $ chmod +x ~/.flenser/dpi/gemini/gemini.filter.dpi
$ echo "proto.gemini=gemini/gemini.filter.dpi" >> ~/.dillo/dpidrc $ echo "proto.gemini=gemini/gemini.filter.dpi" >> ~/.flenser/dpidrc
$ dpidc stop $ dpidc stop
</pre> </pre>
<p>Now, when a request is made to an URL that begins with the <p>Now, when a request is made to an URL that begins with the
<code>gemini:</code> protocol, it will be processed by the <code>gemini:</code> protocol, it will be processed by the
<code>gemini/gemini.filter.dpi</code> program, and the output will be displayed <code>gemini/gemini.filter.dpi</code> program, and the output will be displayed
by Dillo.</p> by Flenser.</p>
<h3 id="bug-meter">Bug Meter</h3> <h3 id="bug-meter">Bug Meter</h3>
<p> <p>
Dillo includes a Flenser includes a
<a href='https://dillo-browser.github.io/old/help/bug_meter.html'>bug meter</a> <a href='https://dillo-browser.github.io/old/help/bug_meter.html'>bug meter</a>
which shows the number of detected bugs inside the page. The bugs are caught at which shows the number of detected bugs inside the page. The bugs are caught at
parsing time, so the error messages also show the line where they occur and parsing time, so the error messages also show the line where they occur and
@ -785,14 +785,14 @@ The primary purpose of the bug meter is to help webmasters and page authors to
polish the contents of their sites with a view to making them polish the contents of their sites with a view to making them
compliant with HTML standards. compliant with HTML standards.
<p> <p>
The bug meter is located at the lower right corner of Dillo. Use the left-click The bug meter is located at the lower right corner of Flenser. Use the left-click
to see the messages, right-click for a menu to open other HTML validators. to see the messages, right-click for a menu to open other HTML validators.
<h3 id="keyboard-shortcuts">Keyboard shortcuts</h3> <h3 id="keyboard-shortcuts">Keyboard shortcuts</h3>
<p> <p>
Most actions can be issued by using a keyboard shortcut. The key bindings can be Most actions can be issued by using a keyboard shortcut. The key bindings can be
changed in the changed in the
<code><a href="file:~/.dillo/keysrc">~/.dillo/keysrc</a></code> file (see the <code><a href="file:~/.flenser/keysrc">~/.flenser/keysrc</a></code> file (see the
<a href="#keysrc">keysrc</a> section). <a href="#keysrc">keysrc</a> section).
The list of default bindings is given in the following table. The list of default bindings is given in the following table.
<p> <p>
@ -808,7 +808,7 @@ The list of default bindings is given in the following table.
<tr><td>Ctrl-O <td>Open <td>Open file <tr><td>Ctrl-O <td>Open <td>Open file
<tr><td>Ctrl-U <td> <td>View source <tr><td>Ctrl-U <td> <td>View source
<tr><td>Ctrl-B <td>Bookmarks <td>View bookmarks <tr><td>Ctrl-B <td>Bookmarks <td>View bookmarks
<tr><td>Ctrl-Q <td>Quit <td>Quit dillo <tr><td>Ctrl-Q <td>Quit <td>Quit flenser
<tr><td>Ctrl-+ or Ctrl-= <td>Bigger <td>Zoom in <tr><td>Ctrl-+ or Ctrl-= <td>Bigger <td>Zoom in
<tr><td>Ctrl-- <td>Smaller <td>Zoom out <tr><td>Ctrl-- <td>Smaller <td>Zoom out
<tr><td>Ctrl-0 <td>100% <td>Reset zoom to 100% <tr><td>Ctrl-0 <td>100% <td>Reset zoom to 100%

18
dpi/bookmarks.c
View File

@ -109,7 +109,7 @@ DOCTYPE
"<title>Bookmarks</title>\n" "<title>Bookmarks</title>\n"
CSS_STYLE CSS_STYLE
"</head>\n" "</head>\n"
"<body id='dillo_bm'>\n" "<body id='flenser_bm'>\n"
"\n" "\n"
" <h1>Bookmarks</h1>\n" " <h1>Bookmarks</h1>\n"
" <div style='float: right; padding: 1em'>\n" " <div style='float: right; padding: 1em'>\n"
@ -123,7 +123,7 @@ DOCTYPE
"<title>Bookmarks</title>\n" "<title>Bookmarks</title>\n"
CSS_STYLE CSS_STYLE
"</head>\n" "</head>\n"
"<body id='dillo_bm'>\n" "<body id='flenser_bm'>\n"
" <h1>Bookmarks</h1>\n" " <h1>Bookmarks</h1>\n"
"\n" "\n"
"<form action='modify'>\n" "<form action='modify'>\n"
@ -143,7 +143,7 @@ CSS_STYLE
" , mark its operands and\n" " , mark its operands and\n"
" <input type='submit' name='submit' value='Submit'>\n" " <input type='submit' name='submit' value='Submit'>\n"
" <p>You can also modify the bookmarks by editing the\n" " <p>You can also modify the bookmarks by editing the\n"
" <a href='file:~/.dillo/bm.txt'><code>~/.dillo/bm.txt</code></a> file.\n" " <a href='file:~/.flenser/bm.txt'><code>~/.flenser/bm.txt</code></a> file.\n"
"</div>\n"; "</div>\n";
static const char *mainpage_sections_header = static const char *mainpage_sections_header =
@ -212,7 +212,7 @@ DOCTYPE
"<title>Bookmarks</title>\n" "<title>Bookmarks</title>\n"
CSS_STYLE CSS_STYLE
"</head>\n" "</head>\n"
"<body id='dillo_bm'>\n" "<body id='flenser_bm'>\n"
"<h1>Boorkmarks: New section</h1>\n" "<h1>Boorkmarks: New section</h1>\n"
"<form action='modify'>\n" "<form action='modify'>\n"
" <input type='hidden' name='operation' value='add_section'>\n" " <input type='hidden' name='operation' value='add_section'>\n"
@ -235,7 +235,7 @@ DOCTYPE
"<title>Bookmarks</title>\n" "<title>Bookmarks</title>\n"
CSS_STYLE CSS_STYLE
"</head>\n" "</head>\n"
"<body id='dillo_bm'>\n" "<body id='flenser_bm'>\n"
"<h1>Bookmarks: Update</h1>\n" "<h1>Bookmarks: Update</h1>\n"
"<form action='modify'>\n" "<form action='modify'>\n"
"<input type='hidden' name='operation' value='modify2'>\n"; "<input type='hidden' name='operation' value='modify2'>\n";
@ -274,7 +274,7 @@ DOCTYPE
"<title>Bookmarks</title>\n" "<title>Bookmarks</title>\n"
CSS_STYLE CSS_STYLE
"</head>\n" "</head>\n"
"<body id='dillo_bm'>\n" "<body id='flenser_bm'>\n"
"<h1>Bookmarks: Add URL</h1>\n" "<h1>Bookmarks: Add URL</h1>\n"
"<form action='modify'>\n" "<form action='modify'>\n"
"<input type='hidden' name='operation' value='add_url2'>\n" "<input type='hidden' name='operation' value='add_url2'>\n"
@ -583,7 +583,7 @@ static void Bms_check_import(void)
if (access(BmFile, F_OK) != 0) { if (access(BmFile, F_OK) != 0) {
OldBmFile = dStrconcat(dGethomedir(), "/.dillo/bookmarks.html", NULL); OldBmFile = dStrconcat(dGethomedir(), "/.flenser/bookmarks.html", NULL);
if (access(OldBmFile, F_OK) == 0) { if (access(OldBmFile, F_OK) == 0) {
dStr_sprintf(dstr, cmd1, BmFile); dStr_sprintf(dstr, cmd1, BmFile);
rc = system(dstr->str); rc = system(dstr->str);
@ -1576,7 +1576,7 @@ static int Bmsrv_parse_token(Dsh *sh, char *Buf)
if (st != 0) { if (st != 0) {
char *err = char *err =
DOCTYPE DOCTYPE
"<HTML><body id='dillo_bm'> Error on the bookmarks server..." "<HTML><body id='flenser_bm'> Error on the bookmarks server..."
" </body></html>"; " </body></html>";
if (a_Dpip_dsh_write_str(sh, 1, err) != 0) { if (a_Dpip_dsh_write_str(sh, 1, err) != 0) {
return 1; return 1;
@ -1634,7 +1634,7 @@ int main(void) {
/* Initialize local data */ /* Initialize local data */
B_bms = dList_new(512); B_bms = dList_new(512);
B_secs = dList_new(32); B_secs = dList_new(32);
BmFile = dStrconcat(dGethomedir(), "/.dillo/bm.txt", NULL); BmFile = dStrconcat(dGethomedir(), "/.flenser/bm.txt", NULL);
/* some OSes may need this... */ /* some OSes may need this... */
address_size = sizeof(struct sockaddr_un); address_size = sizeof(struct sockaddr_un);

8
dpi/cookies.c
View File

@ -353,13 +353,13 @@ static void Cookies_init(void)
} }
/* Get a stream for the cookies file */ /* Get a stream for the cookies file */
filename = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL); filename = dStrconcat(dGethomedir(), "/.flenser/cookies.txt", NULL);
file_stream = Cookies_fopen(filename, "r+", cookies_txt_header_str); file_stream = Cookies_fopen(filename, "r+", cookies_txt_header_str);
dFree(filename); dFree(filename);
if (!file_stream) { if (!file_stream) {
MSG("ERROR: Can't open ~/.dillo/cookies.txt; disabling cookies\n"); MSG("ERROR: Can't open ~/.flenser/cookies.txt; disabling cookies\n");
return; return;
} }
@ -1126,7 +1126,7 @@ static bool_t Cookies_domain_matches(char *A, char *B)
/* /*
* Based on the host, how many internal dots do we need in a cookie domain * Based on the host, how many internal dots do we need in a cookie domain
* to make it valid? e.g., "org" is not on the list, so dillo.org is a safe * to make it valid? e.g., "org" is not on the list, so flenser.org is a safe
* cookie domain, but "uk" is on the list, so ac.uk is not safe. * cookie domain, but "uk" is on the list, so ac.uk is not safe.
* *
* This is imperfect, but it's something. Specifically, checking for these * This is imperfect, but it's something. Specifically, checking for these
@ -1426,7 +1426,7 @@ static int Cookie_control_init(void)
bool_t enabled = FALSE; bool_t enabled = FALSE;
/* Get a file pointer */ /* Get a file pointer */
filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL); filename = dStrconcat(dGethomedir(), "/.flenser/cookiesrc", NULL);
stream = Cookies_fopen(filename, "r", "DEFAULT DENY\n"); stream = Cookies_fopen(filename, "r", "DEFAULT DENY\n");
dFree(filename); dFree(filename);

2
dpi/downloads.cc
View File

@ -324,7 +324,7 @@ DLItem::DLItem(const char *full_filename, const char *url, const char *user_agen
/* avoid malicious SMTP relaying with FTP urls */ /* avoid malicious SMTP relaying with FTP urls */
if (dStrnAsciiCasecmp(esc_url, "ftp:/", 5) == 0) if (dStrnAsciiCasecmp(esc_url, "ftp:/", 5) == 0)
Filter_smtp_hack(esc_url); Filter_smtp_hack(esc_url);
cookies_path = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL); cookies_path = dStrconcat(dGethomedir(), "/.flenser/cookies.txt", NULL);
dl_argv.clear(); dl_argv.clear();
dl_argv.push_back( (char*)"wget" ); dl_argv.push_back( (char*)"wget" );
if (stat(fullname, &ss) == 0) if (stat(fullname, &ss) == 0)

4
dpid/dpi.c
View File

@ -33,7 +33,7 @@
*/ */
char *a_Dpi_sockdir_file(void) char *a_Dpi_sockdir_file(void)
{ {
char *dpi_socket_dir, *dirfile_path = "/.dillo/dpi_socket_dir"; char *dpi_socket_dir, *dirfile_path = "/.flenser/dpi_socket_dir";
dpi_socket_dir = dStrconcat(dGethomedir(), dirfile_path, NULL); dpi_socket_dir = dStrconcat(dGethomedir(), dirfile_path, NULL);
return dpi_socket_dir; return dpi_socket_dir;
@ -53,7 +53,7 @@ char *a_Dpi_rd_dpi_socket_dir(char *dirname)
FILE *dir; FILE *dir;
char *sockdir = NULL, *rcpath; char *sockdir = NULL, *rcpath;
rcpath = dStrconcat(dGethomedir(), "/.dillo", NULL); rcpath = dStrconcat(dGethomedir(), "/.flenser", NULL);
/* If .dillo does not exist it is an unrecoverable error */ /* If .dillo does not exist it is an unrecoverable error */
if (access(rcpath, F_OK) == -1) { if (access(rcpath, F_OK) == -1) {

4
dpid/dpi_socket_dir.c
View File

@ -78,7 +78,7 @@ char *mk_sockdir(void)
{ {
char *template, *logname; char *template, *logname;
logname = getenv("LOGNAME") ? getenv("LOGNAME") : "dillo"; logname = getenv("LOGNAME") ? getenv("LOGNAME") : "flenser";
template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL); template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
if (a_Misc_mkdtemp(template) == NULL) { if (a_Misc_mkdtemp(template) == NULL) {
ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0); ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0);
@ -90,7 +90,7 @@ char *mk_sockdir(void)
} }
/*! Create socket directory if it does not exist and save its name in /*! Create socket directory if it does not exist and save its name in
* ~/.dillo/dpi_socket_dir. * ~/.flenser/dpi_socket_dir.
* \Return * \Return
* \li Socket directory name on success * \li Socket directory name on success
* \li NULL on failure. * \li NULL on failure.

8
dpid/dpid.c
View File

@ -198,8 +198,8 @@ char *get_dpi_dir(char *dpidrc)
if (!rcline) { if (!rcline) {
ERRMSG("dpi_dir", "Failed to find a dpi_dir entry in dpidrc", 0); ERRMSG("dpi_dir", "Failed to find a dpi_dir entry in dpidrc", 0);
MSG_ERR("Put your dillo plugins path in %s\n", dpidrc); MSG_ERR("Put your flenser plugins path in %s\n", dpidrc);
MSG_ERR("e.g. dpi_dir=/usr/local/lib/dillo/dpi\n"); MSG_ERR("e.g. dpi_dir=/usr/local/lib/flenser/dpi\n");
MSG_ERR("with no leading spaces.\n"); MSG_ERR("with no leading spaces.\n");
value = NULL; value = NULL;
} else { } else {
@ -284,7 +284,7 @@ int get_dpi_attr(char *dpi_dir, char *service, struct dp *dpi_attr)
/*! Register a service /*! Register a service
* Retrieves attributes for "service" and stores them * Retrieves attributes for "service" and stores them
* in dpi_attr. It looks for "service" in ~/.dillo/dpi * in dpi_attr. It looks for "service" in ~/.flenser/dpi
* first, and then in the system wide dpi directory. * first, and then in the system wide dpi directory.
* Caller must allocate memory for dpi_attr. * Caller must allocate memory for dpi_attr.
* \Return * \Return
@ -383,7 +383,7 @@ int register_all(struct dp **attlist)
exit(1); exit(1);
} }
/* Get list of services in user's .dillo/dpi directory */ /* Get list of services in user's .flenser/dpi directory */
snum = 0; snum = 0;
if (user_dpidir) { if (user_dpidir) {
DIR *user_dir_stream = opendir(user_dpidir); DIR *user_dir_stream = opendir(user_dpidir);

2
dpid/dpid.h
View File

@ -23,7 +23,7 @@
#define MSGLEN 50 #define MSGLEN 50
#define DPID_BASE_PORT (IPPORT_USERRESERVED + 20) #define DPID_BASE_PORT (IPPORT_USERRESERVED + 20)
/*! \TODO: Should read this from dillorc */ /*! \TODO: Should read this from flenserrc */
#define SRS_NAME "dpid.srs" #define SRS_NAME "dpid.srs"
extern char *srs_name; extern char *srs_name;

6
dpid/dpid_common.h
View File

@ -22,9 +22,9 @@
#define MSG(...) printf("[dpid]: " __VA_ARGS__) #define MSG(...) printf("[dpid]: " __VA_ARGS__)
#define MSG_ERR(...) fprintf(stderr, "[dpid]: " __VA_ARGS__) #define MSG_ERR(...) fprintf(stderr, "[dpid]: " __VA_ARGS__)
#define dotDILLO_DPI ".dillo/dpi" #define dotDILLO_DPI ".flenser/dpi"
#define dotDILLO_DPIDRC ".dillo/dpidrc" #define dotDILLO_DPIDRC ".flenser/dpidrc"
#define dotDILLO_DPID_COMM_KEYS ".dillo/dpid_comm_keys" #define dotDILLO_DPID_COMM_KEYS ".flenser/dpid_comm_keys"
#define ERRMSG(CALLER, CALLED, ERR)\ #define ERRMSG(CALLER, CALLED, ERR)\
errmsg(CALLER, CALLED, ERR, __FILE__, __LINE__) errmsg(CALLER, CALLED, ERR, __FILE__, __LINE__)

4
dpid/dpidc.c
View File

@ -32,7 +32,7 @@ static char SharedKey[32];
static void print_usage(const char *prgname) static void print_usage(const char *prgname)
{ {
fprintf(stderr,"Control program for the Dillo plugin daemon\n" fprintf(stderr,"Control program for the Flenser plugin daemon\n"
"Usage: %s {stop|register|chat}\n\n", prgname); "Usage: %s {stop|register|chat}\n\n", prgname);
} }
@ -52,7 +52,7 @@ static int Dpi_read_comm_keys(int *port)
char *fname, *rcline = NULL, *tail; char *fname, *rcline = NULL, *tail;
int i, ret = -1; 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) { if ((In = fopen(fname, "r")) == NULL) {
MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno)); MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno));
} else if ((rcline = dGetline(In)) == NULL) { } else if ((rcline = dGetline(In)) == NULL) {

2
dpip/dpip.c
View File

@ -212,7 +212,7 @@ int a_Dpip_check_auth(const char *auth_tag)
return ret; return ret;
} }
fname = dStrconcat(dGethomedir(), "/.dillo/dpid_comm_keys", NULL); fname = dStrconcat(dGethomedir(), "/.flenser/dpid_comm_keys", NULL);
if ((In = fopen(fname, "r")) == NULL) { if ((In = fopen(fname, "r")) == NULL) {
MSG_ERR("[a_Dpip_check_auth] %s\n", dStrerror(errno)); MSG_ERR("[a_Dpip_check_auth] %s\n", dStrerror(errno));
} else if ((rcline = dGetline(In)) == NULL) { } else if ((rcline = dGetline(In)) == NULL) {

4
dillo-install-hyphenation → flenser-install-hyphenation
View File

@ -45,7 +45,7 @@ if (-e $makefile) {
} }
} }
$targetdir = "$prefix/lib/dillo/hyphenation"; $targetdir = "$prefix/lib/flenser/hyphenation";
if (!GetOptions ("host=s" => \$host, if (!GetOptions ("host=s" => \$host,
"basesourcedir=s" => \$basesourcedir, "basesourcedir=s" => \$basesourcedir,
@ -74,7 +74,7 @@ Options:
/language/hyph-utf8/tex/generic/hyph-utf8... /language/hyph-utf8/tex/generic/hyph-utf8...
.../patterns/txt is added (default: /ctan/) .../patterns/txt is added (default: /ctan/)
-t, --targetdir=DIR where to install the hyphenation patterns -t, --targetdir=DIR where to install the hyphenation patterns
(default: where they are read by dillo) (default: where they are read by flenser)
EOT EOT
} else { } else {
if ($sourcedir eq "") { if ($sourcedir eq "") {

2
dillo.desktop → flenser.desktop
View File

@ -3,7 +3,7 @@ GenericName=Web Browser
Name=Flenser Name=Flenser
Comment=Fast and small graphical web browser Comment=Fast and small graphical web browser
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https; MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
Exec=dillo %U Exec=flenser %U
Icon=dillo Icon=dillo
Terminal=false Terminal=false
Type=Application Type=Application

28
dillorc → flenserrc
View File

@ -1,4 +1,4 @@
# dillorc # flenserrc
# Sample dillo initialization file. # Sample dillo initialization file.
# #
# Lines that start with a '#' are comments. # Lines that start with a '#' are comments.
@ -200,15 +200,15 @@
# Format: search_url="[prefix ][<label> ]<url>" # Format: search_url="[prefix ][<label> ]<url>"
# You can enable multiple search_url strings at once and select from among # You can enable multiple search_url strings at once and select from among
# them at runtime, with the first being the default. # them at runtime, with the first being the default.
# (the prefix serves to search from the Location Bar. e.g. "dd dillo image") # (the prefix serves to search from the Location Bar. e.g. "dd flenser image")
search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&kd=-1&q=%s" search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&kd=-1&q=%s"
search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go" search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
search_url="Free Dictionary http://www.thefreedictionary.com/%s" search_url="Free Dictionary http://www.thefreedictionary.com/%s"
search_url="Startpage (https) https://www.startpage.com/do/search?query=%s" search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s" search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
# If set, dillo will ask web servers to send pages in this language. # If set, Flenser will ask web servers to send pages in this language.
# This setting does NOT change dillo's user interface. # This setting does NOT change Flenser's user interface.
# Format explained: www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 # Format explained: www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
# Language-REGION values: www.iana.org/assignments/language-subtag-registry # Language-REGION values: www.iana.org/assignments/language-subtag-registry
# (by default, no Accept-Language header is sent) # (by default, no Accept-Language header is sent)
@ -219,7 +219,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
# Maximum number of simultaneous TCP connections to a single server or proxy. # Maximum number of simultaneous TCP connections to a single server or proxy.
# http_max_conns=6 # http_max_conns=6
# If enabled, Dillo will reuse HTTP connections to a server or proxy when # If enabled, Flenser will reuse HTTP connections to a server or proxy when
# possible rather than making a new connection for every request for a new # possible rather than making a new connection for every request for a new
# page/image/stylesheet. # page/image/stylesheet.
#http_persistent_conns=YES #http_persistent_conns=YES
@ -233,7 +233,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
# HSTS directives are not saved between browser sessions. # HSTS directives are not saved between browser sessions.
#http_strict_transport_security=YES #http_strict_transport_security=YES
# If enabled, Dillo will force all HTTP connections to be upgraded to # If enabled, Flenser will force all HTTP connections to be upgraded to
# a more secure HTTPS connection. This will prevent sites from loading # a more secure HTTPS connection. This will prevent sites from loading
# if they only support HTTP. # if they only support HTTP.
#http_force_https=NO #http_force_https=NO
@ -247,7 +247,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
#(by default, no proxy is used) #(by default, no proxy is used)
# If you need to provide a user/password pair for the proxy, # If you need to provide a user/password pair for the proxy,
# set the proxy user name here and Dillo will ask for the password later. # set the proxy user name here and Flenser will ask for the password later.
# http_proxyuser="joe" # http_proxyuser="joe"
#(by default, no proxy is used) #(by default, no proxy is used)
@ -266,7 +266,7 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
# Set the HTTP User-Agent header. # Set the HTTP User-Agent header.
# This can be useful for privacy and for working around servers who think # This can be useful for privacy and for working around servers who think
# Dillo is less capable than it really is. However, if you pretend to use a # Flenser is less capable than it really is. However, if you pretend to use a
# different browser, servers may send you pages that work with the features # different browser, servers may send you pages that work with the features
# and bugs of that other browser -- or even disallow access in cases like # and bugs of that other browser -- or even disallow access in cases like
# wget or googlebot. Remember this before submitting bug reports. # wget or googlebot. Remember this before submitting bug reports.
@ -276,6 +276,8 @@ search_url="Google https://www.google.com/search?ie=UTF-8&oe=UTF-8&gbv=1&q=%s"
# http_user_agent="Mozilla/5.0 (Windows NT 6.1; WOW64; rv:28.0) Gecko/20100101 Firefox/28.0" # http_user_agent="Mozilla/5.0 (Windows NT 6.1; WOW64; rv:28.0) Gecko/20100101 Firefox/28.0"
# http_user_agent="Wget/1.13.4 (linux-gnu)" # http_user_agent="Wget/1.13.4 (linux-gnu)"
#The default is "Dillo/"+current_version_number #The default is "Dillo/"+current_version_number
# ^^^^ Is it still? Did I get to changing the User Agent part? I can check it with my
# HTTP servers. -- ADAM
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# COLORS SECTION # COLORS SECTION
@ -380,7 +382,7 @@ ui_tab_bg_color=#b7beb7
#ui_tab_bg_color=#cac682 #ui_tab_bg_color=#cac682
# Size of dillo panel # Size of flenser panel
# tiny : buttons, location, and progress boxes in one row # tiny : buttons, location, and progress boxes in one row
# small : location in one row, buttons + progress boxes in another # small : location in one row, buttons + progress boxes in another
# medium : adds text labels to buttons and boxes # medium : adds text labels to buttons and boxes
@ -390,7 +392,7 @@ ui_tab_bg_color=#b7beb7
#small_icons=NO #small_icons=NO
# Here you can choose to hide some widgets of the dillo panel... # Here you can choose to hide some widgets of the flenser panel...
#show_back=YES #show_back=YES
#show_forw=YES #show_forw=YES
#show_home=YES #show_home=YES
@ -409,7 +411,7 @@ ui_tab_bg_color=#b7beb7
# Show tooltip popups for the UI # Show tooltip popups for the UI
#show_ui_tooltip=YES #show_ui_tooltip=YES
# Start dillo with the panels hidden? # Start flenser with the panels hidden?
#fullwindow_start=NO #fullwindow_start=NO
# When filling out forms, our default behaviour is to submit on enterpress, # When filling out forms, our default behaviour is to submit on enterpress,
@ -442,7 +444,7 @@ ui_tab_bg_color=#b7beb7
# You can hold SHIFT to temporarily revert this behaviour. # You can hold SHIFT to temporarily revert this behaviour.
#focus_new_tab=NO #focus_new_tab=NO
# Ask before quitting Dillo with more than one window or tab open. # Ask before quitting Flenser with more than one window or tab open.
#show_quit_dialog=NO #show_quit_dialog=NO
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -466,4 +468,4 @@ ui_tab_bg_color=#b7beb7
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
# dillorc ends here. # flenserrc ends here.

2
install-dpi-local
View File

@ -3,7 +3,7 @@
# Install the dpi framework programs inside the user's account. # Install the dpi framework programs inside the user's account.
# #
BASE="$HOME/.dillo" BASE="$HOME/.flenser"
BASE2="$BASE/dpi" BASE2="$BASE/dpi"
if [ -r $BASE/dpi_socket_dir ] ; then if [ -r $BASE/dpi_socket_dir ] ; then

2
src/IO/about.c
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" "right corner at any time. Here are some tips to get you started:</p>\n"
"\n" "\n"
"<ul>\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>Most actions can also be done by using the <em>keyboard</em>.</li>\n"
" <li>Cookies are <em>disabled by default</em>.</li>\n" " <li>Cookies are <em>disabled by default</em>.</li>\n"
"</ul>\n" "</ul>\n"

4
src/IO/dpi.cc
View File

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

2
src/IO/tls_mbedtls.c
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); Tls_load_certificates_from_path(userpath);
dFree(userpath); dFree(userpath);

10
src/IO/tls_openssl.cc
View File

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

12
src/Makefile.am
View File

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

2
src/cookies.cc
View File

@ -249,7 +249,7 @@ static int Cookie_control_init(void)
bool_t enabled = FALSE; bool_t enabled = FALSE;
/* Get a file pointer */ /* 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" )); stream = Cookies_fopen(filename, const_cast< char * >( "DEFAULT DENY\n" ));
dFree(filename); dFree(filename);

4
src/domainrc
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. # (e.g., images, style sheets, redirection) from a different site.
# #
# Lines that begin with a '#' are comments. # Lines that begin with a '#' are comments.

10
src/dillo.cc → src/flenser.cc
View File

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

4
src/paths.cc
View File

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

2
src/paths.hh
View File

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

2
src/styleengine.cc
View File

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

4
src/uicmd.cc
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 /* The UI is constructed in a comfortable fitting size, and then resized
* so FLTK doesn't get confused later with even smaller dimensions! */ * so FLTK doesn't get confused later with even smaller dimensions! */
current(0); 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->resize(0,ctab_h,Wizard->w(),Wizard->h());
new_ui->tabs(this); new_ui->tabs(this);
Wizard->add(new_ui); Wizard->add(new_ui);
@ -565,7 +565,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh,
Fl_Window *win; Fl_Window *win;
if (ww <= 0 || wh <= 0) { if (ww <= 0 || wh <= 0) {
// Set default geometry from dillorc. // Set default geometry from flenserrc.
ww = prefs.width; ww = prefs.width;
wh = prefs.height; wh = prefs.height;
} }

3
src/version.cc
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> * Copyright 2024 Rodrigo Arias Mallo <rodarima@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

6
test/unit/cookies.c
View File

@ -119,7 +119,7 @@ static int Dpi_read_comm_keys(int *port)
char *fname, *rcline = NULL, *tail; char *fname, *rcline = NULL, *tail;
int i, ret = -1; 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) { if ((In = fopen(fname, "r")) == NULL) {
MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno)); MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno));
} else if ((rcline = dGetline(In)) == NULL) { } else if ((rcline = dGetline(In)) == NULL) {
@ -201,7 +201,7 @@ static int Dpi_start_dpid(void)
pid = fork(); pid = fork();
if (pid == 0) { if (pid == 0) {
/* This is the child process. Execute the command. */ /* This is the child process. Execute the command. */
char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL); char *path1 = dStrconcat(dGethomedir(), "/.flenser/dpid", NULL);
Dpi_close_fd(st_pipe[0]); Dpi_close_fd(st_pipe[0]);
if (execl(path1, "dpid", (char*)NULL) == -1) { if (execl(path1, "dpid", (char*)NULL) == -1) {
dFree(path1); dFree(path1);
@ -904,7 +904,7 @@ int Cookies_rc_check()
bool_t default_deny = TRUE; bool_t default_deny = TRUE;
/* Get a file pointer */ /* Get a file pointer */
filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL); filename = dStrconcat(dGethomedir(), "/.flenser/cookiesrc", NULL);
stream = fopen(filename, "r"); stream = fopen(filename, "r");
dFree(filename); dFree(filename);