diff options
| -rw-r--r-- | config.default.h | 34 | ||||
| -rw-r--r-- | dwm.1 | 76 | ||||
| -rw-r--r-- | main.c | 3 |
3 files changed, 60 insertions, 53 deletions
diff --git a/config.default.h b/config.default.h index 44f0daf..9d99794 100644 --- a/config.default.h +++ b/config.default.h @@ -18,34 +18,34 @@ const char *tags[] = { "0", "1", "2", "3", "4", NULL }; #define KEYS \ static Key key[] = { \ /* modifier key function arguments */ \ - { MODKEY, XK_0, view, { .i = 0 } }, \ - { MODKEY, XK_1, view, { .i = 1 } }, \ - { MODKEY, XK_2, view, { .i = 2 } }, \ - { MODKEY, XK_3, view, { .i = 3 } }, \ - { MODKEY, XK_4, view, { .i = 4 } }, \ - { MODKEY, XK_j, focusnext, { 0 } }, \ - { MODKEY, XK_k, focusprev, { 0 } }, \ - { MODKEY, XK_m, togglemax, { 0 } }, \ - { MODKEY, XK_space, togglemode, { 0 } }, \ + { MODKEY|ShiftMask, XK_Return, spawn, { .cmd = "exec xterm" } }, \ + { MODKEY, XK_Tab, focusnext, { 0 } }, \ + { MODKEY|ShiftMask, XK_Tab, focusprev, { 0 } }, \ { MODKEY, XK_Return, zoom, { 0 } }, \ - { MODKEY|ControlMask, XK_0, toggleview, { .i = 0 } }, \ - { MODKEY|ControlMask, XK_1, toggleview, { .i = 1 } }, \ - { MODKEY|ControlMask, XK_2, toggleview, { .i = 2 } }, \ - { MODKEY|ControlMask, XK_3, toggleview, { .i = 3 } }, \ - { MODKEY|ControlMask, XK_4, toggleview, { .i = 4 } }, \ + { MODKEY, XK_m, togglemax, { 0 } }, \ { MODKEY|ShiftMask, XK_0, tag, { .i = 0 } }, \ { MODKEY|ShiftMask, XK_1, tag, { .i = 1 } }, \ { MODKEY|ShiftMask, XK_2, tag, { .i = 2 } }, \ { MODKEY|ShiftMask, XK_3, tag, { .i = 3 } }, \ { MODKEY|ShiftMask, XK_4, tag, { .i = 4 } }, \ - { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, \ - { MODKEY|ShiftMask, XK_q, quit, { 0 } }, \ - { MODKEY|ShiftMask, XK_Return, spawn, { .cmd = "exec xterm" } }, \ { MODKEY|ControlMask|ShiftMask, XK_0, toggletag, { .i = 0 } }, \ { MODKEY|ControlMask|ShiftMask, XK_1, toggletag, { .i = 1 } }, \ { MODKEY|ControlMask|ShiftMask, XK_2, toggletag, { .i = 2 } }, \ { MODKEY|ControlMask|ShiftMask, XK_3, toggletag, { .i = 3 } }, \ { MODKEY|ControlMask|ShiftMask, XK_4, toggletag, { .i = 4 } }, \ + { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, \ + { MODKEY, XK_space, togglemode, { 0 } }, \ + { MODKEY, XK_0, view, { .i = 0 } }, \ + { MODKEY, XK_1, view, { .i = 1 } }, \ + { MODKEY, XK_2, view, { .i = 2 } }, \ + { MODKEY, XK_3, view, { .i = 3 } }, \ + { MODKEY, XK_4, view, { .i = 4 } }, \ + { MODKEY|ControlMask, XK_0, toggleview, { .i = 0 } }, \ + { MODKEY|ControlMask, XK_1, toggleview, { .i = 1 } }, \ + { MODKEY|ControlMask, XK_2, toggleview, { .i = 2 } }, \ + { MODKEY|ControlMask, XK_3, toggleview, { .i = 3 } }, \ + { MODKEY|ControlMask, XK_4, toggleview, { .i = 4 } }, \ + { MODKEY|ShiftMask, XK_q, quit, { 0 } }, \ }; #define RULES \ diff --git a/dwm.1 b/dwm.1 index c653b99..46f0d94 100644 --- a/dwm.1 +++ b/dwm.1 @@ -46,83 +46,91 @@ click on a tag label adds/removes all windows with that to/from the view. .SS Keyboard commands .TP -.B Mod1-Return -Zoom current -.B window -to the -.B master -column. +.B Mod1-Shift-Return +Start +.BR xterm (1). .TP -.B Mod1-j +.B Mod1-Tab Focus next .BR window . .TP -.B Mod1-k +.B Mod1-Shift-Tab Focus previous .BR window . .TP +.B Mod1-Return +Zoom current +.B window +to the +.B master +column +.RB ( tiling +mode only). +.TP .B Mod1-m Maximize current .BR window . .TP -.B Mod1-[0..n] -View all windows with -.BR "tag n" . -.TP -.B Mod1-space -Toggle between -.B tiled -and -.B floating -mode (affects -.BR "all windows" ). -.TP .B Mod1-Shift-[0..n] Apply .B nth tag to current .BR window . .TP +.B Mod1-Control-Shift-[0..n] +Add/remove +.B nth tag +to/from current +.BR window . +.TP .B Mod1-Shift-c Close focused .B window. .TP -.B Mod1-Shift-q -Quit -.B dwm. +.B Mod1-space +Toggle between +.B tiled +and +.B floating +mode (affects +.BR "all windows" ). .TP -.B Mod1-Shift-Return -Start -.BR terminal . +.B Mod1-[0..n] +View all windows with +.BR "tag n" . .TP .B Mod1-Control-[0..n] Add/remove all windows with .B tag n to/from the view. .TP -.B Mod1-Control-Shift-[0..n] -Add/remove -.B nth tag -to/from current -.BR window . +.B Mod1-Shift-q +Quit +.B dwm. .SS Mouse commands .TP .B Mod1-Button1 Move current .B window -while dragging. +while dragging +.RB ( floating +mode only). .TP .B Mod1-Button2 Zoom current .B window to the .B master -column. +column +.RB ( tiling +mode only). .TP .B Mod1-Button3 Resize current .B window -while dragging. +while dragging +.RB ( floating +mode only). .SH CUSTOMIZATION .B dwm is customized by creating a custom config.h and (re)compiling the source diff --git a/main.c b/main.c index b348598..d0048be 100644 --- a/main.c +++ b/main.c @@ -291,9 +291,8 @@ main(int argc, char *argv[]) strcpy(stext, "broken pipe"); drawstatus(); } - if(FD_ISSET(xfd, &rd)) - procevent(); } + procevent(); } cleanup(); XCloseDisplay(dpy); |