Permalink
Browse files

rename scrotwm to spectrwm

  • Loading branch information...
Marco Peereboom
Marco Peereboom committed Feb 15, 2012
1 parent 34e5a4f commit e83f3b790887174fe8b8fd6b3c98172b59ff9305
View
@@ -5,9 +5,9 @@ PREFIX?=/usr/local
BINDIR=${PREFIX}/bin
SUBDIR= lib
PROG=scrotwm
#MAN=scrotwm_pt.1 scrotwm_ru.1
MAN=scrotwm.1 scrotwm_es.1 scrotwm_it.1
PROG=spectrwm
#MAN=spectrwm_pt.1 spectrwm_ru.1
MAN=spectrwm.1 spectrwm_es.1 spectrwm_it.1
CFLAGS+=-std=c89 -Wall -Wno-uninitialized -ggdb3
# Uncomment define below to disallow user settable clock format string
@@ -16,13 +16,13 @@ CPPFLAGS+= -I${X11BASE}/include
LDADD+=-lutil -L${X11BASE}/lib -lX11 -lXrandr -lXtst
BUILDVERSION != sh "${.CURDIR}/buildver.sh"
.if !${BUILDVERSION} == ""
CPPFLAGS+= -DSCROTWM_BUILDSTR=\"$(BUILDVERSION)\"
CPPFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
.endif
MANDIR= ${PREFIX}/man/man
#scrotwm_ru.cat1: scrotwm_ru.1
# nroff -mandoc ${.CURDIR}/scrotwm_ru.1 > ${.TARGET}
#spectrwm_ru.cat1: spectrwm_ru.1
# nroff -mandoc ${.CURDIR}/spectrwm_ru.1 > ${.TARGET}
obj: _xenocara_obj
View
@@ -4,7 +4,7 @@
print_date() {
# The date is printed to the status bar by default.
# To print the date through this script, set clock_enabled to 0
# in scrotwm.conf. Uncomment "print_date" below.
# in spectrwm.conf. Uncomment "print_date" below.
FORMAT="%a %b %d %R %Z %Y"
DATE=`date "+${FORMAT}"`
echo -n "${DATE} "
View
@@ -10,24 +10,24 @@ MANDIR?= $(PREFIX)/man
LVERS!= awk -F = '/major/ { printf( "%s.", $$2 ) } /minor/ { printf( "%s", $$2 ) }' ${.CURDIR}/../lib/shlib_version
BUILDVERSION!= sh "${.CURDIR}/../buildver.sh"
.if !${BUILDVERSION} == ""
CFLAGS+= -DSCROTWM_BUILDSTR=\"$(BUILDVERSION)\"
CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
.endif
CFLAGS+= -Wall -Wno-uninitialized -I. -I${LOCALBASE}/include
CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
LDADD+= -lutil -L${LOCALBASE}/lib -lX11 -lXrandr -lXtst
all: scrotwm libswmhack.so.$(LVERS)
all: spectrwm libswmhack.so.$(LVERS)
scrotwm.c:
ln -sf ../scrotwm.c
spectrwm.c:
ln -sf ../spectrwm.c
ln -sf ../version.h
swm_hack.c:
ln -sf ../lib/swm_hack.c
scrotwm: scrotwm.o
spectrwm: spectrwm.o
$(CC) $(LDFLAGS) $(LDADD) -o ${.TARGET} ${.ALLSRC}
swm_hack.so: swm_hack.c
@@ -40,15 +40,15 @@ install: all
install -m 755 -d $(DESTDIR)$(BINDIR)
install -m 755 -d $(DESTDIR)$(LIBDIR)
install -m 755 -d $(DESTDIR)$(MANDIR)/man1
install -m 755 scrotwm $(DESTDIR)$(BINDIR)
install -m 755 spectrwm $(DESTDIR)$(BINDIR)
install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR)
install -m 644 ../scrotwm.1 $(DESTDIR)$(MANDIR)/man1/scrotwm.1
install -m 644 ../scrotwm_es.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_es.1
install -m 644 ../scrotwm_it.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_it.1
install -m 644 ../scrotwm_pt.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_pt.1
install -m 644 ../scrotwm_ru.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_ru.1
install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1
install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_es.1
install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1
install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1
install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1
clean:
rm -f scrotwm *.o *.so libswmhack.so.* scrotwm.c swm_hack.c version.h
rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h
.sinclude <bsd.port.post.mk>
View
@@ -11,16 +11,16 @@ CC= gcc
LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
all: scrotwm libswmhack.so.$(LVERS)
all: spectrwm libswmhack.so.$(LVERS)
scrotwm.c:
ln -sf ../scrotwm.c
spectrwm.c:
ln -sf ../spectrwm.c
ln -sf ../version.h
swm_hack.c:
ln -sf ../lib/swm_hack.c
scrotwm: scrotwm.o linux.o
spectrwm: spectrwm.o linux.o
$(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
%.so: %.c
@@ -33,15 +33,15 @@ install: all
install -m 755 -d $(DESTDIR)$(BINDIR)
install -m 755 -d $(DESTDIR)$(LIBDIR)
install -m 755 -d $(DESTDIR)$(MANDIR)/man1
install -m 755 scrotwm $(DESTDIR)$(BINDIR)
install -m 755 spectrwm $(DESTDIR)$(BINDIR)
install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR)
install -m 644 ../scrotwm.1 $(DESTDIR)$(MANDIR)/man1/scrotwm.1
install -m 644 ../scrotwm_es.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_es.1
install -m 644 ../scrotwm_it.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_it.1
install -m 644 ../scrotwm_pt.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_pt.1
install -m 644 ../scrotwm_ru.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_ru.1
install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1
install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_es.1
install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1
install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1
install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1
clean:
rm -f scrotwm *.o *.so libswmhack.so.* scrotwm.c swm_hack.c version.h
rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h
.PHONY: all install clean
View

