| blob | 3defec2c2d0e54b59ab27a5c1bf97e0e67bdc736 |
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
4 @@ -1,3 +1,2 @@
5 -swm >/tmp/swmlog 2>/tmp/swmlog &
6 -nautilus || coolicon &
7 -panel || rxvt || xterm
8 +swmbg /usr/share/swm/pixmaps/bg.xpm &
9 +swm &> /tmp/swmlog
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
13 @@ -1,7 +1,9 @@
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
19 +#define SHOWLAYERS
20 +#define KEYRAISE
21 #define SIGNALS
22 #define CURSORS
23 // #define NORESIZEWARP
24 @@ -20,7 +22,7 @@
25 #define STD_IO
26 #define NUMBEROFDESKTOPS 4
27 #define FONTS
28 -#define TITLEBARFONT "*monotype-*-12*"
29 +#define TITLEBARFONT "*-Fixed-*-*-*-12-*"
30 #define LAYERS
31 #define MAXIMIZE
32 #define SHADE
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
36 @@ -1,4 +1,4 @@
37 -CFLAGS = -O3 -Wall
38 +CFLAGS += -Wall
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
45 @@ -1,4 +1,4 @@
46 -CFLAGS = -O3 -Wall
47 +CFLAGS += -Wall
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
54 @@ -0,0 +1,89 @@
55 +#!/bin/bash
56 +#
57 +# sWM theme changer for Arch Linux
58 +# Tim Yang <tdy@gmx.com>
59 +#
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
65 +#
66 +
67 +. /etc/rc.conf
68 +. /etc/rc.d/functions
69 +
70 +### Variables ###
71 +
72 +NEW_THEME=$1
73 +SWM_PATH=/usr/share/swm
74 +ROOT_UID=0
75 +E_BADPARAMS=65
76 +E_BADTHEME=66
77 +E_NOTROOT=67
78 +
79 +### Functions ###
80 +
81 +printhl2() {
82 + printf "${C_H2}${PREFIX_HL} ${C_MAIN}$1${C_CLEAR}\n"
83 +}
84 +
85 +printhl2f() {
86 + printf "${C_FAIL}${PREFIX_HL} ${C_MAIN}$1${C_CLEAR}\n"
87 +}
88 +
89 +swm_theme() {
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}"
93 + stat_done
94 +}
95 +
96 +swm_usage() {
97 + printhl2 "Usage: swmtheme <theme name>"
98 +}
99 +
100 +swm_root() {
101 + _rootmsg="Root privileges are required to switch themes"
102 + [ -z "$1" ] && printhl2 "$_rootmsg" || printhl2f "$_rootmsg"
103 +}
104 +
105 +swm_help() {
106 + swm_usage
107 + printhl2 "Use the --list flag to show currently installed themes"
108 + printhl2 "Themes must be located in $SWM_PATH/themes"
109 + swm_root
110 + printhl2 "Changes will only take effect upon the next session"
111 +}
112 +
113 +swm_notheme() {
114 + swm_usage
115 + printhl2f "${C_BKGD}$1 ${C_MAIN}must be located in $SWM_PATH/themes"
116 +}
117 +
118 +swm_list() {
119 + printhl2 "Currently installed themes:"
120 + ls -1 $SWM_PATH/themes
121 +}
122 +
123 +### Main ###
124 +
125 +if [ $# -ne 1 ]; then
126 + swm_usage
127 + exit $E_BADPARAMS
128 +elif [ "--help" = "$NEW_THEME" -o "-h" = "$NEW_THEME" ]; then
129 + swm_help
130 + exit $?
131 +elif [ "--list" = "$NEW_THEME" -o "-l" = "$NEW_THEME" ]; then
132 + swm_list
133 + exit $?
134 +elif [ ! -d "$SWM_PATH/themes/$NEW_THEME" ]; then
135 + swm_notheme $NEW_THEME
136 + exit $E_BADTHEME
137 +elif [ "$UID" -ne "$ROOT_UID" ]; then
138 + swm_root 0
139 + exit $E_NOTROOT
140 +fi
141 +
142 +swm_theme $NEW_THEME
143 +exit $?
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
147 @@ -1 +1 @@
148 -rxvt
149 +# <L-click> action
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
153 @@ -1 +1,2 @@
154 -# execute what ever you like
155 +# <M-click> action
156 +swmswitch
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
160 @@ -1 +1,2 @@
161 -swmswitch
162 +# <R-click> action
163 +xterm
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
167 @@ -1,29 +1,8 @@
168 [Desktop Entry]
169 +Version=1.0
170 +Type=Application
171 Name=sWM
172 -Name[az]=sWM
173 -Name[ca]=sWM
174 -Name[da]=sWM
175 -Name[de]=sWM
176 -Name[es]=sWM
177 -Name[fi]=sWM
178 -Name[fr]=sWM
179 -Name[gl]=sWM
180 -Name[hu]=sWM
181 -Name[ja]=sWM
182 -Name[ko]=sWM
183 -Name[no]=sWM
184 -Name[pl]=sWM
185 -Name[ro]=sWM
186 -Name[ru]=sWM
187 -Name[sk]=sWM
188 -Name[sl]=sWM
189 -Name[sv]=sWM
190 -Name[tr]=sWM
191 -Name[uk]=sWM
192 -Name[wa]=sWM
193 -Name[zh_TW]=sWM
194 +Comment=A small window manager with a low memory footprint
195 +TryExec=/usr/bin/swm
196 Exec=swm
197 -TryExec=swm
198 -
199 -[Window Manager]
200 -SessionManaged=false
201 +Icon=swm.xpm
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
205 @@ -1,2 +1,94 @@
206 -all:
207 - # Please use configure-swm to configure before doing make.
208 \ No newline at end of file
209 +#
210 +# Makefile for Arch Linux
211 +#
212 +
213 +INST = install
214 +INST_BIN = $(INST) -m 0755
215 +INST_DAT = $(INST) -m 0644
216 +INST_DIR = $(INST_BIN) -d
217 +SYM_LINK = ln -sf
218 +
219 +CFLAGS = -g -s -O3
220 +LDFLAGS = -g -s -pipe
221 +
222 +CC = gcc
223 +
224 +PREFIX = /usr
225 +INCLPATH = -I$(PREFIX)/include
226 +LDPATH = -L$(PREFIX)/lib
227 +
228 +BINDIR = $(PREFIX)/bin
229 +CONFDIR = /etc
230 +DATADIR = $(PREFIX)/share
231 +MANDIR = $(DATADIR)/man
232 +DOCDIR = $(DATADIR)/doc/swm
233 +PIXMAPDIR= $(DATADIR)/swm
234 +
235 +THEMES = colors dots mozilla msn whistling xp-blue xp-silver
236 +
237 +HEADERS = swm.h eventHandler.c gnome.c init.c client.c tools.c
238 +OBJS = swm.o
239 +
240 +all: clean swm swmswitch swmbg
241 + rm -f *.o
242 +
243 +swm: $(OBJS)
244 + $(CC) $(LDFLAGS) $(DEFINES) $(LDPATH) -lX11 -lXpm $(OBJS) -o $@
245 +
246 +swmswitch:
247 + @cd ../swmswitch && $(MAKE) XROOT=$(PREFIX)
248 +
249 +swmbg:
250 + @cd ../swmbg && $(MAKE) XROOT=$(PREFIX)
251 +
252 +$(OBJS): %.o: %.c $(HEADERS)
253 + $(CC) -c $(CFLAGS) $(DEFINES) $(INCLPATH) $<
254 +
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; \
273 + done
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
286 +
287 +install-dirs:
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; \
294 + done
295 + @$(INST_DIR) $(DESTDIR)$(DATADIR)/pixmaps
296 + @$(INST_DIR) $(DESTDIR)$(MANDIR)/man1
297 + @$(INST_DIR) $(DESTDIR)$(DOCDIR)
298 +
299 +clean:
300 + rm -f *~ swm core *.o $(OBJS)
301 +
302 +.PHONY: all swmswitch swmbg install install-dirs clean