Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
dwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restoring default keybindings as Sander complained
[dwm.git]
/
event.c
diff --git
a/event.c
b/event.c
index
3086284
..
ae08f86
100644
(file)
--- a/
event.c
+++ b/
event.c
@@
-2,6
+2,7
@@
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
+#include <stdio.h>
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
@@
-11,8
+12,8
@@
typedef struct {
unsigned long mod;
KeySym keysym;
typedef struct {
unsigned long mod;
KeySym keysym;
- void (*func)(Arg *arg);
- Arg arg;
+ void (*func)(const char *arg);
+ const char *arg;
} Key;
KEYS
} Key;
KEYS
@@
-112,27
+113,29
@@
resizemouse(Client *c) {
static void
buttonpress(XEvent *e) {
static void
buttonpress(XEvent *e) {
- int x;
- Arg a;
+ static char arg[8];
+ int i, x;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
+ arg[0] = 0;
if(barwin == ev->window) {
x = 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) {
if(ev->x < x) {
+ snprintf(arg, sizeof arg, "%d", i);
if(ev->button == Button1) {
if(ev->state & MODKEY)
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(&a);
+ tag(arg);
else
else
- view(&a);
+ view(arg);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(&a);
+ toggletag(arg);
else
else
- toggleview(&a);
+ toggleview(arg);
}
return;
}
}
return;
}
@@
-140,16
+143,7
@@
buttonpress(XEvent *e) {
if(ev->x < x + blw)
switch(ev->button) {
case Button1:
if(ev->x < x + blw)
switch(ev->button) {
case Button1:
- a.i = -1;
- setlayout(&a);
- break;
- case Button4:
- a.i = 1;
- incnmaster(&a);
- break;
- case Button5:
- a.i = -1;
- incnmaster(&a);
+ setlayout("-1");
break;
}
}
break;
}
}
@@
-261,7
+255,7
@@
keypress(XEvent *e) {
&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
- key[i].func(&key[i].arg);
+ key[i].func(key[i].arg);
}
}
}
}