This file was deleted.

Oops, something went wrong.
View
@@ -0,0 +1,6 @@
[Desktop Entry]
Name=spectrwm
Comment=The spectrwm window manager
Type=Application
Exec=/usr/bin/spectrwm
TryExec=/usr/bin/spectrwm
View
@@ -11,15 +11,15 @@ CC= gcc
LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
all: scrotwm libswmhack.so.$(LVERS)
all: spectrwm libswmhack.so.$(LVERS)
scrotwm.c:
ln -sf ../scrotwm.c
spectrwm.c:
ln -sf ../spectrwm.c
swm_hack.c:
ln -sf ../lib/swm_hack.c
scrotwm: scrotwm.o osx.o
spectrwm: spectrwm.o osx.o
$(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
%.so: %.c
@@ -34,15 +34,15 @@ install: all
install -m 755 -d $(DESTDIR)$(BINDIR)
install -m 755 -d $(DESTDIR)$(LIBDIR)
install -m 755 -d $(DESTDIR)$(MANDIR)/man1
install -m 755 scrotwm $(DESTDIR)$(BINDIR)
install -m 755 spectrwm $(DESTDIR)$(BINDIR)
install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR)
install -m 644 ../scrotwm.1 $(DESTDIR)$(MANDIR)/man1/scrotwm.1
install -m 644 ../scrotwm_es.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_es.1
install -m 644 ../scrotwm_it.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_it.1
install -m 644 ../scrotwm_pt.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_pt.1
install -m 644 ../scrotwm_ru.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_ru.1
install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1
install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_es.1
install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1
install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1
install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1
clean:
rm -f scrotwm *.o *.so libswmhack.so.* scrotwm.c swm_hack.c
rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c
.PHONY: all install clean
View
@@ -7,7 +7,7 @@
# - Tags the release
# - Creates a release tarball
PROJECT=scrotwm
PROJECT=spectrwm
PROJECT_UC=$(echo $PROJECT | tr '[:lower:]' '[:upper:]')
SCRIPT=$(basename $0)
HEADER=version.h
View

This file was deleted.

Oops, something went wrong.
View
@@ -14,13 +14,13 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: February 8 2012 $
.Dt SCROTWM 1
.Dt SPECTRWM 1
.Os
.Sh NAME
.Nm scrotwm
.Nm spectrwm
.Nd window manager for X11
.Sh SYNOPSIS
.Nm scrotwm
.Nm spectrwm
.Sh DESCRIPTION
.Nm
is a minimalistic window manager that tries to stay out of the way so that
@@ -33,7 +33,7 @@ fast.
When
.Nm
starts up, it reads settings from its configuration file,
.Pa scrotwm.conf .
.Pa spectrwm.conf .
See the
.Sx CONFIGURATION FILES
section below.
@@ -62,10 +62,10 @@ section below for defaults and customizations.
.Sh CONFIGURATION FILES
.Nm
first tries to open the user specific file,
.Pa ~/.scrotwm.conf .
.Pa ~/.spectrwm.conf .
If that file is unavailable,
it then tries to open the global configuration file
.Pa /etc/scrotwm.conf .
.Pa /etc/spectrwm.conf .
.Pp
The format of the file is \*(Ltkeyword\*(Gt = \*(Ltsetting\*(Gt.
For example:
@@ -315,7 +315,7 @@ fields and will be substituted for values at the time the program is spawned:
.Pp
Example:
.Bd -literal -offset indent
program[ff] = /usr/local/bin/firefox http://scrotwm.org/
program[ff] = /usr/local/bin/firefox http://spectrwm.org/
bind[ff] = Mod+Shift+b # Now Mod+Shift+B launches firefox
.Ed
.Pp
@@ -622,18 +622,18 @@ These files can be used with the
setting to load pre-defined key bindings for the specified
keyboard layout.
.Pp
.Bl -tag -width "scrotwm_XX.confXXX" -offset indent -compact
.It Cm scrotwm_cz.conf
.Bl -tag -width "spectrwm_XX.confXXX" -offset indent -compact
.It Cm spectrwm_cz.conf
Czech Republic keyboard layout
.It Cm scrotwm_es.conf
.It Cm spectrwm_es.conf
Spanish keyboard layout
.It Cm scrotwm_fr.conf
.It Cm spectrwm_fr.conf
French keyboard layout
.It Cm scrotwm_fr_ch.conf
.It Cm spectrwm_fr_ch.conf
Swiss French keyboard layout
.It Cm scrotwm_se.conf
.It Cm spectrwm_se.conf
Swedish keyboard layout
.It Cm scrotwm_us.conf
.It Cm spectrwm_us.conf
United States keyboard layout
.El
.Sh QUIRKS
@@ -827,11 +827,11 @@ Sending
.Nm
a HUP signal will restart it.
.Sh FILES
.Bl -tag -width "/etc/scrotwm.confXXX" -compact
.It Pa ~/.scrotwm.conf
.Bl -tag -width "/etc/spectrwm.confXXX" -compact
.It Pa ~/.spectrwm.conf
.Nm
user specific settings.
.It Pa /etc/scrotwm.conf
.It Pa /etc/spectrwm.conf
.Nm
global settings.
.El
Oops, something went wrong.

0 comments on commit e83f3b7

Please sign in to comment.