dwm-meillo

changeset 263:118d3e010e5e

made shortcuts like proposed by Sander, renamed viewextend to toggleview (more clear)
author Anselm R.Garbe <arg@10ksloc.org>
date Sun, 13 Aug 2006 17:58:06 +0200
parents d659a2dce2b5
children afcea99a4f3f
files config.arg.h config.default.h dwm.h event.c tag.c
diffstat 5 files changed, 19 insertions(+), 19 deletions(-) [+]
line diff
     1.1 --- a/config.arg.h	Fri Aug 11 19:26:12 2006 +0200
     1.2 +++ b/config.arg.h	Sun Aug 13 17:58:06 2006 +0200
     1.3 @@ -32,9 +32,9 @@
     1.4  			"awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | dmenu`" } }, \
     1.5  	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
     1.6  	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
     1.7 -	{ MODKEY|ControlMask,		XK_1,		appendtag,	{ .i = 0 } }, \
     1.8 -	{ MODKEY|ControlMask,		XK_2,		appendtag,	{ .i = 1 } }, \
     1.9 -	{ MODKEY|ControlMask,		XK_3,		appendtag,	{ .i = 2 } }, \
    1.10 +	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
    1.11 +	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
    1.12 +	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
    1.13  	{ MODKEY|ShiftMask,		XK_1,		replacetag,	{ .i = 0 } }, \
    1.14  	{ MODKEY|ShiftMask,		XK_2,		replacetag,	{ .i = 1 } }, \
    1.15  	{ MODKEY|ShiftMask,		XK_3,		replacetag,	{ .i = 2 } }, \
    1.16 @@ -43,9 +43,9 @@
    1.17  	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
    1.18  		{ .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -cr '#eeeeee' +sb " \
    1.19  			"-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*'" } }, \
    1.20 -	{ MODKEY|ControlMask|ShiftMask,	XK_1,		viewextend,	{ .i = 0 } }, \
    1.21 -	{ MODKEY|ShiftMask,		XK_2,		viewextend,	{ .i = 1 } }, \
    1.22 -	{ MODKEY|ShiftMask,		XK_3,		viewextend,	{ .i = 2 } }, \
    1.23 +	{ MODKEY|ControlMask|ShiftMask,	XK_1,		appendtag,	{ .i = 0 } }, \
    1.24 +	{ MODKEY|ControlMask|ShiftMask,	XK_2,		appendtag,	{ .i = 1 } }, \
    1.25 +	{ MODKEY|ControlMask|ShiftMask,	XK_3,		appendtag,	{ .i = 2 } }, \
    1.26  };
    1.27  
    1.28  #define RULES \
     2.1 --- a/config.default.h	Fri Aug 11 19:26:12 2006 +0200
     2.2 +++ b/config.default.h	Sun Aug 13 17:58:06 2006 +0200
     2.3 @@ -31,11 +31,11 @@
     2.4  	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
     2.5  	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
     2.6  	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
     2.7 -	{ MODKEY|ControlMask,		XK_0,		appendtag,	{ .i = 0 } }, \
     2.8 -	{ MODKEY|ControlMask,		XK_1,		appendtag,	{ .i = 1 } }, \
     2.9 -	{ MODKEY|ControlMask,		XK_2,		appendtag,	{ .i = 2 } }, \
    2.10 -	{ MODKEY|ControlMask,		XK_3,		appendtag,	{ .i = 3 } }, \
    2.11 -	{ MODKEY|ControlMask,		XK_4,		appendtag,	{ .i = 4 } }, \
    2.12 +	{ MODKEY|ControlMask,		XK_0,		toggleview,	{ .i = 0 } }, \
    2.13 +	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 1 } }, \
    2.14 +	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 2 } }, \
    2.15 +	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 3 } }, \
    2.16 +	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 4 } }, \
    2.17  	{ MODKEY|ShiftMask,		XK_0,		replacetag,	{ .i = 0 } }, \
    2.18  	{ MODKEY|ShiftMask,		XK_1,		replacetag,	{ .i = 1 } }, \
    2.19  	{ MODKEY|ShiftMask,		XK_2,		replacetag,	{ .i = 2 } }, \
    2.20 @@ -44,11 +44,11 @@
    2.21  	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
    2.22  	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
    2.23  	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
    2.24 -	{ MODKEY|ControlMask|ShiftMask,	XK_0,		viewextend,	{ .i = 0 } }, \
    2.25 -	{ MODKEY|ControlMask|ShiftMask,	XK_1,		viewextend,	{ .i = 1 } }, \
    2.26 -	{ MODKEY|ControlMask|ShiftMask,	XK_2,		viewextend,	{ .i = 2 } }, \
    2.27 -	{ MODKEY|ControlMask|ShiftMask,	XK_3,		viewextend,	{ .i = 3 } }, \
    2.28 -	{ MODKEY|ControlMask|ShiftMask,	XK_4,		viewextend,	{ .i = 4 } }, \
    2.29 +	{ MODKEY|ControlMask|ShiftMask,	XK_0,		appendtag,	{ .i = 0 } }, \
    2.30 +	{ MODKEY|ControlMask|ShiftMask,	XK_1,		appendtag,	{ .i = 1 } }, \
    2.31 +	{ MODKEY|ControlMask|ShiftMask,	XK_2,		appendtag,	{ .i = 2 } }, \
    2.32 +	{ MODKEY|ControlMask|ShiftMask,	XK_3,		appendtag,	{ .i = 3 } }, \
    2.33 +	{ MODKEY|ControlMask|ShiftMask,	XK_4,		appendtag,	{ .i = 4 } }, \
    2.34  };
    2.35  
    2.36  #define RULES \
     3.1 --- a/dwm.h	Fri Aug 11 19:26:12 2006 +0200
     3.2 +++ b/dwm.h	Sun Aug 13 17:58:06 2006 +0200
     3.3 @@ -128,7 +128,7 @@
     3.4  extern void settags(Client *c);
     3.5  extern void togglemode(Arg *arg);
     3.6  extern void view(Arg *arg);
     3.7 -extern void viewextend(Arg *arg);
     3.8 +extern void toggleview(Arg *arg);
     3.9  extern void viewnext(Arg *arg);
    3.10  extern void viewprev(Arg *arg);
    3.11  
     4.1 --- a/event.c	Fri Aug 11 19:26:12 2006 +0200
     4.2 +++ b/event.c	Sun Aug 13 17:58:06 2006 +0200
     4.3 @@ -109,7 +109,7 @@
     4.4  				x += textw(tags[a.i]);
     4.5  				if(ev->x < x) {
     4.6  					if(ev->button == Button3)
     4.7 -						viewextend(&a);
     4.8 +						toggleview(&a);
     4.9  					else
    4.10  						view(&a);
    4.11  					return;
     5.1 --- a/tag.c	Fri Aug 11 19:26:12 2006 +0200
     5.2 +++ b/tag.c	Sun Aug 13 17:58:06 2006 +0200
     5.3 @@ -252,7 +252,7 @@
     5.4  }
     5.5  
     5.6  void
     5.7 -viewextend(Arg *arg)
     5.8 +toggleview(Arg *arg)
     5.9  {
    5.10  	unsigned int i;
    5.11