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
re-added xterm to config.default.h
[dwm.git]
/
event.c
diff --git
a/event.c
b/event.c
index
4b3c1e3
..
f765fe1
100644
(file)
--- a/
event.c
+++ b/
event.c
@@
-11,7
+11,7
@@
typedef struct {
unsigned long mod;
KeySym keysym;
typedef struct {
unsigned long mod;
KeySym keysym;
- void (*func)(Arg *arg);
+ void (*func)(Arg arg);
Arg arg;
} Key;
Arg arg;
} Key;
@@
-124,31
+124,24
@@
buttonpress(XEvent *e) {
if(ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
if(ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(&a);
+ tag(a);
else
else
- view(&a);
+ view(a);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(&a);
+ toggletag(a);
else
else
- toggleview(&a);
+ toggleview(a);
}
return;
}
}
}
return;
}
}
- if(ev->x < x + bmw)
+ if(ev->x < x + blw)
switch(ev->button) {
case Button1:
switch(ev->button) {
case Button1:
- togglemode(NULL);
- break;
- case Button4:
- a.i = 1;
- incnmaster(&a);
- break;
- case Button5:
a.i = -1;
a.i = -1;
- incnmaster(&a);
+ setlayout(a);
break;
}
}
break;
}
}
@@
-156,14
+149,14
@@
buttonpress(XEvent *e) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
- if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+ if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
restack();
movemouse(c);
}
else if(ev->button == Button2)
restack();
movemouse(c);
}
else if(ev->button == Button2)
- zoom(NULL);
+ zoom(a);
else if(ev->button == Button3
else if(ev->button == Button3
- && (arrange == dofloat || c->isfloat) && !c->isfixed)
+ && (lt->arrange == versatile || c->isversatile) && !c->isfixed)
{
restack();
resizemouse(c);
{
restack();
resizemouse(c);
@@
-181,7
+174,7
@@
configurerequest(XEvent *e) {
c->ismax = False;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
c->ismax = False;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+ if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
@@
-260,7
+253,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);
}
}
}
}
@@
-309,8
+302,8
@@
propertynotify(XEvent *e) {
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloat && (c->isfloat = (trans != 0)))
- arrange();
+ if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
+ lt->arrange();
break;
case XA_WM_NORMAL_HINTS:
updatesizehints(c);
break;
case XA_WM_NORMAL_HINTS:
updatesizehints(c);