about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile28
-rw-r--r--about.c24
-rw-r--r--completion.c2
-rwxr-xr-xconfig-checker.pl6
-rw-r--r--cookie.c2
-rw-r--r--externaleditor.c6
-rw-r--r--favorites2
-rw-r--r--freebsd/Makefile14
-rw-r--r--freebsd/util.h1
-rw-r--r--history.c2
-rw-r--r--inputfocus.c2
-rw-r--r--inspector.c2
-rw-r--r--linux/Makefile40
-rw-r--r--linux/linux.c2
-rw-r--r--linux/tree.h1
-rw-r--r--linux/util.h1
-rw-r--r--marco.c3
-rw-r--r--playflash.sh6
-rwxr-xr-xrelease.sh2
-rw-r--r--settings.c4
-rw-r--r--tldlist.c2
-rw-r--r--unix.c2
-rw-r--r--version.h22
-rwxr-xr-xversion.sh2
-rw-r--r--whitelist.c2
-rw-r--r--xombrero.1 (renamed from xxxterm.1)40
-rw-r--r--xombrero.c (renamed from xxxterm.c)41
-rw-r--r--xombrero.conf (renamed from xxxterm.conf)10
-rw-r--r--xombrero.desktop (renamed from xxxterm.desktop)6
-rw-r--r--xombrero.h (renamed from xxxterm.h)2
-rw-r--r--xombreroicon.png (renamed from xxxtermicon.png)bin39398 -> 39398 bytes
-rw-r--r--xombreroicon128.png (renamed from xxxtermicon128.png)bin14798 -> 14798 bytes
-rw-r--r--xombreroicon16.png (renamed from xxxtermicon16.png)bin626 -> 626 bytes
-rw-r--r--xombreroicon32.png (renamed from xxxtermicon32.png)bin1588 -> 1588 bytes
-rw-r--r--xombreroicon48.png (renamed from xxxtermicon48.png)bin3046 -> 3046 bytes
-rw-r--r--xombreroicon64.png (renamed from xxxtermicon64.png)bin4653 -> 4653 bytes
36 files changed, 133 insertions, 146 deletions
diff --git a/Makefile b/Makefile
index 110e24d..c74508e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 PREFIX?=/usr/local
 BINDIR=${PREFIX}/bin
 
-PROG=xxxterm
-MAN=xxxterm.1
+PROG=xombrero
+MAN=xombrero.1
 
 DEBUG= -g
 
 SRCS= cookie.c inspector.c marco.c about.c whitelist.c settings.c inputfocus.c
-SRCS+= history.c completion.c tldlist.c externaleditor.c unix.c xxxterm.c
+SRCS+= history.c completion.c tldlist.c externaleditor.c unix.c xombrero.c
 CFLAGS+= -O2 -Wall -Wno-format-extra-args -Wunused
 CFLAGS+= -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare ${DEBUG}
 CFLAGS+= -I. -I${.CURDIR}
@@ -23,12 +23,12 @@ CFLAGS+= $(GTK_CFLAGS)
 LDFLAGS+= $(GTK_LDFLAGS)
 BUILDVERSION != sh "${.CURDIR}/buildver.sh"
 .if !${BUILDVERSION} == ""
-CPPFLAGS+= -DXXXTERM_BUILDSTR=\"$(BUILDVERSION)\"
+CPPFLAGS+= -DXOMBRERO_BUILDSTR=\"$(BUILDVERSION)\"
 .endif
 
 MANDIR= ${PREFIX}/man/man
 
-CLEANFILES += ${.CURDIR}/javascript.h javascript.h xxxterm.cat1 xxxterm.core
+CLEANFILES += ${.CURDIR}/javascript.h javascript.h xombrero.cat1 xombrero.core
 
 JSFILES += hinting.js
 JSFILES += input-focus.js
@@ -43,15 +43,15 @@ javascript.h: ${JSFILES} js-merge-helper.pl
 		${JSCURDIR} > javascript.h
 
 beforeinstall:
-	install -m 755 -d ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/xxxtermicon.png ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/xxxtermicon16.png ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/xxxtermicon32.png ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/xxxtermicon48.png ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/xxxtermicon64.png ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/xxxtermicon128.png ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/tld-rules ${PREFIX}/share/xxxterm
-	install -m 644 ${.CURDIR}/style.css ${PREFIX}/share/xxxterm
+	install -m 755 -d ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/xombreroicon.png ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/xombreroicon16.png ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/xombreroicon32.png ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/xombreroicon48.png ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/xombreroicon64.png ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/xombreroicon128.png ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/tld-rules ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/style.css ${PREFIX}/share/xombrero
 
 ${PROG} ${OBJS} beforedepend: javascript.h
 
