removed viewnext/viewprev
4cb78a17
6 file(s) · +9 −65
| 22 | 22 | { MODKEY, XK_1, view, { .i = 0 } }, \ |
|
| 23 | 23 | { MODKEY, XK_2, view, { .i = 1 } }, \ |
|
| 24 | 24 | { MODKEY, XK_3, view, { .i = 2 } }, \ |
|
| 25 | - | { MODKEY, XK_h, viewprev, { 0 } }, \ |
|
| 26 | 25 | { MODKEY, XK_j, focusnext, { 0 } }, \ |
|
| 27 | 26 | { MODKEY, XK_k, focusprev, { 0 } }, \ |
|
| 28 | - | { MODKEY, XK_l, viewnext, { 0 } }, \ |
|
| 29 | 27 | { MODKEY, XK_m, togglemax, { 0 } }, \ |
|
| 30 | 28 | { MODKEY, XK_p, spawn, \ |
|
| 31 | 29 | { .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | " \ |
| 24 | 24 | { MODKEY, XK_2, view, { .i = 2 } }, \ |
|
| 25 | 25 | { MODKEY, XK_3, view, { .i = 3 } }, \ |
|
| 26 | 26 | { MODKEY, XK_4, view, { .i = 4 } }, \ |
|
| 27 | - | { MODKEY, XK_h, viewprev, { 0 } }, \ |
|
| 28 | 27 | { MODKEY, XK_j, focusnext, { 0 } }, \ |
|
| 29 | 28 | { MODKEY, XK_k, focusprev, { 0 } }, \ |
|
| 30 | - | { MODKEY, XK_l, viewnext, { 0 } }, \ |
|
| 31 | 29 | { MODKEY, XK_m, togglemax, { 0 } }, \ |
|
| 32 | 30 | { MODKEY, XK_space, togglemode, { 0 } }, \ |
|
| 33 | 31 | { MODKEY, XK_Return, zoom, { 0 } }, \ |
| 43 | 43 | .B Button2 |
|
| 44 | 44 | click on a tag label toggles that |
|
| 45 | 45 | .B tag. |
|
| 46 | - | .TP |
|
| 47 | - | .B Button[1,4] |
|
| 48 | - | click on the bar focuses the previous |
|
| 49 | - | .B tag. |
|
| 50 | - | .TP |
|
| 51 | - | .B Button[2,5] |
|
| 52 | - | click on the bar focuses the next |
|
| 53 | - | .B tag. |
|
| 54 | 46 | .SS Keyboard commands |
|
| 55 | 47 | .TP |
|
| 56 | 48 | .B Mod1-Return |
|
| 60 | 52 | .B master |
|
| 61 | 53 | column. |
|
| 62 | 54 | .TP |
|
| 63 | - | .B Mod1-h |
|
| 64 | - | Focus previous |
|
| 65 | - | .B tag. |
|
| 66 | - | .TP |
|
| 67 | 55 | .B Mod1-j |
|
| 68 | 56 | Focus next |
|
| 69 | 57 | .B window. |
|
| 71 | 59 | .B Mod1-k |
|
| 72 | 60 | Focus previous |
|
| 73 | 61 | .B window. |
|
| 74 | - | .TP |
|
| 75 | - | .B Mod1-l |
|
| 76 | - | Focus next |
|
| 77 | - | .B tag. |
|
| 78 | 62 | .TP |
|
| 79 | 63 | .B Mod1-m |
|
| 80 | 64 | Maximize current |
|
| 129 | 129 | extern void togglemode(Arg *arg); |
|
| 130 | 130 | extern void view(Arg *arg); |
|
| 131 | 131 | extern void toggleview(Arg *arg); |
|
| 132 | - | extern void viewnext(Arg *arg); |
|
| 133 | - | extern void viewprev(Arg *arg); |
|
| 134 | 132 | ||
| 135 | 133 | /* util.c */ |
|
| 136 | 134 | extern void *emallocz(unsigned int size); |
| 102 | 102 | XButtonPressedEvent *ev = &e->xbutton; |
|
| 103 | 103 | ||
| 104 | 104 | if(barwin == ev->window) { |
|
| 105 | - | switch(ev->button) { |
|
| 106 | - | default: |
|
| 107 | - | x = 0; |
|
| 108 | - | for(a.i = 0; a.i < ntags; a.i++) { |
|
| 109 | - | x += textw(tags[a.i]); |
|
| 110 | - | if(ev->x < x) { |
|
| 111 | - | if(ev->button == Button3) |
|
| 112 | - | toggleview(&a); |
|
| 113 | - | else |
|
| 114 | - | view(&a); |
|
| 115 | - | return; |
|
| 116 | - | } |
|
| 105 | + | x = 0; |
|
| 106 | + | for(a.i = 0; a.i < ntags; a.i++) { |
|
| 107 | + | x += textw(tags[a.i]); |
|
| 108 | + | if(ev->x < x) { |
|
| 109 | + | if(ev->button == Button3) |
|
| 110 | + | toggleview(&a); |
|
| 111 | + | else |
|
| 112 | + | view(&a); |
|
| 113 | + | return; |
|
| 117 | 114 | } |
|
| 118 | - | if(ev->button == Button1) |
|
| 119 | - | viewprev(&a); |
|
| 120 | - | else if(ev->button == Button3) |
|
| 121 | - | viewnext(&a); |
|
| 122 | - | break; |
|
| 123 | - | case Button4: |
|
| 124 | - | viewprev(&a); |
|
| 125 | - | break; |
|
| 126 | - | case Button5: |
|
| 127 | - | viewnext(&a); |
|
| 128 | - | break; |
|
| 129 | 115 | } |
|
| 130 | 116 | } |
|
| 131 | 117 | else if((c = getclient(ev->window))) { |
| 263 | 263 | arrange(NULL); |
|
| 264 | 264 | drawall(); |
|
| 265 | 265 | } |
|
| 266 | - | ||
| 267 | - | void |
|
| 268 | - | viewnext(Arg *arg) |
|
| 269 | - | { |
|
| 270 | - | unsigned int i; |
|
| 271 | - | ||
| 272 | - | for(i = 0; !seltag[i]; i++); |
|
| 273 | - | arg->i = (i < ntags-1) ? i+1 : 0; |
|
| 274 | - | view(arg); |
|
| 275 | - | } |
|
| 276 | - | ||
| 277 | - | void |
|
| 278 | - | viewprev(Arg *arg) |
|
| 279 | - | { |
|
| 280 | - | unsigned int i; |
|
| 281 | - | ||
| 282 | - | for(i = 0; !seltag[i]; i++); |
|
| 283 | - | arg->i = (i > 0) ? i-1 : ntags-1; |
|
| 284 | - | view(arg); |
|
| 285 | - | } |