From e83f3b790887174fe8b8fd6b3c98172b59ff9305 Mon Sep 17 00:00:00 2001 From: Marco Peereboom Date: Wed, 15 Feb 2012 14:09:13 -0600 Subject: [PATCH] rename scrotwm to spectrwm --- Makefile | 12 ++-- baraction.sh | 2 +- freebsd/Makefile | 24 +++---- linux/Makefile | 22 +++--- linux/scrotwm.desktop | 7 -- linux/spectrwm.desktop | 6 ++ osx/Makefile | 22 +++--- release.sh | 2 +- scrotwm.conf | 84 ----------------------- scrotwm.1 => spectrwm.1 | 34 ++++----- scrotwm.c => spectrwm.c | 15 ++-- spectrwm.conf | 84 +++++++++++++++++++++++ scrotwm_cz.conf => spectrwm_cz.conf | 0 scrotwm_es.1 => spectrwm_es.1 | 22 +++--- scrotwm_es.conf => spectrwm_es.conf | 0 scrotwm_fr.conf => spectrwm_fr.conf | 0 scrotwm_fr_ch.conf => spectrwm_fr_ch.conf | 0 scrotwm_it.1 => spectrwm_it.1 | 20 +++--- scrotwm_pt.1 => spectrwm_pt.1 | 20 +++--- scrotwm_ru.1 => spectrwm_ru.1 | 22 +++--- scrotwm_se.conf => spectrwm_se.conf | 0 scrotwm_us.conf => spectrwm_us.conf | 0 version.h | 22 +++--- 23 files changed, 210 insertions(+), 210 deletions(-) delete mode 100644 linux/scrotwm.desktop create mode 100644 linux/spectrwm.desktop delete mode 100644 scrotwm.conf rename scrotwm.1 => spectrwm.1 (97%) rename scrotwm.c => spectrwm.c (99%) create mode 100644 spectrwm.conf rename scrotwm_cz.conf => spectrwm_cz.conf (100%) rename scrotwm_es.1 => spectrwm_es.1 (98%) rename scrotwm_es.conf => spectrwm_es.conf (100%) rename scrotwm_fr.conf => spectrwm_fr.conf (100%) rename scrotwm_fr_ch.conf => spectrwm_fr_ch.conf (100%) rename scrotwm_it.1 => spectrwm_it.1 (98%) rename scrotwm_pt.1 => spectrwm_pt.1 (98%) rename scrotwm_ru.1 => spectrwm_ru.1 (98%) rename scrotwm_se.conf => spectrwm_se.conf (100%) rename scrotwm_us.conf => spectrwm_us.conf (100%) diff --git a/Makefile b/Makefile index ad27745..048eb32 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/baraction.sh b/baraction.sh index c3ac272..e87b93d 100644 --- a/baraction.sh +++ b/baraction.sh @@ -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} " diff --git a/freebsd/Makefile b/freebsd/Makefile index 8b23a4d..c8f03b2 100644 --- a/freebsd/Makefile +++ b/freebsd/Makefile @@ -10,7 +10,7 @@ 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 @@ -18,16 +18,16 @@ 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 diff --git a/linux/Makefile b/linux/Makefile index d8f0206..2060184 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -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 diff --git a/linux/scrotwm.desktop b/linux/scrotwm.desktop deleted file mode 100644 index fdc5ad2..0000000 --- a/linux/scrotwm.desktop +++ /dev/null @@ -1,7 +0,0 @@ - -[Desktop Entry] -Name=ScrotWM -Comment=The ScrotWM window manager -Type=Application -Exec=/usr/bin/scrotwm -TryExec=/usr/bin/scrotwm diff --git a/linux/spectrwm.desktop b/linux/spectrwm.desktop new file mode 100644 index 0000000..1ed4c7d --- /dev/null +++ b/linux/spectrwm.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=spectrwm +Comment=The spectrwm window manager +Type=Application +Exec=/usr/bin/spectrwm +TryExec=/usr/bin/spectrwm diff --git a/osx/Makefile b/osx/Makefile index 7d16a6d..7e34441 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -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 diff --git a/release.sh b/release.sh index 3ac9b92..801b056 100644 --- a/release.sh +++ b/release.sh @@ -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 diff --git a/scrotwm.conf b/scrotwm.conf deleted file mode 100644 index caca87e..0000000 --- a/scrotwm.conf +++ /dev/null @@ -1,84 +0,0 @@ -# PLEASE READ THE MAN PAGE BEFORE EDITING THIS FILE! -# http://opensource.conformal.com/cgi-bin/man-cgi?scrotwm - -# colors for focussed and unfocussed window borders -# NOTE: all colors in this file are in hex! see XQueryColor for examples -color_focus = red -color_unfocus = rgb:88/88/88 - -# bar settings -bar_enabled = 1 -bar_border_width = 1 -bar_border[1] = rgb:00/80/80 -bar_color[1] = black -bar_font_color[1] = rgb:a0/a0/a0 -bar_font = -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-* -#bar_action = baraction.sh -#bar_delay = 1 -#bar_justify = left -#bar_at_bottom = 1 -stack_enabled = 1 -clock_enabled = 1 -#clock_format = %a %b %d %R %Z %Y -title_name_enabled = 0 -title_class_enabled = 0 -window_name_enabled = 0 -#verbose_layout = 1 -#focus_mode = default -#disable_border = 1 -#border_width = 1 -#urgent_enabled = 1 - -# spawn app -# program[term] = xterm -# program[screenshot_all] = screenshot.sh full -# program[screenshot_wind] = screenshot.sh window -# program[lock] = xlock -# program[initscr] = initscreen.sh -# program[menu] = dmenu_run -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_border -sf $bar_color -spawn_term = xterm - -# dialog box size ratio .3 >= r < 1 -dialog_ratio = 0.6 - -# Split a non-Xrandr dual head setup into one region per monitor -# (non-standard driver-based multihead is not seen by scrotwm) -# region = screen[1]:1280x1024+0+0 -# region = screen[1]:1280x1024+1280+0 - -# Launch applications in a workspace of choice -# autorun = ws[1]:xterm -# autorun = ws[2]:xxxterm http://www.openbsd.org - -# workspace layout -# layout = ws[1]:4:0:0:0:vertical -# layout = ws[2]:0:0:0:0:horizontal -# layout = ws[3]:0:0:0:0:fullscreen - -# mod key, (windows key is Mod4) (apple key on OSX is Mod2) -# modkey = Mod1 - -# Clear key bindings and load new key bindings from the specified file. -# This allows you to load pre-defined key bindings for your keyboard layout. -# keyboard_mapping = ~/.scrotwm_us.conf - -# quirks -# remove with: quirk[class:name] = NONE -#quirk[MPlayer:xv] = FLOAT + FULLSCREEN + FOCUSPREV -#quirk[OpenOffice.org 2.4:VCLSalFrame] = FLOAT -#quirk[OpenOffice.org 3.0:VCLSalFrame] = FLOAT -#quirk[OpenOffice.org 3.1:VCLSalFrame] = FLOAT -#quirk[Firefox-bin:firefox-bin] = TRANSSZ -#quirk[Firefox:Dialog] = FLOAT -#quirk[Gimp:gimp] = FLOAT + ANYWHERE -#quirk[XTerm:xterm] = XTERM_FONTADJ -#quirk[xine:Xine Window] = FLOAT + ANYWHERE -#quirk[Xitk:Xitk Combo] = FLOAT + ANYWHERE -#quirk[xine:xine Panel] = FLOAT + ANYWHERE -#quirk[Xitk:Xine Window] = FLOAT + ANYWHERE -#quirk[xine:xine Video Fullscreen Window] = FULLSCREEN + FLOAT -#quirk[pcb:pcb] = FLOAT - -# EXAMPLE: define firefox program and bind to key -# program[firefox] = firefox http://scrotwm.org/ -# bind[firefox] = MOD+Shift+b diff --git a/scrotwm.1 b/spectrwm.1 similarity index 97% rename from scrotwm.1 rename to spectrwm.1 index 21bc043..b85f44f 100644 --- a/scrotwm.1 +++ b/spectrwm.1 @@ -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 diff --git a/scrotwm.c b/spectrwm.c similarity index 99% rename from scrotwm.c rename to spectrwm.c index 9545475..2928f00 100644 --- a/scrotwm.c +++ b/spectrwm.c @@ -101,10 +101,10 @@ #include "version.h" -#ifdef SCROTWM_BUILDSTR -static const char *buildstr = SCROTWM_BUILDSTR; +#ifdef SPECTRWM_BUILDSTR +static const char *buildstr = SPECTRWM_BUILDSTR; #else -static const char *buildstr = SCROTWM_VERSION; +static const char *buildstr = SPECTRWM_VERSION; #endif #if RANDR_MAJOR < 1 @@ -1691,7 +1691,7 @@ version(struct swm_region *r, union arg *args) bar_version = !bar_version; if (bar_version) snprintf(bar_vertext, sizeof bar_vertext, - "Version: %s Build: %s", SCROTWM_VERSION, buildstr); + "Version: %s Build: %s", SPECTRWM_VERSION, buildstr); else strlcpy(bar_vertext, "", sizeof bar_vertext); bar_update(); @@ -5195,7 +5195,8 @@ setup_quirks(void) } /* conf file stuff */ -#define SWM_CONF_FILE "scrotwm.conf" +#define SWM_CONF_FILE "spectrwm.conf" +#define SWM_CONF_FILE_OLD "scrotwm.conf" enum { SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, SWM_S_BAR_BORDER_WIDTH, SWM_S_STACK_ENABLED, SWM_S_CLOCK_ENABLED, SWM_S_CLOCK_FORMAT, @@ -6217,7 +6218,7 @@ enternotify(XEvent *e) * the window or a subwindow already has focus (occurs during restart). * * Only honor the focus flag if last_focus_event is not FocusOut, - * this allows scrotwm to continue to control focus when another + * this allows spectrwm to continue to control focus when another * program is also playing with it. */ if (ev->state || (ev->focus && last_focus_event != FocusOut)) { @@ -6920,7 +6921,7 @@ main(int argc, char *argv[]) struct sigaction sact; start_argv = argv; - warnx("Welcome to scrotwm V%s Build: %s", SCROTWM_VERSION, buildstr); + warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr); if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "") || !XSupportsLocale()) warnx("no locale support"); diff --git a/spectrwm.conf b/spectrwm.conf new file mode 100644 index 0000000..5e460d5 --- /dev/null +++ b/spectrwm.conf @@ -0,0 +1,84 @@ +# PLEASE READ THE MAN PAGE BEFORE EDITING THIS FILE! +# http://opensource.conformal.com/cgi-bin/man-cgi?spectrwm + +# colors for focussed and unfocussed window borders +# NOTE: all colors in this file are in hex! see XQueryColor for examples +# color_focus = red +# color_unfocus = rgb:88/88/88 + +# bar settings +# bar_enabled = 1 +# bar_border_width = 1 +# bar_border[1] = rgb:00/80/80 +# bar_color[1] = black +# bar_font_color[1] = rgb:a0/a0/a0 +# bar_font = -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-* +# bar_action = baraction.sh +# bar_delay = 1 +# bar_justify = left +# bar_at_bottom = 1 +# stack_enabled = 1 +# clock_enabled = 1 +# clock_format = %a %b %d %R %Z %Y +# title_name_enabled = 0 +# title_class_enabled = 0 +# window_name_enabled = 0 +# verbose_layout = 1 +# focus_mode = default +# disable_border = 1 +# border_width = 1 +# urgent_enabled = 1 + +# spawn app +# program[term] = xterm +# program[screenshot_all] = screenshot.sh full +# program[screenshot_wind] = screenshot.sh window +# program[lock] = xlock +# program[initscr] = initscreen.sh +# program[menu] = dmenu_run -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_border -sf $bar_color +# spawn_term = xterm + +# dialog box size ratio .3 >= r < 1 +# dialog_ratio = 0.6 + +# Split a non-Xrandr dual head setup into one region per monitor +# (non-standard driver-based multihead is not seen by spectrwm) +# region = screen[1]:1280x1024+0+0 +# region = screen[1]:1280x1024+1280+0 + +# Launch applications in a workspace of choice +# autorun = ws[1]:xterm +# autorun = ws[2]:xxxterm http://www.openbsd.org + +# workspace layout +# layout = ws[1]:4:0:0:0:vertical +# layout = ws[2]:0:0:0:0:horizontal +# layout = ws[3]:0:0:0:0:fullscreen + +# mod key, (windows key is Mod4) (apple key on OSX is Mod2) +# modkey = Mod1 + +# Clear key bindings and load new key bindings from the specified file. +# This allows you to load pre-defined key bindings for your keyboard layout. +# keyboard_mapping = ~/.spectrwm_us.conf + +# quirks +# remove with: quirk[class:name] = NONE +# quirk[MPlayer:xv] = FLOAT + FULLSCREEN + FOCUSPREV +# quirk[OpenOffice.org 2.4:VCLSalFrame] = FLOAT +# quirk[OpenOffice.org 3.0:VCLSalFrame] = FLOAT +# quirk[OpenOffice.org 3.1:VCLSalFrame] = FLOAT +# quirk[Firefox-bin:firefox-bin] = TRANSSZ +# quirk[Firefox:Dialog] = FLOAT +# quirk[Gimp:gimp] = FLOAT + ANYWHERE +# quirk[XTerm:xterm] = XTERM_FONTADJ +# quirk[xine:Xine Window] = FLOAT + ANYWHERE +# quirk[Xitk:Xitk Combo] = FLOAT + ANYWHERE +# quirk[xine:xine Panel] = FLOAT + ANYWHERE +# quirk[Xitk:Xine Window] = FLOAT + ANYWHERE +# quirk[xine:xine Video Fullscreen Window] = FULLSCREEN + FLOAT +# quirk[pcb:pcb] = FLOAT + +# EXAMPLE: define firefox program and bind to key +# program[firefox] = firefox http://spectrwm.org/ +# bind[firefox] = MOD+Shift+b diff --git a/scrotwm_cz.conf b/spectrwm_cz.conf similarity index 100% rename from scrotwm_cz.conf rename to spectrwm_cz.conf diff --git a/scrotwm_es.1 b/spectrwm_es.1 similarity index 98% rename from scrotwm_es.1 rename to spectrwm_es.1 index 9ae026f..003487a 100644 --- a/scrotwm_es.1 +++ b/spectrwm_es.1 @@ -14,13 +14,13 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd $Mdocdate$ -.Dt SCROTWM 1 +.Dt SPECTRWM 1 .Os .Sh NOMBRE -.Nm scrotwm +.Nm spectrwm .Nd es un manejador de ventanas para X11 .Sh SYNOPSIS -.Nm scrotwm +.Nm spectrwm .Sh DESCRIPCIÓN .Nm es un manejador de ventanas super minimalista para X11. Intenta no superponer @@ -32,7 +32,7 @@ a ser peque Cuando .Nm inicia, lo primero que hace es leer el archivo de configuracion, -.Pa scrotwm.conf . +.Pa spectrwm.conf . Ver .Sx ARCHIVOS DE CONFIGURACIÓN . @@ -62,10 +62,10 @@ para las personalizaciones y configuraciones por defecto. .Sh ARCHIVOS DE CONFIGURACIÓN .Nm primero trata de abrir el archivo por defecto en el directorio del usuario, -.Pa ~/.scrotwm.conf . +.Pa ~/.spectrwm.conf . Si ese archivo no esta disponible, luego trata de abrir el archivo global de configuracion -.Pa /etc/scrotwm.conf . +.Pa /etc/spectrwm.conf . .Pp El formato del archivo es \*(Lttecla\*(Gt = \*(Ltconfiguracion\*(Gt. Por ejemplo: @@ -291,7 +291,7 @@ programa: .Pp Ejemplo: .Bd -literal -offset indent -program[ff] = /usr/local/bin/firefox http://scrotwm.com.ar/ +program[ff] = /usr/local/bin/firefox http://spectrwm.com.ar/ bind[ff] = Mod+f # Ahora Mod+F inicia firefox .Ed .Pp @@ -717,14 +717,14 @@ Todos los eventos _NET_MOVERESIZE_WINDOW recibido por las ventanas apiladas se i .Sh SIGNALS Enviando .Nm -una senal de HUP reinicia scrotwm. +una senal de HUP reinicia spectrwm. .Pp .Sh ARCHIVOS -.Bl -tag -width "/etc/scrotwm.confXXX" -compact -.It Pa ~/.scrotwm.conf +.Bl -tag -width "/etc/spectrwm.confXXX" -compact +.It Pa ~/.spectrwm.conf .Nm archivo de configuración especifico del usuario. -.It Pa /etc/scrotwm.conf +.It Pa /etc/spectrwm.conf .Nm configuraciones globales. .El diff --git a/scrotwm_es.conf b/spectrwm_es.conf similarity index 100% rename from scrotwm_es.conf rename to spectrwm_es.conf diff --git a/scrotwm_fr.conf b/spectrwm_fr.conf similarity index 100% rename from scrotwm_fr.conf rename to spectrwm_fr.conf diff --git a/scrotwm_fr_ch.conf b/spectrwm_fr_ch.conf similarity index 100% rename from scrotwm_fr_ch.conf rename to spectrwm_fr_ch.conf diff --git a/scrotwm_it.1 b/spectrwm_it.1 similarity index 98% rename from scrotwm_it.1 rename to spectrwm_it.1 index 5121be5..09d7356 100644 --- a/scrotwm_it.1 +++ b/spectrwm_it.1 @@ -14,13 +14,13 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd $Mdocdate: September 15 2011 $ -.Dt SCROTWM 1 +.Dt SPECTRWM 1 .Os .Sh NOME -.Nm scrotwm +.Nm spectrwm .Nd gestore di finestre per X11 .Sh SINTASSI -.Nm scrotwm +.Nm spectrwm .Sh DESCRIZIONE .Nm ? un gestore di finestre minimale che cerca di stare in disparte, in modo @@ -32,7 +32,7 @@ hacker per gli hacker e cerca di essere piccolo, compatto e veloce. Quando .Nm viene avviato, legge le impostazioni presenti nel file di configurazione -.Pa scrotwm.conf . +.Pa spectrwm.conf . Vedere la sezione .Sx FILE DI CONFIGURAZIONE pi? sotto. @@ -62,10 +62,10 @@ pi? sotto per i default e le possibilit? di personalizzazione. .Nm prova per prima cosa ad aprire il file di configurazione personale dell'utente, -.Pa ~/.scrotwm.conf . +.Pa ~/.spectrwm.conf . Se il file in questione non ? disponibile, prova ad usare il file di configurazione globale -.Pa /etc/scrotwm.conf . +.Pa /etc/spectrwm.conf . .Pp Il formato di questo file ? \*(Ltchiave\*(Gt = \*(Ltvalore\*(Gt. Per esempio: @@ -303,7 +303,7 @@ dove saranno sostituite con il valore al momento del lancio del programma: .Pp Esempio: .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+f # adesso Mod+F lancia firefox .Ed .Pp @@ -723,12 +723,12 @@ I messaggi _NET_MOVERESIZE_WINDOW vengono ignorati per le finestre stacked. .Nm inviandogli il segnale HUP. .Sh FILE -.Bl -tag -width "/etc/scrotwm.confXXX" -compact -.It Pa ~/.scrotwm.conf +.Bl -tag -width "/etc/spectrwm.confXXX" -compact +.It Pa ~/.spectrwm.conf impostazioni di .Nm dell'utente. -.It Pa /etc/scrotwm.conf +.It Pa /etc/spectrwm.conf impostazioni globali di .Nm . .El diff --git a/scrotwm_pt.1 b/spectrwm_pt.1 similarity index 98% rename from scrotwm_pt.1 rename to spectrwm_pt.1 index 4534ade..3249901 100644 --- a/scrotwm_pt.1 +++ b/spectrwm_pt.1 @@ -14,13 +14,13 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd $Mdocdate$ -.Dt SCROTWM 1 +.Dt SPECTRWM 1 .Os .Sh NOME -.Nm scrotwm +.Nm spectrwm .Nd gerenciador de janela para o X11 .Sh SINOPSE -.Nm scrotwm +.Nm spectrwm .Sh DESCRI\(,C\(~AO .Nm \('e um gerenciador de janela minimalista que tenta n\(~ao atrapalhar a @@ -34,7 +34,7 @@ r\('apido. Quando o .Nm inicia, ele l\(^e as configura\(,c\(~oes do seu arquivo de configura\(,c\(~ao, -.Pa scrotwm.conf . +.Pa spectrwm.conf . Veja a se\(,c\(~ao .Sx ARQUIVOS DE CONFIGURA\(,C\(~AO logo abaixo. @@ -63,10 +63,10 @@ logo abaixo para os defaults e as personaliza\(,c\(~oes. .Sh ARQUIVOS DE CONFIGURA\(,C\(~AO .Nm primeiro tenta abrir o arquivo de configura\(,c\(~ao no diret\('orio do usu\('ario, -.Pa ~/.scrotwm.conf . +.Pa ~/.spectrwm.conf . Se o arquivo n\(~ao estiver dispon\('ivel, ent\(~ao tenta abrir o arquivo de configura\(,c\(~ao global -.Pa /etc/scrotwm.conf . +.Pa /etc/spectrwm.conf . .Pp Assim \('e o formato do arquivo:\*(Ltpalavra-chave\*(Gt = \*(Ltconfigura\(,c\(~ao\*(Gt. Por exemplo: @@ -243,7 +243,7 @@ e ser\(~ao substitu\('idas pelos valores na hora em que o programa for executado .Pp Exemplo: .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+f # Agora Mod+F executa o firefox .Ed .Pp @@ -560,10 +560,10 @@ Enviar ao .Nm um sinal HUP far\('a com que o mesmo seja reiniciado. .Sh ARQUIVOS -.Bl -tag -width "/etc/scrotwm.confXXX" -compact -.It Pa ~/.scrotwm.conf +.Bl -tag -width "/etc/spectrwm.confXXX" -compact +.It Pa ~/.spectrwm.conf Configura\(,c\(~oes espec\('ificas do usu\('ario. -.It Pa /etc/scrotwm.conf +.It Pa /etc/spectrwm.conf Configura\(,c\(~oes globais. .El .Sh HIST\('ORIA diff --git a/scrotwm_ru.1 b/spectrwm_ru.1 similarity index 98% rename from scrotwm_ru.1 rename to spectrwm_ru.1 index 5925ff6..c65a21b 100644 --- a/scrotwm_ru.1 +++ b/spectrwm_ru.1 @@ -14,13 +14,13 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd $Mdocdate$ -.Dt SCROTWM 1 +.Dt SPECTRWM 1 .Os .Sh НАЗВАНИЕ -.Nm scrotwm +.Nm spectrwm .Nd Оконный менеджер для X11 .Sh ИСПОЛЬЗОВАНИЕ -.Nm scrotwm +.Nm spectrwm .Sh ОПИСАНИЕ .Nm это минималистичный менеджер окон, ставящий своей целью не мешать вам и не @@ -32,7 +32,7 @@ Когда .Nm запускается, он читает настройки из своего конфигурационного файла, -.Pa scrotwm.conf . +.Pa spectrwm.conf . Смотрите секцию .Sx КОНФИГУРАЦИОННЫЕ ФАЙЛЫ ниже. @@ -61,10 +61,10 @@ Shift .Sh КОНФИГУРАЦИОННЫЕ ФАЙЛЫ .Nm пытается прочитать файл в домашнем каталоге, -.Pa ~/.scrotwm.conf . +.Pa ~/.spectrwm.conf . В случае, если он недоступен, происходит обращение к глобальному файлу настроек, -.Pa /etc/scrotwm.conf . +.Pa /etc/spectrwm.conf . .Pp Формат файла следующий: \*(Ltключ\*(Gt = \*(Ltзначение\*(Gt. Например: @@ -223,7 +223,7 @@ dmenu_run \-fn $bar_font \-nb $bar_color \-nf $bar_font_color \-sb $bar_border \ .Pp Например: .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+f # Значит Mod+F запускает firefox .Ed .Pp @@ -446,7 +446,7 @@ bind[] = Mod1+q # снять все действия с Alt + q На одно действие можно назначить несколько комбинаций. .Sh КОСТЫЛИ .Nm -позволяет настроить костыли, нужные для специальной работы scrotwm +позволяет настроить костыли, нужные для специальной работы spectrwm с рядом приложений, который вы определяете сами. То есть, Вы можете принудительно установить способ тайлинга для какого-нибудь приложения .Pp @@ -531,11 +531,11 @@ WM_CLASS(STRING) = "Navigator", "Firefox" quirk[Firefox:Navigator] = FLOAT .Ed .Sh ФАЙЛЫ -.Bl -tag -width "/etc/scrotwm.confXXX" -compact -.It Pa ~/.scrotwm.conf +.Bl -tag -width "/etc/spectrwm.confXXX" -compact +.It Pa ~/.spectrwm.conf .Nm Личные настройки пользователя. -.It Pa /etc/scrotwm.conf +.It Pa /etc/spectrwm.conf .Nm Глобавльные настройки. .El diff --git a/scrotwm_se.conf b/spectrwm_se.conf similarity index 100% rename from scrotwm_se.conf rename to spectrwm_se.conf diff --git a/scrotwm_us.conf b/spectrwm_us.conf similarity index 100% rename from scrotwm_us.conf rename to spectrwm_us.conf diff --git a/version.h b/version.h index 83efea9..3cf35e5 100644 --- a/version.h +++ b/version.h @@ -15,18 +15,18 @@ */ -#ifndef SCROTWM_VERSION_H -#define SCROTWM_VERSION_H +#ifndef SPECTRWM_VERSION_H +#define SPECTRWM_VERSION_H -#define SCROTWM_STR(x) #x -#define SCROTWM_STRINGIZE(x) SCROTWM_STR(x) +#define SPECTRWM_STR(x) #x +#define SPECTRWM_STRINGIZE(x) SPECTRWM_STR(x) -#define SCROTWM_MAJOR 0 -#define SCROTWM_MINOR 11 -#define SCROTWM_PATCH 0 -#define SCROTWM_VERSION SCROTWM_STRINGIZE(SCROTWM_MAJOR) "." \ - SCROTWM_STRINGIZE(SCROTWM_MINOR) "." \ - SCROTWM_STRINGIZE(SCROTWM_PATCH) +#define SPECTRWM_MAJOR 0 +#define SPECTRWM_MINOR 11 +#define SPECTRWM_PATCH 0 +#define SPECTRWM_VERSION SPECTRWM_STRINGIZE(SPECTRWM_MAJOR) "." \ + SPECTRWM_STRINGIZE(SPECTRWM_MINOR) "." \ + SPECTRWM_STRINGIZE(SPECTRWM_PATCH) -#endif /* SCROTWM_VERSION_H */ +#endif /* SPECTRWM_VERSION_H */ -- 2.39.2