Permalink
Browse files

Merge https://github.com/c00kiemon5ter/monsterwm

Conflicts:
	Makefile
	config.def.h
	monsterwm.c
  • Loading branch information...
2 parents 3ad710a + d053c33 commit 2b149119ad14129ae8d219061e02f5b451fbd652 @Cloudef committed Apr 8, 2012
Showing with 100 additions and 84 deletions.
  1. +2 −2 Makefile
  2. +8 −8 config.def.h
  3. +4 −0 monsterwm.1
  4. +86 −74 monsterwm.c
View
@@ -11,10 +11,10 @@ INCS = -I.
LIBS = -lc `pkg-config --libs xcb xcb-icccm xcb-keysyms`
CPPFLAGS += -DVERSION=\"${VERSION}\" -DWMNAME=\"${WMNAME}\"
-CFLAGS += -std=c99 -pedantic -Wall -Wextra ${INCS} ${CPPFLAGS}
-LDFLAGS += ${LIBS}
DEBUG = 0
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Os ${INCS} ${CPPFLAGS} -DVERSION=\"${VERSION}\"
+LDFLAGS += -s ${LIBS}
EXEC = ${WMNAME}
View
@@ -53,14 +53,14 @@ static key keys[] = {
{ MOD1|SHIFT, XK_c, killclient, {NULL}},
{ MOD1, XK_j, next_win, {NULL}},
{ MOD1, XK_k, prev_win, {NULL}},
- { MOD1, XK_h, resize_master, {.i = -10}}, /* decrease */
- { MOD1, XK_l, resize_master, {.i = +10}}, /* increase */
- { MOD1, XK_o, resize_stack, {.i = -10}}, /* shrink */
- { MOD1, XK_p, resize_stack, {.i = +10}}, /* grow */
- { MOD1|CONTROL, XK_h, rotate, {.i = PREV}},
- { MOD1|CONTROL, XK_l, rotate, {.i = NEXT}},
- { MOD1|SHIFT, XK_h, rotate_filled, {.i = PREV}},
- { MOD1|SHIFT, XK_l, rotate_filled, {.i = NEXT}},
+ { MOD1, XK_h, resize_master, {.i = -10}}, /* decrease size in px */
+ { MOD1, XK_l, resize_master, {.i = +10}}, /* increase size in px */
+ { MOD1, XK_o, resize_stack, {.i = -10}}, /* shrink size in px */
+ { MOD1, XK_p, resize_stack, {.i = +10}}, /* grow size in px */
+ { MOD1|CONTROL, XK_h, rotate, {.i = -1}},
+ { MOD1|CONTROL, XK_l, rotate, {.i = +1}},
+ { MOD1|SHIFT, XK_h, rotate_filled, {.i = -1}},
+ { MOD1|SHIFT, XK_l, rotate_filled, {.i = +1}},
{ MOD1, XK_Tab, last_desktop, {NULL}},
{ MOD1, XK_Return, swap_master, {NULL}},
{ MOD1|SHIFT, XK_j, move_down, {NULL}},
View
@@ -85,6 +85,10 @@ Decrease master area size.
.B Mod1\-Return
Swaps the focused window to/from master area (tiled layouts only).
.TP
+.B Mod1\-Backspace
+Focus the window that raised an urgent hint. If no such window in current desktop,
+search other desktops, and focus the desktop and window that raised the urgent hint.
+.TP
.B Mod1\-Shift\-{Left,Right}
Rotate to the next/previous desktop
.TP
Oops, something went wrong.

0 comments on commit 2b14911

Please sign in to comment.