X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=ae08f86f86f5117000339c2cdefe444853805180;hb=2c477cf66147d369ae8ff17acdce743c6811ee6a;hp=b6a77fdea55d10e069d9f3050470645caa29ed58;hpb=5a03daf47f3383250652c15f38f976f6157b4641;p=dwm.git

diff --git a/event.c b/event.c
index b6a77fd..ae08f86 100644
--- a/event.c
+++ b/event.c
@@ -2,6 +2,7 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
@@ -11,8 +12,8 @@
 typedef struct {
 	unsigned long mod;
 	KeySym keysym;
-	void (*func)(Arg *arg);
-	Arg arg;
+	void (*func)(const char *arg);
+	const char *arg;
 } Key;
 
 KEYS
@@ -112,27 +113,29 @@ resizemouse(Client *c) {
 
 static void
 buttonpress(XEvent *e) {
-	int x;
-	Arg a;
+	static char arg[8];
+	int i, x;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
+	arg[0] = 0;
 	if(barwin == ev->window) {
 		x = 0;
-		for(a.i = 0; a.i < ntags; a.i++) {
-			x += textw(tags[a.i]);
+		for(i = 0; i < ntags; i++) {
+			x += textw(tags[i]);
 			if(ev->x < x) {
+				snprintf(arg, sizeof arg, "%d", i);
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
-						tag(&a);
+						tag(arg);
 					else
-						view(&a);
+						view(arg);
 				}
 				else if(ev->button == Button3) {
 					if(ev->state & MODKEY)
-						toggletag(&a);
+						toggletag(arg);
 					else
-						toggleview(&a);
+						toggleview(arg);
 				}
 				return;
 			}
@@ -140,15 +143,7 @@ buttonpress(XEvent *e) {
 		if(ev->x < x + blw)
 			switch(ev->button) {
 			case Button1:
-				togglelayout(NULL);
-				break;
-			case Button4:
-				a.i = 1;
-				incnmaster(&a);
-				break;
-			case Button5:
-				a.i = -1;
-				incnmaster(&a);
+				setlayout("-1");
 				break;
 			}
 	}
@@ -260,7 +255,7 @@ keypress(XEvent *e) {
 		&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
 		{
 			if(key[i].func)
-				key[i].func(&key[i].arg);
+				key[i].func(key[i].arg);
 		}
 }