1 diff -Naur swm-1.3.4~/src/startswm ../src/startswm
2 --- swm-1.3.4~/src/startswm 2009-01-16 18:26:56.000000000 -0600
3 +++ ../src/startswm 2009-01-16 18:28:05.000000000 -0600
5 -swm >/tmp/swmlog 2>/tmp/swmlog &
6 -nautilus || coolicon &
7 -panel || rxvt || xterm
8 +swmbg /usr/share/swm/pixmaps/bg.xpm &
10 diff -Naur swm-1.3.4~/src/swm.conf ../src/swm.conf
11 --- swm-1.3.4~/src/swm.conf 2009-01-16 18:26:56.000000000 -0600
12 +++ ../src/swm.conf 2009-01-16 18:28:05.000000000 -0600
14 // GENERATED BY configure-swm, do not edit if you don't
15 // really know what you are doing.
16 -// This is SWM default configuration
17 +// This is SWM configuration
23 // #define NORESIZEWARP
26 #define NUMBEROFDESKTOPS 4
28 -#define TITLEBARFONT "*monotype-*-12*"
29 +#define TITLEBARFONT "*-Fixed-*-*-*-12-*"
33 diff -Naur swm-1.3.4~/swmbg/Makefile ../swmbg/Makefile
34 --- swm-1.3.4~/swmbg/Makefile 2009-01-16 18:26:56.000000000 -0600
35 +++ ../swmbg/Makefile 2009-01-16 18:28:05.000000000 -0600
40 # There should be nothing to edit below this line
41 # -----------------------------------------------------------------------------
42 diff -Naur swm-1.3.4~/swmswitch/Makefile ../swmswitch/Makefile
43 --- swm-1.3.4~/swmswitch/Makefile 2009-01-16 18:26:56.000000000 -0600
44 +++ ../swmswitch/Makefile 2009-01-16 18:28:05.000000000 -0600
49 # There should be nothing to edit below this line
50 # -----------------------------------------------------------------------------
51 diff -Naur swm-1.3.4~/swmtheme ../swmtheme
52 --- swm-1.3.4~/swmtheme 1969-12-31 18:00:00.000000000 -0600
53 +++ ../swmtheme 2009-01-16 18:27:56.000000000 -0600
57 +# sWM theme changer for Arch Linux
58 +# Tim Yang <tdy@gmx.com>
60 +# Usage: swmtheme <theme name>
61 +# Use the --list flag to show currently installed themes
62 +# Themes must be located in /usr/share/swm/themes
63 +# Root privileges are required to switch themes
64 +# Changes will only take effect upon the next session
68 +. /etc/rc.d/functions
73 +SWM_PATH=/usr/share/swm
82 + printf "${C_H2}${PREFIX_HL} ${C_MAIN}$1${C_CLEAR}\n"
86 + printf "${C_FAIL}${PREFIX_HL} ${C_MAIN}$1${C_CLEAR}\n"
90 + printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}Changing sWM theme... "
91 + install -m644 $SWM_PATH/themes/$1/*.xpm $SWM_PATH/pixmaps
92 + printf "${C_BKGD}$1${C_CLEAR}"
97 + printhl2 "Usage: swmtheme <theme name>"
101 + _rootmsg="Root privileges are required to switch themes"
102 + [ -z "$1" ] && printhl2 "$_rootmsg" || printhl2f "$_rootmsg"
107 + printhl2 "Use the --list flag to show currently installed themes"
108 + printhl2 "Themes must be located in $SWM_PATH/themes"
110 + printhl2 "Changes will only take effect upon the next session"
115 + printhl2f "${C_BKGD}$1 ${C_MAIN}must be located in $SWM_PATH/themes"
119 + printhl2 "Currently installed themes:"
120 + ls -1 $SWM_PATH/themes
125 +if [ $# -ne 1 ]; then
128 +elif [ "--help" = "$NEW_THEME" -o "-h" = "$NEW_THEME" ]; then
131 +elif [ "--list" = "$NEW_THEME" -o "-l" = "$NEW_THEME" ]; then
134 +elif [ ! -d "$SWM_PATH/themes/$NEW_THEME" ]; then
135 + swm_notheme $NEW_THEME
137 +elif [ "$UID" -ne "$ROOT_UID" ]; then
142 +swm_theme $NEW_THEME
144 diff -Naur swm-1.3.4~/examples/.swm/button1 ../examples/.swm/button1
145 --- swm-1.3.4~/examples/.swm/button1 2009-01-16 18:26:56.000000000 -0600
146 +++ ../examples/.swm/button1 2009-01-16 18:28:05.000000000 -0600
150 diff -Naur swm-1.3.4~/examples/.swm/button2 ../examples/.swm/button2
151 --- swm-1.3.4~/examples/.swm/button2 2009-01-16 18:26:56.000000000 -0600
152 +++ ../examples/.swm/button2 2009-01-16 18:28:05.000000000 -0600
154 -# execute what ever you like
157 diff -Naur swm-1.3.4~/examples/.swm/button3 ../examples/.swm/button3
158 --- swm-1.3.4~/examples/.swm/button3 2009-01-16 18:26:56.000000000 -0600
159 +++ ../examples/.swm/button3 2009-01-16 18:28:05.000000000 -0600
164 diff -Naur swm-1.3.4~/examples/gnome/wm-properties/sWM.desktop ../examples/gnome/wm-properties/sWM.desktop
165 --- swm-1.3.4~/examples/gnome/wm-properties/sWM.desktop 2009-01-16 18:26:56.000000000 -0600
166 +++ ../examples/gnome/wm-properties/sWM.desktop 2009-01-16 18:28:05.000000000 -0600
194 +Comment=A small window manager with a low memory footprint
195 +TryExec=/usr/bin/swm
200 -SessionManaged=false
202 diff -Naur swm-1.3.4~/src/Makefile ../src/Makefile
203 --- swm-1.3.4~/src/Makefile 2009-01-16 18:26:56.000000000 -0600
204 +++ ../src/Makefile 2009-01-16 18:32:07.000000000 -0600
207 - # Please use configure-swm to configure before doing make.
208 \ No newline at end of file
210 +# Makefile for Arch Linux
214 +INST_BIN = $(INST) -m 0755
215 +INST_DAT = $(INST) -m 0644
216 +INST_DIR = $(INST_BIN) -d
220 +LDFLAGS = -g -s -pipe
225 +INCLPATH = -I$(PREFIX)/include
226 +LDPATH = -L$(PREFIX)/lib
228 +BINDIR = $(PREFIX)/bin
230 +DATADIR = $(PREFIX)/share
231 +MANDIR = $(DATADIR)/man
232 +DOCDIR = $(DATADIR)/doc/swm
233 +PIXMAPDIR= $(DATADIR)/swm
235 +THEMES = colors dots mozilla msn whistling xp-blue xp-silver
237 +HEADERS = swm.h eventHandler.c gnome.c init.c client.c tools.c
240 +all: clean swm swmswitch swmbg
244 + $(CC) $(LDFLAGS) $(DEFINES) $(LDPATH) -lX11 -lXpm $(OBJS) -o $@
247 + @cd ../swmswitch && $(MAKE) XROOT=$(PREFIX)
250 + @cd ../swmbg && $(MAKE) XROOT=$(PREFIX)
252 +$(OBJS): %.o: %.c $(HEADERS)
253 + $(CC) -c $(CFLAGS) $(DEFINES) $(INCLPATH) $<
255 +install: install-dirs
256 + @echo "Installing executables..."
257 + @$(INST_BIN) swm $(DESTDIR)$(BINDIR)
258 + @$(INST_BIN) startswm $(DESTDIR)$(BINDIR)
259 + @$(INST_BIN) ../swmswitch/swmswitch $(DESTDIR)$(BINDIR)
260 + @$(INST_BIN) ../swmbg/swmbg $(DESTDIR)$(BINDIR)
261 + @$(INST_BIN) ../swmtheme $(DESTDIR)$(BINDIR)
262 + @echo "Installing manual pages..."
263 + @$(INST_DAT) *.1x $(DESTDIR)$(MANDIR)/man1
264 + @$(INST_DAT) ../swmswitch/*.1x $(DESTDIR)$(MANDIR)/man1
265 + @$(INST_DAT) ../swmbg/*.1x $(DESTDIR)$(MANDIR)/man1
266 + @echo "Installing pixmaps..."
267 + @$(INST_DAT) ../swmbg/pixmaps/bg.xpm $(DESTDIR)$(PIXMAPDIR)/pixmaps
268 + @$(INST_DAT) ../share/swm/pixmaps/*.xpm $(DESTDIR)$(PIXMAPDIR)/pixmaps
269 + @$(INST_DAT) ../share/swm/pixmaps/*.xpm $(DESTDIR)$(PIXMAPDIR)/themes/default
270 + @$(SYM_LINK) $(PIXMAPDIR)/pixmaps/bg.xpm $(DESTDIR)$(DATADIR)/pixmaps/swm.xpm
271 + @for th in $(THEMES); do \
272 + $(INST_DAT) ../../themes/$$th/* $(DESTDIR)$(PIXMAPDIR)/themes/$$th; \
274 + @find $(DESTDIR) -type f -name '*.xpm' \
275 + -exec sed -i 's/static char/static const char/' {} \;
276 + @echo "Installing documentation..."
277 + @$(INST_DAT) ../doc/SWM-FAQ $(DESTDIR)$(DOCDIR)/FAQ
278 + @$(INST_DAT) ../doc/AUTHORS $(DESTDIR)$(DOCDIR)/AUTHORS
279 + @$(INST_DAT) ../doc/changelog $(DESTDIR)$(DOCDIR)/CHANGELOG
280 + @$(INST_DAT) ../swmswitch/README $(DESTDIR)$(DOCDIR)/SWMSWITCH
281 + @$(INST_DAT) ../swmbg/README.swmbg $(DESTDIR)$(DOCDIR)/SWMBG
282 + @echo "Installing data files..."
283 + @$(INST_DAT) ../examples/gnome/wm-properties/sWM.desktop \
284 + $(DESTDIR)$(CONFDIR)/X11/sessions
285 + @$(INST_BIN) ../examples/.swm/button* $(DESTDIR)$(CONFDIR)/xdg/swm
288 + @echo "Installing directories under $(DESTDIR)..."
289 + @$(INST_DIR) $(DESTDIR)$(BINDIR)
290 + @$(INST_DIR) $(DESTDIR)$(CONFDIR)/{xdg/swm,X11/sessions}
291 + @$(INST_DIR) $(DESTDIR)$(PIXMAPDIR)/pixmaps
292 + @for th in $(THEMES) default; do \
293 + $(INST_DIR) $(DESTDIR)$(PIXMAPDIR)/themes/$$th; \
295 + @$(INST_DIR) $(DESTDIR)$(DATADIR)/pixmaps
296 + @$(INST_DIR) $(DESTDIR)$(MANDIR)/man1
297 + @$(INST_DIR) $(DESTDIR)$(DOCDIR)
300 + rm -f *~ swm core *.o $(OBJS)
302 +.PHONY: all swmswitch swmbg install install-dirs clean