tremoved viewnext/viewprev - dwm - [fork] customized build of dwm, the dynamic … | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 4cb78a170c6daa488a90dffb60224fcf2b76fbf0 | |
parent 2c66b422e75109562e6ebfb6247300b916e1551a | |
Author: Anselm R.Garbe <[email protected]> | |
Date: Mon, 14 Aug 2006 08:38:26 +0200 | |
removed viewnext/viewprev | |
Diffstat: | |
M config.arg.h | 2 -- | |
M config.default.h | 2 -- | |
M dwm.1 | 16 ---------------- | |
M dwm.h | 2 -- | |
M event.c | 32 +++++++++--------------------… | |
M tag.c | 20 -------------------- | |
6 files changed, 9 insertions(+), 65 deletions(-) | |
--- | |
diff --git a/config.arg.h b/config.arg.h | |
t@@ -22,10 +22,8 @@ static Key key[] = { \ | |
{ MODKEY, XK_1, view, … | |
{ MODKEY, XK_2, view, … | |
{ MODKEY, XK_3, view, … | |
- { MODKEY, XK_h, viewprev, … | |
{ MODKEY, XK_j, focusnext, … | |
{ MODKEY, XK_k, focusprev, … | |
- { MODKEY, XK_l, viewnext, … | |
{ MODKEY, XK_m, togglemax, … | |
{ MODKEY, XK_p, spawn, \ | |
{ .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | "… | |
diff --git a/config.default.h b/config.default.h | |
t@@ -24,10 +24,8 @@ static Key key[] = { \ | |
{ MODKEY, XK_2, view, … | |
{ MODKEY, XK_3, view, … | |
{ MODKEY, XK_4, view, … | |
- { MODKEY, XK_h, viewprev, … | |
{ MODKEY, XK_j, focusnext, … | |
{ MODKEY, XK_k, focusprev, … | |
- { MODKEY, XK_l, viewnext, … | |
{ MODKEY, XK_m, togglemax, … | |
{ MODKEY, XK_space, togglemode, {… | |
{ MODKEY, XK_Return, zoom, … | |
diff --git a/dwm.1 b/dwm.1 | |
t@@ -43,14 +43,6 @@ click on a tag label focuses that | |
.B Button2 | |
click on a tag label toggles that | |
.B tag. | |
-.TP | |
-.B Button[1,4] | |
-click on the bar focuses the previous | |
-.B tag. | |
-.TP | |
-.B Button[2,5] | |
-click on the bar focuses the next | |
-.B tag. | |
.SS Keyboard commands | |
.TP | |
.B Mod1-Return | |
t@@ -60,10 +52,6 @@ to the | |
.B master | |
column. | |
.TP | |
-.B Mod1-h | |
-Focus previous | |
-.B tag. | |
-.TP | |
.B Mod1-j | |
Focus next | |
.B window. | |
t@@ -72,10 +60,6 @@ Focus next | |
Focus previous | |
.B window. | |
.TP | |
-.B Mod1-l | |
-Focus next | |
-.B tag. | |
-.TP | |
.B Mod1-m | |
Maximize current | |
.B window. | |
diff --git a/dwm.h b/dwm.h | |
t@@ -129,8 +129,6 @@ extern void settags(Client *c); | |
extern void togglemode(Arg *arg); | |
extern void view(Arg *arg); | |
extern void toggleview(Arg *arg); | |
-extern void viewnext(Arg *arg); | |
-extern void viewprev(Arg *arg); | |
/* util.c */ | |
extern void *emallocz(unsigned int size); | |
diff --git a/event.c b/event.c | |
t@@ -102,30 +102,16 @@ buttonpress(XEvent *e) | |
XButtonPressedEvent *ev = &e->xbutton; | |
if(barwin == ev->window) { | |
- switch(ev->button) { | |
- default: | |
- x = 0; | |
- for(a.i = 0; a.i < ntags; a.i++) { | |
- x += textw(tags[a.i]); | |
- if(ev->x < x) { | |
- if(ev->button == Button3) | |
- toggleview(&a); | |
- else | |
- view(&a); | |
- return; | |
- } | |
+ x = 0; | |
+ for(a.i = 0; a.i < ntags; a.i++) { | |
+ x += textw(tags[a.i]); | |
+ if(ev->x < x) { | |
+ if(ev->button == Button3) | |
+ toggleview(&a); | |
+ else | |
+ view(&a); | |
+ return; | |
} | |
- if(ev->button == Button1) | |
- viewprev(&a); | |
- else if(ev->button == Button3) | |
- viewnext(&a); | |
- break; | |
- case Button4: | |
- viewprev(&a); | |
- break; | |
- case Button5: | |
- viewnext(&a); | |
- break; | |
} | |
} | |
else if((c = getclient(ev->window))) { | |
diff --git a/tag.c b/tag.c | |
t@@ -263,23 +263,3 @@ toggleview(Arg *arg) | |
arrange(NULL); | |
drawall(); | |
} | |
- | |
-void | |
-viewnext(Arg *arg) | |
-{ | |
- unsigned int i; | |
- | |
- for(i = 0; !seltag[i]; i++); | |
- arg->i = (i < ntags-1) ? i+1 : 0; | |
- view(arg); | |
-} | |
- | |
-void | |
-viewprev(Arg *arg) | |
-{ | |
- unsigned int i; | |
- | |
- for(i = 0; !seltag[i]; i++); | |
- arg->i = (i > 0) ? i-1 : ntags-1; | |
- view(arg); | |
-} |