diff --git a/about.c b/about.c
index c15840e..b1a8fbf 100644
--- a/about.c
+++ b/about.c
@@ -19,13 +19,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 /*
- * xxxterm "protocol" (xtp)
+ * xombrero "protocol" (xtp)
  * We use this for managing stuff like downloads and favorites. They
  * make magical HTML pages in memory which have xxxt:// links in order
- * to communicate with xxxterm's internals. These links take the format:
+ * to communicate with xombrero's internals. These links take the format:
  * xxxt://class/session_key/action/arg
  *
  * Don't begin xtp class/actions as 0. atoi returns that on error.
@@ -220,7 +220,7 @@ about(struct tab *t, struct karg *args)
 		show_oops(NULL, "about invalid parameters");
 
 	body = g_strdup_printf("<b>Version: %s</b>"
-#ifdef XXXTERM_BUILDSTR
+#ifdef XOMBRERO_BUILDSTR
 	    "<br><b>Build: %s</b>"
 #endif
 	    "<br><b>WebKit: %d.%d.%d</b>"
@@ -238,11 +238,11 @@ about(struct tab *t, struct karg *args)
 	    "<li>Raphael Graf &lt;r@undefined.ch&gt;</li>"
 	    "<li>Michal Mazurek &lt;akfaew@jasminek.net&gt;</li>"
 	    "</ul>"
-	    "Copyrights and licenses can be found on the XXXTerm "
-	    "<a href=\"http://opensource.conformal.com/wiki/XXXTerm\">website</a>"
+	    "Copyrights and licenses can be found on the Xombrero "
+	    "<a href=\"http://opensource.conformal.com/wiki/Xombrero\">website</a>"
 	    "</p>",
-#ifdef XXXTERM_BUILDSTR
-	    version, XXXTERM_BUILDSTR,
+#ifdef XOMBRERO_BUILDSTR
+	    version, XOMBRERO_BUILDSTR,
 #else
 	    version,
 #endif
@@ -271,11 +271,11 @@ help(struct tab *t, struct karg *args)
 		show_oops(NULL, "help invalid parameters");
 
 	head = "<meta http-equiv=\"REFRESH\" content=\"0;"
-	    "url=http://opensource.conformal.com/cgi-bin/man-cgi?xxxterm\">"
+	    "url=http://opensource.conformal.com/cgi-bin/man-cgi?xombrero\">"
 	    "</head>\n";
-	body = "XXXTerm man page <a href=\"http://opensource.conformal.com/"
-	    "cgi-bin/man-cgi?xxxterm\">http://opensource.conformal.com/"
-	    "cgi-bin/man-cgi?xxxterm</a>";
+	body = "Xombrero man page <a href=\"http://opensource.conformal.com/"
+	    "cgi-bin/man-cgi?xombrero\">http://opensource.conformal.com/"
+	    "cgi-bin/man-cgi?xombrero</a>";
 
 	page = get_html_page(XT_NAME, body, head, FALSE);
 
diff --git a/completion.c b/completion.c
index 0042860..e099e5d 100644
--- a/completion.c
+++ b/completion.c
@@ -19,7 +19,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 gboolean
 completion_select_cb(GtkEntryCompletion *widget, GtkTreeModel *model,
diff --git a/config-checker.pl b/config-checker.pl
index f8fd02e..f4e8dca 100755
--- a/config-checker.pl
+++ b/config-checker.pl
@@ -16,10 +16,10 @@
 
 
 use constant SETTINGS => "settings.c";
-use constant CONFIG   => "xxxterm.conf";
-use constant MAIN     => "xxxterm.c";
+use constant CONFIG   => "xombrero.conf";
+use constant MAIN     => "xombrero.c";
 
-# This is a script that checks if the default setting values of xxxterm
+# This is a script that checks if the default setting values of xombrero
 # (found in SETTINGS) are reflected by the CONFIG. It is meant to help
 # the developers; the end user need not bother with it.
 
diff --git a/cookie.c b/cookie.c
index 518e5c4..e7a9c6d 100644
--- a/cookie.c
+++ b/cookie.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 #define XT_REJECT_FILE		("rejected.txt")
 #define XT_COOKIE_FILE		("cookies.txt")
diff --git a/externaleditor.c b/externaleditor.c
index 404b906..7d8d090 100644
--- a/externaleditor.c
+++ b/externaleditor.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 #if !defined(XT_SIGNALS_DISABLE) && (WEBKIT_CHECK_VERSION(1, 5, 0))
 	/* we got the DOM API we need */
