aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile26
-rw-r--r--README.md24
-rw-r--r--config.def.h2
-rw-r--r--config.h2
-rw-r--r--monsterwm.c (renamed from dminiwm.c)6
6 files changed, 28 insertions, 34 deletions
diff --git a/.gitignore b/.gitignore
index 244dcdc..56613e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-dminiwm
+monsterwm
*.o
*.swp
*~
diff --git a/Makefile b/Makefile
index 887817a..48f4979 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,5 @@
VERSION = cookies-git
-
-CFLAGS += -Wall
-LDADD += -lX11
-LDFLAGS =
-EXEC = dminiwm
+WMNAME = monsterwm
PREFIX ?= /usr/local
BINDIR ?= ${PREFIX}/bin
@@ -18,17 +14,17 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
CPPFLAGS = -DVERSION=\"${VERSION}\"
CFLAGS = -g -std=c99 -pedantic -Wall -Wextra -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -g ${LIBS}
-#$(CC) $(LDFLAGS) -s -Os -o $@ $+ $(LDADD)
-CC = cc
+CC = cc
+EXEC = ${WMNAME}
-SRC = dminiwm.c
+SRC = ${WMNAME}.c
OBJ = ${SRC:.c=.o}
-all: options dminiwm
+all: options ${WMNAME}
options:
- @echo dminiwm build options:
+ @echo ${WMNAME} build options:
@echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}"
@@ -43,22 +39,22 @@ config.h:
@echo creating $@ from config.def.h
@cp config.def.h $@
-dminiwm: ${OBJ}
+monsterwm: ${OBJ}
@echo CC -o $@
@${CC} -o $@ ${OBJ} ${LDFLAGS}
clean:
@echo cleaning
- @rm -fv dminiwm ${OBJ} dminiwm-${VERSION}.tar.gz
+ @rm -fv ${WMNAME} ${OBJ} ${WMNAME}-${VERSION}.tar.gz
install: all
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${PREFIX}/bin
- @cp -f dminiwm ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/dminiwm
+ @cp -f ${WMNAME} ${DESTDIR}${PREFIX}/bin
+ @chmod 755 ${DESTDIR}${PREFIX}/bin/${WMNAME}
uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
- @rm -f ${DESTDIR}${PREFIX}/bin/dminiwm
+ @rm -f ${DESTDIR}${PREFIX}/bin/${WMNAME}
.PHONY: all options clean install uninstall
diff --git a/README.md b/README.md
index aef6275..91f8a89 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,30 @@
-dminiwm
-=======
+monsterwm
+=========
### ~ it's minimal and dynamic
-[moetunes][] started this from [catwm][] 31/12/10 ([ArchLinux forums][catf])
-Credits and licensing included in `dminiwm.c` and/or `config.def.h`.
+[moetunes][] started this based on [catwm][] 31/12/10 ([ArchLinux forums][catf]) creating [dminiwm][]
+Credits and licensing included in `monsterwm.c` and/or `config.def.h`.
For screenshots and ramblings/updates check [the topic on ArchLinux forums][dminif]
[moetunes]: https://github.com/moetunes
[catwm]: https://github.com/pyknite/catwm
[catf]: https://bbs.archlinux.org/viewtopic.php?id=100215&p=1
+ [dminiwm]: https://github.com/moetunes/dminiwm
[dminif]: https://bbs.archlinux.org/viewtopic.php?id=126463
Summary
-------
-**dminiwm** is a very minimal and lightweight dynamic tiling window manager.
-It will try to stay under 1000 SLOC.
-Currently under 800 lines with the config file included.
-
+**monsterwm** is a very minimal, lightweight, monsterous, dynamic tiling window manager.
+It will try to stay as small as possible. Currently under 750 lines with the config file included.
Modes
-----
It allows the "normal" method of tiling window managers (with the new window as the master)
-and with the new window opened at the bottom of the stack (like dwm's attach\_aside)
+and with the new window opened at the bottom of the stack (like `dwm`'s attach\_aside)
---
@@ -97,9 +96,8 @@ Build and install.
Bugs
----
-For any issues report at [the topic on ArchLinux forums][dminif],
-or [fill an issue][bug] on [GitHub][ghp]
+For any bug or request [fill an issue][bug] on [GitHub][ghp]
- [bug]: https://github.com/c00kiemon5ter/dminiwm/issues
- [ghp]: https://github.com/c00kiemon5ter/dminiwm
+ [bug]: https://github.com/c00kiemon5ter/monsterwm/issues
+ [ghp]: https://github.com/c00kiemon5ter/monsterwm
diff --git a/config.def.h b/config.def.h
index 62ed754..7e50930 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,6 +1,6 @@
/* Based on:
* - catwm at https://github.com/pyknite/catwm
- * - 2wm at http://hg.suckless.org/2wm/
+ * - dminiwm at https://github.com/moetunes/dminiwm
* - dwm at http://dwm.suckless.org/
*
* This program is free software: you can redistribute it and/or modify
diff --git a/config.h b/config.h
index e66e38f..2bc37a1 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
/* Based on:
* - catwm at https://github.com/pyknite/catwm
- * - 2wm at http://hg.suckless.org/2wm/
+ * - dminiwm at https://github.com/moetunes/dminiwm
* - dwm at http://dwm.suckless.org/
*
* This program is free software: you can redistribute it and/or modify
diff --git a/dminiwm.c b/monsterwm.c
index a194d9a..474bf22 100644
--- a/dminiwm.c
+++ b/monsterwm.c
@@ -1,6 +1,6 @@
/* Based on:
* - catwm at https://github.com/pyknite/catwm
- * - 2wm at http://hg.suckless.org/2wm/
+ * - dminiwm at https://github.com/moetunes/dminiwm
* - dwm at http://dwm.suckless.org/
*
* This program is free software: you can redistribute it and/or modify
@@ -779,10 +779,10 @@ void die(const char *errstr, ...) {
int main(int argc, char *argv[]) {
if(argc == 2 && strcmp("-v", argv[1]) == 0) {
- fprintf(stdout, "dminiwm-%s\n", VERSION);
+ fprintf(stdout, "monsterwm-%s\n", VERSION);
return EXIT_SUCCESS;
} else if(argc != 1)
- die("usage: dminiwm [-v]\n");
+ die("usage: monsterwm [-v]\n");
if(!(dis = XOpenDisplay(NULL)))
die("error: cannot open display\n");
setup();