about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--config.arg.h12
-rw-r--r--config.default.h20
-rw-r--r--dwm.h2
-rw-r--r--event.c2
-rw-r--r--tag.c2
5 files changed, 19 insertions, 19 deletions
diff --git a/config.arg.h b/config.arg.h
index aed8ad6..c6cb717 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -32,9 +32,9 @@ static Key key[] = { \
 			"awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | dmenu`" } }, \
 	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY|ControlMask,		XK_1,		appendtag,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask,		XK_2,		appendtag,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask,		XK_3,		appendtag,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		replacetag,	{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		replacetag,	{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_3,		replacetag,	{ .i = 2 } }, \
@@ -43,9 +43,9 @@ static Key key[] = { \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
 		{ .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -cr '#eeeeee' +sb " \
 			"-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*'" } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		viewextend,	{ .i = 0 } }, \
-	{ MODKEY|ShiftMask,		XK_2,		viewextend,	{ .i = 1 } }, \
-	{ MODKEY|ShiftMask,		XK_3,		viewextend,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		appendtag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		appendtag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		appendtag,	{ .i = 2 } }, \
 };
 
 #define RULES \
diff --git a/config.default.h b/config.default.h
index ab9f6e8..53b91eb 100644
--- a/config.default.h
+++ b/config.default.h
@@ -31,11 +31,11 @@ static Key key[] = { \
 	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
 	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY|ControlMask,		XK_0,		appendtag,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask,		XK_1,		appendtag,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask,		XK_2,		appendtag,	{ .i = 2 } }, \
-	{ MODKEY|ControlMask,		XK_3,		appendtag,	{ .i = 3 } }, \
-	{ MODKEY|ControlMask,		XK_4,		appendtag,	{ .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_0,		replacetag,	{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		replacetag,	{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		replacetag,	{ .i = 2 } }, \
@@ -44,11 +44,11 @@ static Key key[] = { \
 	{ 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,		viewextend,	{ .i = 0 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		viewextend,	{ .i = 1 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_2,		viewextend,	{ .i = 2 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_3,		viewextend,	{ .i = 3 } }, \
-	{ MODKEY|ControlMask|ShiftMask,	XK_4,		viewextend,	{ .i = 4 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_0,		appendtag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		appendtag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		appendtag,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		appendtag,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		appendtag,	{ .i = 4 } }, \
 };
 
 #define RULES \
diff --git a/dwm.h b/dwm.h
index 1d6e43c..8a17368 100644
--- a/dwm.h
+++ b/dwm.h
@@ -128,7 +128,7 @@ extern void replacetag(Arg *arg);
 extern void settags(Client *c);
 extern void togglemode(Arg *arg);
 extern void view(Arg *arg);
-extern void viewextend(Arg *arg);
+extern void toggleview(Arg *arg);
 extern void viewnext(Arg *arg);
 extern void viewprev(Arg *arg);
 
diff --git a/event.c b/event.c
index e452167..9da7ac4 100644
--- a/event.c
+++ b/event.c
@@ -109,7 +109,7 @@ buttonpress(XEvent *e)
 				x += textw(tags[a.i]);
 				if(ev->x < x) {
 					if(ev->button == Button3)
-						viewextend(&a);
+						toggleview(&a);
 					else
 						view(&a);
 					return;
diff --git a/tag.c b/tag.c
index 51dda03..9904dd1 100644
--- a/tag.c
+++ b/tag.c
@@ -252,7 +252,7 @@ view(Arg *arg)
 }
 
 void
-viewextend(Arg *arg)
+toggleview(Arg *arg)
 {
 	unsigned int i;
 
37'>337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384