@@ -148,9 +148,9 @@ open_external_editor(struct tab *t, const char *contents, const char *suffix,
 	if (suffix == NULL)
 		suffix = "";
 
-	filename = g_malloc(strlen(temp_dir) + strlen(PS "xxxtermXXXXXX") +
+	filename = g_malloc(strlen(temp_dir) + strlen(PS "xombreroXXXXXX") +
 	    strlen(suffix) + 1);
-	sprintf(filename, "%s" PS "xxxtermXXXXXX%s", temp_dir, suffix);
+	sprintf(filename, "%s" PS "xombreroXXXXXX%s", temp_dir, suffix);
 
 	/* Create a temporary file */
 	fd = mkstemps(filename, strlen(suffix));
diff --git a/favorites b/favorites
index 964ddb9..cd78421 100644
--- a/favorites
+++ b/favorites
@@ -1,6 +1,4 @@
 #
-# $xxxterm$
-#
 # Each link uses 2 lines.  Line 1 is the title and line 2 is the link
 # This file must therefore have an even number of lines
 #
diff --git a/freebsd/Makefile b/freebsd/Makefile
index b5da90f..efbaf5b 100644
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -13,13 +13,13 @@ MANDIR?= $(PREFIX)/man
 
 CC?= cc
 
-all: ../javascript.h xxxterm
+all: ../javascript.h xombrero
 
 ../javascript.h: ../js-merge-helper.pl ../hinting.js ../autoscroll.js
 	perl ../js-merge-helper.pl ../hinting.js ../input-focus.js \
 	../autoscroll.js > ../javascript.h
 
-xxxterm.o: ../xxxterm.o
+xombrero.o: ../xombrero.o
 
 unix.o: ../unix.o
 
@@ -45,9 +45,9 @@ externaleditor.o: ../externaleditor.o
 
 tldlist.o: ../tldlist.o
 
-../xxxterm.o: ../javascript.h
+../xombrero.o: ../javascript.h
 
-xxxterm: xxxterm.o freebsd.o marco.o about.o inspector.o whitelist.o settings.o \
+xombrero: xombrero.o freebsd.o marco.o about.o inspector.o whitelist.o settings.o \
 	cookie.o history.o completion.o inputfocus.o tldlist.o externaleditor.o \
 	unix.o
 	$(CC) $(LDFLAGS) -o $@ *.o $+ $(LDADD)
@@ -56,11 +56,11 @@ install: all
 	install -m 755 -d $(DESTDIR)$(BINDIR)
 	install -m 755 -d $(DESTDIR)$(LIBDIR)
 	install -m 755 -d $(DESTDIR)$(MANDIR)/man1
-	install -m 755 xxxterm $(DESTDIR)$(BINDIR)
-	install -m 644 ../xxxterm.1 $(DESTDIR)$(MANDIR)/man1/xxxterm.1
+	install -m 755 xombrero $(DESTDIR)$(BINDIR)
+	install -m 644 ../xombrero.1 $(DESTDIR)$(MANDIR)/man1/xombrero.1
 
 clean:
-	rm -f xxxterm *.o
+	rm -f xombrero *.o
 	rm -f javascript.h
 
 .PHONY: all install clean
diff --git a/freebsd/util.h b/freebsd/util.h
index 5891f0f..fe3d6b7 100644
--- a/freebsd/util.h
+++ b/freebsd/util.h
@@ -1,4 +1,3 @@
-/* $xxxterm$ */
 /*
  * Copyright (c) 2010 Marco Peereboom <marco@peereboom.us>
  *
diff --git a/history.c b/history.c
index 53f5ff7..4757906 100644
--- a/history.c
+++ b/history.c
@@ -19,7 +19,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 #define XT_HISTORY_FILE		("history")
 #define XT_MAX_HL_PURGE_COUNT	(1000) /* Purge the history for every
diff --git a/inputfocus.c b/inputfocus.c
index faebb3f..9115e66 100644
--- a/inputfocus.c
+++ b/inputfocus.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 #if WEBKIT_CHECK_VERSION(1, 5, 0)
 	/* we got the DOM API we need */
diff --git a/inspector.c b/inspector.c
index d2d7889..839348d 100644
--- a/inspector.c
+++ b/inspector.c
@@ -15,7 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 gboolean
 inspector_attach_window(WebKitWebInspector *inspector, struct tab *t)
diff --git a/linux/Makefile b/linux/Makefile
index b6b027e..a351d34 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -10,7 +10,7 @@ PREFIX?= /usr/local
 BINDIR?= $(PREFIX)/bin
 LIBDIR?= $(PREFIX)/lib
 MANDIR?= $(PREFIX)/share/man
-RESDIR?= $(PREFIX)/share/xxxterm
+RESDIR?= $(PREFIX)/share/xombrero
 
 SRCS= $(shell ls ../*.c)
 SRCS+= linux.c
@@ -21,16 +21,16 @@ CC?= gcc
 
 BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh)
 ifneq ("${BUILDVERSION}", "")
-CFLAGS+= -DXXXTERM_BUILDSTR=\"$(BUILDVERSION)\"
+CFLAGS+= -DXOMBRERO_BUILDSTR=\"$(BUILDVERSION)\"
 endif
 
-all: javascript.h xxxterm
+all: javascript.h xombrero
 
 javascript.h: ../js-merge-helper.pl ../hinting.js ../autoscroll.js
 	perl ../js-merge-helper.pl ../hinting.js ../input-focus.js \
 	../autoscroll.js > javascript.h
 
-xxxterm: $(OBJS)
+xombrero: $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LDADD)
 
 %.o: %.c
@@ -44,29 +44,29 @@ install: all
 	install -m 755 -d $(DESTDIR)$(LIBDIR)
 	install -m 755 -d $(DESTDIR)$(MANDIR)/man1
 	install -m 755 -d $(DESTDIR)$(RESDIR)
-	install -m 755 xxxterm $(DESTDIR)$(BINDIR)
-	install -m 644 ../xxxterm.1 $(DESTDIR)$(MANDIR)/man1/xxxterm.1
-	install -m 644 ../xxxtermicon16.png $(DESTDIR)$(RESDIR)
-	install -m 644 ../xxxtermicon32.png $(DESTDIR)$(RESDIR)
-	install -m 644 ../xxxtermicon48.png $(DESTDIR)$(RESDIR)
-	install -m 644 ../xxxtermicon64.png $(DESTDIR)$(RESDIR)
-	install -m 644 ../xxxtermicon128.png $(DESTDIR)$(RESDIR)
+	install -m 755 xombrero $(DESTDIR)$(BINDIR)
+	install -m 644 ../xombrero.1 $(DESTDIR)$(MANDIR)/man1/xombrero.1
+	install -m 644 ../xombreroicon16.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xombreroicon32.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xombreroicon48.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xombreroicon64.png $(DESTDIR)$(RESDIR)
+	install -m 644 ../xombreroicon128.png $(DESTDIR)$(RESDIR)
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 
 uninstall:
-	rm -f $(DESTDIR)$(BINDIR)/xxxterm
-	rm -f $(DESTDIR)$(MANDIR)/man1/xxxterm.1
-	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon.png
-	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon16.png
-	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon32.png
-	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon48.png
-	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon64.png
-	rm -f $(DESTDIR)$(RESDIR)/xxxtermicon128.png
+	rm -f $(DESTDIR)$(BINDIR)/xombrero
+	rm -f $(DESTDIR)$(MANDIR)/man1/xombrero.1
+	rm -f $(DESTDIR)$(RESDIR)/xombreroicon.png
+	rm -f $(DESTDIR)$(RESDIR)/xombreroicon16.png
+	rm -f $(DESTDIR)$(RESDIR)/xombreroicon32.png
+	rm -f $(DESTDIR)$(RESDIR)/xombreroicon48.png
+	rm -f $(DESTDIR)$(RESDIR)/xombreroicon64.png
+	rm -f $(DESTDIR)$(RESDIR)/xombreroicon128.png
 	rm -f $(DESTDIR)$(RESDIR)/style.css
 	if [ -d $(DESTDIR)$(RESDIR) ]; then rmdir $(DESTDIR)$(RESDIR); fi
 clean:
-	rm -f xxxterm $(OBJS) $(DEPS)
+	rm -f xombrero $(OBJS) $(DEPS)
 	rm -f javascript.h
 
 
diff --git a/linux/linux.c b/linux/linux.c
index aa79b36..89a6e2c 100644
--- a/linux/linux.c
+++ b/linux/linux.c
@@ -1,5 +1,3 @@
-/* $xxxterm$ */
-
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/socket.h>
diff --git a/linux/tree.h b/linux/tree.h
index 7d20047..30c62b6 100644
--- a/linux/tree.h
+++ b/linux/tree.h
@@ -1,4 +1,3 @@
-/* $xxxterm$ */
 /*	$OpenBSD: tree.h,v 1.12 2009/03/02 09:42:55 mikeb Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/linux/util.h b/linux/util.h
index c3bcc39..2f329bb 100644
--- a/linux/util.h
+++ b/linux/util.h
@@ -1,4 +1,3 @@
-/* $xxxterm$ */
 /*
  * Copyright (c) 2010 Marco Peereboom <marco@peereboom.us>
  *
diff --git a/marco.c b/marco.c
index 14cee0e..12828ef 100644
--- a/marco.c
+++ b/marco.c
@@ -1,4 +1,3 @@
-/* $xxxterm$ */
 /*
  * Copyright (c) 2011 Todd T. Fries <todd@fries.net>
  *
@@ -15,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 static const char *message[] = {
 	"I fully support your right to put restrictions on how I can modify"
diff --git a/playflash.sh b/playflash.sh
index 4cfcfde..937e5ab 100644
--- a/playflash.sh
+++ b/playflash.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 # This is an example script for playing flash videos. It requires the
 # get_flash_video package to be installed on the system. You can copy this
-# file to ~/.xxxterm/, and set
-#   default_script = ~/.xxxterm/playflash.sh
-# in ~/.xxxterm.conf. Remember to make this file executable.
+# file to ~/.xombrero/, and set
+#   default_script = ~/.xombrero/playflash.sh
+# in ~/.xombrero.conf. Remember to make this file executable.
 #
 # You may wish to add the following line to ~/.get_flash_videosrc
 # to avoid accumulating files:
diff --git a/release.sh b/release.sh
index cfbebb3..6cb95ec 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@
 #   - Tags the release
 #   - Creates a release tarball
 
-PROJECT=xxxterm
+PROJECT=xombrero
 PROJECT_UC=$(echo $PROJECT | tr '[:lower:]' '[:upper:]')
 SCRIPT=$(basename $0)
 HEADER=version.h
diff --git a/settings.c b/settings.c
index b0d773e..85cfda3 100644
--- a/settings.c
+++ b/settings.c
@@ -19,7 +19,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 /* globals */
 SoupURI			*proxy_uri = NULL;
@@ -32,7 +32,7 @@ extern regex_t		url_re;
 /* settings that require restart */
 int		tabless = 0;	/* allow only 1 tab */
 int		enable_socket = 0;
-int		single_instance = 0; /* only allow one xxxterm to run */
+int		single_instance = 0; /* only allow one xombrero to run */
 int		fancy_bar = 1;	/* fancy toolbar */
 int		browser_mode = XT_BM_NORMAL;
 int		gui_mode = XT_GM_CLASSIC;
diff --git a/tldlist.c b/tldlist.c
index 48fadc1..b29e955 100644
--- a/tldlist.c
+++ b/tldlist.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 #define TLD_TREE_END_NODE 1
 #define TLD_TREE_EXCEPTION 2
diff --git a/unix.c b/unix.c
index 496ef63..93f9948 100644
--- a/unix.c
+++ b/unix.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 int
 fork_exec(struct tab *t, char *argv0, const gchar *argv1, char *error, int loud)
diff --git a/version.h b/version.h
index a38abff..8e4ff9d 100644
--- a/version.h
+++ b/version.h
@@ -15,18 +15,18 @@
  */
 
 
-#ifndef XXXTERM_VERSION_H
-#define XXXTERM_VERSION_H
+#ifndef XOMBRERO_VERSION_H
+#define XOMBRERO_VERSION_H
 
-#define XXXTERM_STR(x)		#x
-#define XXXTERM_STRINGIZE(x)	XXXTERM_STR(x)
+#define XOMBRERO_STR(x)		#x
+#define XOMBRERO_STRINGIZE(x)	XOMBRERO_STR(x)
 
-#define XXXTERM_MAJOR		1
-#define XXXTERM_MINOR		11
-#define XXXTERM_PATCH		3
-#define XXXTERM_VERSION		XXXTERM_STRINGIZE(XXXTERM_MAJOR) "." \
-				XXXTERM_STRINGIZE(XXXTERM_MINOR) "." \
-				XXXTERM_STRINGIZE(XXXTERM_PATCH)
+#define XOMBRERO_MAJOR		0
+#define XOMBRERO_MINOR		0
+#define XOMBRERO_PATCH		0
+#define XOMBRERO_VERSION	XOMBRERO_STRINGIZE(XOMBRERO_MAJOR) "." \
+				XOMBRERO_STRINGIZE(XOMBRERO_MINOR) "." \
+				XOMBRERO_STRINGIZE(XOMBRERO_PATCH)
 
-#endif /* XXXTERM_VERSION_H */
+#endif /* XOMBRERO_VERSION_H */
 
diff --git a/version.sh b/version.sh
index 2440cda..91ca2fd 100755
--- a/version.sh
+++ b/version.sh
@@ -8,7 +8,7 @@ if [ ! -f "$HEADER" ]; then
 	echo "$SCRIPT: error: $HEADER does not exist" 1>&2
 	exit 1
 fi
-PAT_PREFIX='^#define[[:space:]]+XXXTERM_'
+PAT_PREFIX='^#define[[:space:]]+XOMBRERO_'
 PAT_SUFFIX='[[:space:]]+[0-9]+$'
 MAJOR=$(egrep "${PAT_PREFIX}MAJOR${PAT_SUFFIX}" $HEADER | awk '{print $3}')
 MINOR=$(egrep "${PAT_PREFIX}MINOR${PAT_SUFFIX}" $HEADER | awk '{print $3}')
diff --git a/whitelist.c b/whitelist.c
index 1f1263a..9719dac 100644
--- a/whitelist.c
+++ b/whitelist.c
@@ -19,7 +19,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 
 gchar *
 find_domain(const gchar *s, int toplevel)
diff --git a/xxxterm.1 b/xombrero.1
index a9bc91a..aa551e5 100644
--- a/xxxterm.1
+++ b/xombrero.1
@@ -1,6 +1,4 @@
-.\"	$xxxterm$
-.\"
-.\" Copyright (c) 2010, 2011 Marco Peereboom <marco@peereboom.us>
+.\" Copyright (c) 2010, 2011, 2012 Marco Peereboom <marco@peereboom.us>
 .\" Copyright (c) 2011 Jason McIntyre <jmc@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -16,13 +14,13 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .Dd $Mdocdate: October 14 2011 $
-.Dt XXXTERM 1
+.Dt XOMBRERO 1
 .Os
 .Sh NAME
-.Nm xxxterm
+.Nm xombrero
 .Nd lightweight web browser
 .Sh SYNOPSIS
-.Nm xxxterm
+.Nm xombrero
 .Bk -words
 .Op Fl nSTtV
 .Op Fl f Ar file
@@ -67,8 +65,8 @@ section below) in a running
 .Nm
 instance. This option requires
 .Cm enable_socket
-to be enabled. Example run: xxxterm -e "tabnew openbsd.org"; xxxterm -e
-tabclose; xxxterm -e wq.
+to be enabled. Example run: xombrero -e "tabnew openbsd.org"; xombrero -e
+tabclose; xombrero -e wq.
 .It Fl S
 Disable the toolbar.
 .It Fl s Ar session_name
@@ -772,7 +770,7 @@ character (a letter or a digit), instead of a longer name. See the
 and
 .Cm gn[a-zA-Z0-9]
 buffer commands for usage. Quickmarks are stored in
-.Pa ~/.xxxterm/quickmarks
+.Pa ~/.xombrero/quickmarks
 and are saved automatically after each
 .Cm M[a-zA-Z0-9]
 buffer command.
@@ -896,18 +894,18 @@ See the
 section for additional configuration file entries and details
 that alter runtime behavior.
 .Sh FILES
-.Bl -tag -width "/etc/xxxterm.confXXX" -compact
-.It Pa ~/.xxxterm.conf
+.Bl -tag -width "/etc/xombrero.confXXX" -compact
+.It Pa ~/.xombrero.conf
 .Nm
 user specific settings.
-.It Pa ~/.xxxterm
+.It Pa ~/.xombrero
 .Nm
 scratch directory.
 .El
 .Pp
 .Nm
 tries to open the user specific file,
-.Pa ~/.xxxterm.conf .
+.Pa ~/.xombrero.conf .
 If that file is unavailable,
 it then uses built-in defaults.
 .Pp
@@ -979,7 +977,7 @@ mode the browse works just like
 mode however the toolbar only has the backward, forward and home button.
 .Pp
 This setting must be the first entry in
-.Pa ~/.xxxterm.conf
+.Pa ~/.xombrero.conf
 because it sets advanced settings that can be overridden later in the file.
 See the default config file for more details.
 .It Cm cmd_font
@@ -1023,7 +1021,7 @@ are only ever added to the database, and so the order of an included
 configuration file is not pertinent to these database settings.
 .Pp
 This feature is likely best used as the last item in
-.Pa ~/.xxxterm.conf .
+.Pa ~/.xombrero.conf .
 .It Cm cookie_wl
 This is a cookie whitelist item.
 Use multiple times to add multiple entries.
@@ -1081,7 +1079,7 @@ tabs.
 .It Cm enable_js_autorun
 Enables support for autorunning JavaScript after page loads.  When
 enabled,
-.Pa ~/.xxxterm/js/
+.Pa ~/.xombrero/js/
 will be searched for
 .Pa default.js
 and
@@ -1125,7 +1123,7 @@ Enable Java Script.
 When enabled the first instance of
 .Nm
 will create a socket in the
-.Pa ~/.xxxterm
+.Pa ~/.xombrero
 directory.
 Using the -n url option on subsequent
 .Nm
@@ -1147,7 +1145,7 @@ the string <file> will be replaced by the current filename.
 E.g.
 .Pa external_editor = gvim -f <file>
 Note!
-.Cm xxxterm
+.Cm xombrero
 relies on the editor
 .Pa not forking
 into the background.
@@ -1272,7 +1270,7 @@ resources such as icons.
 This is OS-specific and should be handled by the porter.
 .It Cm save_global_history
 If set the global history will be saved to
-.Pa ~/.xxxterm/history
+.Pa ~/.xombrero/history
 when quitting
 and restored at startup.
 See the
@@ -1286,7 +1284,7 @@ Make sure there is enough disk space to enable this feature.
 .It Cm search_string
 Default search engine string.
 See the
-.Pa xxxterm.conf
+.Pa xombrero.conf
 file for details.
 .It Cm session_autosave
 Enable session auto-saving when changing state (e.g. adding or removing a tab).
@@ -1389,7 +1387,7 @@ Set the work directory where all
 .Nm
 scratch files are stored.
 Default is
-.Cm ~/.xxxterm .
+.Cm ~/.xombrero .
 .It Cm xterm_workaround
 When enabled
 .Nm
diff --git a/xxxterm.c b/xombrero.c
index e17a91b..6586ad1 100644
--- a/xxxterm.c
+++ b/xombrero.c
@@ -19,10 +19,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <xxxterm.h>
+#include <xombrero.h>
 #include "version.h"
 
-char		*version = XXXTERM_VERSION;
+char		*version = XOMBRERO_VERSION;
 
 #ifdef XT_DEBUG
 uint32_t		swm_debug = 0
@@ -52,11 +52,11 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 
 char		*icons[] = {
-	"xxxtermicon16.png",
-	"xxxtermicon32.png",
-	"xxxtermicon48.png",
-	"xxxtermicon64.png",
-	"xxxtermicon128.png"
+	"xombreroicon16.png",
+	"xombreroicon32.png",
+	"xombreroicon48.png",
+	"xombreroicon64.png",
+	"xombreroicon128.png"
 };
 
 struct session {
@@ -81,13 +81,13 @@ struct command_entry {
 TAILQ_HEAD(command_list, command_entry);
 
 /* defines */
-#define XT_DIR			(".xxxterm")
+#define XT_DIR			(".xombrero")
 #define XT_CACHE_DIR		("cache")
 #define XT_CERT_DIR		("certs")
 #define XT_JS_DIR		("js")
 #define XT_SESSIONS_DIR		("sessions")
 #define XT_TEMP_DIR		("tmp")
-#define XT_CONF_FILE		("xxxterm.conf")
+#define XT_CONF_FILE		("xombrero.conf")
 #define XT_QMARKS_FILE		("quickmarks")
 #define XT_SAVED_TABS_FILE	("main_session")
 #define XT_RESTART_TABS_FILE	("restart_tabs")
@@ -6341,7 +6341,7 @@ create_window(const gchar *name)
 	else
 		gtk_window_set_default_size(GTK_WINDOW(w), window_width, window_height);
 	gtk_widget_set_name(w, name);
-	gtk_window_set_wmclass(GTK_WINDOW(w), name, "XXXTerm");
+	gtk_window_set_wmclass(GTK_WINDOW(w), name, "Xombrero");
 
 	return (w);
 }
@@ -7403,7 +7403,7 @@ create_canvas(void)
 	g_signal_connect(G_OBJECT(abtn), "button_press_event",
 	    G_CALLBACK(arrow_cb), NULL);
 
-	main_window = create_window("xxxterm");
+	main_window = create_window("xombrero");
 	gtk_container_add(GTK_CONTAINER(main_window), vbox);
 	g_signal_connect(G_OBJECT(main_window), "delete_event",
 	    G_CALLBACK(gtk_main_quit), NULL);
@@ -7669,17 +7669,14 @@ complain:
 void
 welcome(void)
 {
-	startpage_add("<b>Welcome to xxxterm %s!</b><p>", version);
-	startpage_add("Beware that this is the final version that will use the"
-	    " xxxterm name.<br>Moving forward the browser will be called "
-	    "xombrero.<p>", version);
-	startpage_add("Details will soon appear on the "
+	startpage_add("<b>Welcome to xombrero %s!</b><p>", version);
+	startpage_add("Details at "
 	    "<a href=https://opensource.conformal.com/wiki/xombrero>xombrero "
 	    "wiki page</a><p>");
 	startpage_add("Unfortunately scroogle has shut it's doors and due to "
-	   "that one has to edit search_string in ~/.xxxterm.conf.<br>"
+	   "that one has to edit search_string in ~/.xombrero.conf.<br>"
 	   "There are various examples in the configuration file.<br>"
-	   "The authors of xxxterm are not in a position to suggest a search "
+	   "The authors of xombrero are not in a position to suggest a search "
 	   "engine.");
 }
 
@@ -7767,9 +7764,9 @@ main(int argc, char **argv)
 			show_tabs = 0;
 			break;
 		case 'V':
-#ifdef XXXTERM_BUILDSTR
+#ifdef XOMBRERO_BUILDSTR
 			errx(0 , "Version: %s Build: %s",
-			    version, XXXTERM_BUILDSTR);
+			    version, XOMBRERO_BUILDSTR);
 #else
 			errx(0 , "Version: %s", version);
 #endif
@@ -7825,7 +7822,7 @@ main(int argc, char **argv)
 	/* set default string settings */
 	home = g_strdup("https://www.cyphertite.com");
 	search_string = g_strdup("https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=%s");
-	resource_dir = g_strdup("/usr/local/share/xxxterm/");
+	resource_dir = g_strdup("/usr/local/share/xombrero/");
 	strlcpy(runtime_settings, "runtime", sizeof runtime_settings);
 	cmd_font_name = g_strdup("monospace normal 9");
 	oops_font_name = g_strdup("monospace normal 9");
@@ -7998,7 +7995,7 @@ main(int argc, char **argv)
 	    NULL);
 
 #ifndef XT_SOCKET_DISABLE
-	/* see if there is already an xxxterm running */
+	/* see if there is already a xombrero running */
 	if (single_instance && is_running()) {
 		optn = 1;
 		warnx("already running");
diff --git a/xxxterm.conf b/xombrero.conf
index 6ebdf51..9dc1157 100644
--- a/xxxterm.conf
+++ b/xombrero.conf
@@ -74,7 +74,7 @@
 # search_string		= http://www.scroogle.org/cgi-bin/nbbw.cgi?Gw=%s
 #
 # Google
-# search_string		= http://www.google.com/search?q=%s&&client=xxxterm
+# search_string		= http://www.google.com/search?q=%s&&client=xombrero
 #
 # Yahoo
 # search_string		= http://search.yahoo.com/search?p=%s
@@ -96,11 +96,11 @@
 # "default_script" points to a script executed by the run_script
 # command. The only argument passed to this script is the current URI.
 #
-# default_script	= ~/.xxxterm/playflash.sh
+# default_script	= ~/.xombrero/playflash.sh
 
 # "user_agent" can be set to just about anything, for a comprehensive
 # list see: http://www.useragentstring.com/pages/All/ . If more than one
-# "user_agent" is given, then xxxterm will use them in a round-robin
+# "user_agent" is given, then xombrero will use them in a round-robin
 # fashion for each request.
 #
 #user_agent		= Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)
@@ -172,7 +172,7 @@
 ## ADVANCED SETTINGS
 ##
 
-# resource_dir		= /usr/local/share/xxxterm/
+# resource_dir		= /usr/local/share/xombrero/
 # refresh_interval	= 10
 # url_regex		= ^[[:blank:]]*[^[:blank:]]*([[:alnum:]-]+\.)+[[:alnum:]-][^[:blank:]]*[[:blank:]]*$
 
@@ -366,4 +366,4 @@
 # keybinding	= passthrough,C-z
 
 # parse the contents of another configuration file
-# include_config	= ~/.xxxterm_alternate.conf
+# include_config	= ~/.xombrero_alternate.conf
diff --git a/xxxterm.desktop b/xombrero.desktop
index fd8ab28..fcf087d 100644
--- a/xxxterm.desktop
+++ b/xombrero.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=xxxterm Browser
+Name=xombrero Browser
 Comment=Minimalist's Web Browser
 Terminal=false
 Type=Application
 Version=1.0
-Icon=xxxtermicon64.png
-Exec=xxxterm %u
+Icon=xombreroicon64.png
+Exec=xombrero %u
 StartupNotify=false
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
diff --git a/xxxterm.h b/xombrero.h
index 8e5676d..49952ac 100644
--- a/xxxterm.h
+++ b/xombrero.h
@@ -312,7 +312,7 @@ RB_HEAD(strict_transport_tree, strict_transport);
 RB_PROTOTYPE(strict_transport_tree, strict_transport, entry, strict_transport_rb_cmp);
 
 /* utility */
-#define XT_NAME			("XXXTerm")
+#define XT_NAME			("Xombrero")
 #define XT_CB_HANDLED		(TRUE)
 #define XT_CB_PASSTHROUGH	(FALSE)
 #define XT_FAVS_FILE		("favorites")
diff --git a/xxxtermicon.png b/xombreroicon.png
index 91371c9..91371c9 100644
--- a/xxxtermicon.png
+++ b/xombreroicon.png
Binary files differdiff --git a/xxxtermicon128.png b/xombreroicon128.png
index 9172859..9172859 100644
--- a/xxxtermicon128.png
+++ b/xombreroicon128.png
Binary files differdiff --git a/xxxtermicon16.png b/xombreroicon16.png
index e3b5078..e3b5078 100644
--- a/xxxtermicon16.png
+++ b/xombreroicon16.png
Binary files differdiff --git a/xxxtermicon32.png b/xombreroicon32.png
index 1fa04fc..1fa04fc 100644
--- a/xxxtermicon32.png
+++ b/xombreroicon32.png
Binary files differdiff --git a/xxxtermicon48.png b/xombreroicon48.png
index cdf4c02..cdf4c02 100644
--- a/xxxtermicon48.png
+++ b/xombreroicon48.png
Binary files differdiff --git a/xxxtermicon64.png b/xombreroicon64.png
index 5936514..5936514 100644
--- a/xxxtermicon64.png
+++ b/xombreroicon64.png
Binary files differ
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-22 05:52:06 +0000