aewl

changeset 267:8a8ea74e1b87

removed viewnext/viewprev
author Anselm R.Garbe <arg@10ksloc.org>
date Mon, 14 Aug 2006 08:38:26 +0200
parents e8aa8f6e3481
children a47b3b0d7bf4
files config.arg.h config.default.h dwm.1 dwm.h event.c tag.c
diffstat 6 files changed, 9 insertions(+), 65 deletions(-) [+]
line diff
     1.1 --- a/config.arg.h	Mon Aug 14 07:40:20 2006 +0200
     1.2 +++ b/config.arg.h	Mon Aug 14 08:38:26 2006 +0200
     1.3 @@ -22,10 +22,8 @@
     1.4  	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
     1.5  	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
     1.6  	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
     1.7 -	{ MODKEY,			XK_h,		viewprev,	{ 0 } }, \
     1.8  	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
     1.9  	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
    1.10 -	{ MODKEY,			XK_l,		viewnext,	{ 0 } }, \
    1.11  	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
    1.12  	{ MODKEY,			XK_p,		spawn, \
    1.13  		{ .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | " \
     2.1 --- a/config.default.h	Mon Aug 14 07:40:20 2006 +0200
     2.2 +++ b/config.default.h	Mon Aug 14 08:38:26 2006 +0200
     2.3 @@ -24,10 +24,8 @@
     2.4  	{ MODKEY,			XK_2,		view,		{ .i = 2 } }, \
     2.5  	{ MODKEY,			XK_3,		view,		{ .i = 3 } }, \
     2.6  	{ MODKEY,			XK_4,		view,		{ .i = 4 } }, \
     2.7 -	{ MODKEY,			XK_h,		viewprev,	{ 0 } }, \
     2.8  	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
     2.9  	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
    2.10 -	{ MODKEY,			XK_l,		viewnext,	{ 0 } }, \
    2.11  	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
    2.12  	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
    2.13  	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
     3.1 --- a/dwm.1	Mon Aug 14 07:40:20 2006 +0200
     3.2 +++ b/dwm.1	Mon Aug 14 08:38:26 2006 +0200
     3.3 @@ -43,14 +43,6 @@
     3.4  .B Button2
     3.5  click on a tag label toggles that
     3.6  .B tag.
     3.7 -.TP
     3.8 -.B Button[1,4]
     3.9 -click on the bar focuses the previous
    3.10 -.B tag.
    3.11 -.TP
    3.12 -.B Button[2,5]
    3.13 -click on the bar focuses the next
    3.14 -.B tag.
    3.15  .SS Keyboard commands
    3.16  .TP
    3.17  .B Mod1-Return
    3.18 @@ -60,10 +52,6 @@
    3.19  .B master
    3.20  column.
    3.21  .TP
    3.22 -.B Mod1-h
    3.23 -Focus previous
    3.24 -.B tag.
    3.25 -.TP
    3.26  .B Mod1-j
    3.27  Focus next
    3.28  .B window.
    3.29 @@ -72,10 +60,6 @@
    3.30  Focus previous
    3.31  .B window.
    3.32  .TP
    3.33 -.B Mod1-l
    3.34 -Focus next
    3.35 -.B tag.
    3.36 -.TP
    3.37  .B Mod1-m
    3.38  Maximize current
    3.39  .B window.
     4.1 --- a/dwm.h	Mon Aug 14 07:40:20 2006 +0200
     4.2 +++ b/dwm.h	Mon Aug 14 08:38:26 2006 +0200
     4.3 @@ -129,8 +129,6 @@
     4.4  extern void togglemode(Arg *arg);
     4.5  extern void view(Arg *arg);
     4.6  extern void toggleview(Arg *arg);
     4.7 -extern void viewnext(Arg *arg);
     4.8 -extern void viewprev(Arg *arg);
     4.9  
    4.10  /* util.c */
    4.11  extern void *emallocz(unsigned int size);
     5.1 --- a/event.c	Mon Aug 14 07:40:20 2006 +0200
     5.2 +++ b/event.c	Mon Aug 14 08:38:26 2006 +0200
     5.3 @@ -102,30 +102,16 @@
     5.4  	XButtonPressedEvent *ev = &e->xbutton;
     5.5  
     5.6  	if(barwin == ev->window) {
     5.7 -		switch(ev->button) {
     5.8 -		default:
     5.9 -			x = 0;
    5.10 -			for(a.i = 0; a.i < ntags; a.i++) {
    5.11 -				x += textw(tags[a.i]);
    5.12 -				if(ev->x < x) {
    5.13 -					if(ev->button == Button3)
    5.14 -						toggleview(&a);
    5.15 -					else
    5.16 -						view(&a);
    5.17 -					return;
    5.18 -				}
    5.19 +		x = 0;
    5.20 +		for(a.i = 0; a.i < ntags; a.i++) {
    5.21 +			x += textw(tags[a.i]);
    5.22 +			if(ev->x < x) {
    5.23 +				if(ev->button == Button3)
    5.24 +					toggleview(&a);
    5.25 +				else
    5.26 +					view(&a);
    5.27 +				return;
    5.28  			}
    5.29 -			if(ev->button == Button1)
    5.30 -				viewprev(&a);
    5.31 -			else if(ev->button == Button3)
    5.32 -				viewnext(&a);
    5.33 -			break;
    5.34 -		case Button4:
    5.35 -			viewprev(&a);
    5.36 -			break;
    5.37 -		case Button5:
    5.38 -			viewnext(&a);
    5.39 -			break;
    5.40  		}
    5.41  	}
    5.42  	else if((c = getclient(ev->window))) {
     6.1 --- a/tag.c	Mon Aug 14 07:40:20 2006 +0200
     6.2 +++ b/tag.c	Mon Aug 14 08:38:26 2006 +0200
     6.3 @@ -263,23 +263,3 @@
     6.4  	arrange(NULL);
     6.5  	drawall();
     6.6  }
     6.7 -
     6.8 -void
     6.9 -viewnext(Arg *arg)
    6.10 -{
    6.11 -	unsigned int i;
    6.12 -
    6.13 -	for(i = 0; !seltag[i]; i++);
    6.14 -	arg->i = (i < ntags-1) ? i+1 : 0;
    6.15 -	view(arg);
    6.16 -}
    6.17 -
    6.18 -void
    6.19 -viewprev(Arg *arg)
    6.20 -{
    6.21 -	unsigned int i;
    6.22 -
    6.23 -	for(i = 0; !seltag[i]; i++);
    6.24 -	arg->i = (i > 0) ? i-1 : ntags-1;
    6.25 -	view(arg);
    6.26 -}