Skip to content
Permalink
Browse files

rename xxxterm to xomrero

  • Loading branch information...
Marco Peereboom
Marco Peereboom committed May 17, 2012
1 parent 1b1398e commit 77b17b22ccbfd89b90ced9996ee6a97a482b54f9
@@ -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

24 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);

@@ -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,
@@ -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.

@@ -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")
@@ -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));
@@ -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
#
@@ -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
@@ -1,4 +1,3 @@
/* $xxxterm$ */
/*
* Copyright (c) 2010 Marco Peereboom <marco@peereboom.us>
*
@@ -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
@@ -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 */
@@ -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)
@@ -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


@@ -1,5 +1,3 @@
/* $xxxterm$ */

#include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/socket.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>
@@ -1,4 +1,3 @@
/* $xxxterm$ */
/*
* Copyright (c) 2010 Marco Peereboom <marco@peereboom.us>
*
@@ -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"
@@ -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:
@@ -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
@@ -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;
Oops, something went wrong.

0 comments on commit 77b17b2

Please sign in to comment.
You can’t perform that action at this time.