|
|
@ -156,8 +156,9 @@ buttonpress(XEvent *e) { |
|
|
|
} |
|
|
|
} |
|
|
|
else if(ev->button == Button2) |
|
|
|
else if(ev->button == Button2) |
|
|
|
zoom(NULL); |
|
|
|
zoom(NULL); |
|
|
|
else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) && |
|
|
|
else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) |
|
|
|
!c->isfixed) { |
|
|
|
&& !c->isfixed) |
|
|
|
|
|
|
|
{ |
|
|
|
restack(); |
|
|
|
restack(); |
|
|
|
resizemouse(c); |
|
|
|
resizemouse(c); |
|
|
|
} |
|
|
|
} |
|
|
@ -173,18 +174,19 @@ configurerequest(XEvent *e) { |
|
|
|
if((c = getclient(ev->window))) { |
|
|
|
if((c = getclient(ev->window))) { |
|
|
|
c->ismax = False; |
|
|
|
c->ismax = False; |
|
|
|
c->border = (ev->value_mask & CWBorderWidth) ? ev->border_width : c->border; |
|
|
|
c->border = (ev->value_mask & CWBorderWidth) ? ev->border_width : c->border; |
|
|
|
if((!c->isfloat && (arrange != dofloat)) |
|
|
|
if(c->isfixed || c->isfloat || (arrange == dofloat)) { |
|
|
|
|| ((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight)))) |
|
|
|
|
|
|
|
configure(c); |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
c->x = (ev->value_mask & CWX) ? ev->x : c->x; |
|
|
|
c->x = (ev->value_mask & CWX) ? ev->x : c->x; |
|
|
|
c->y = (ev->value_mask & CWY) ? ev->y : c->y; |
|
|
|
c->y = (ev->value_mask & CWY) ? ev->y : c->y; |
|
|
|
c->w = (ev->value_mask & CWWidth) ? ev->width : c->w; |
|
|
|
c->w = (ev->value_mask & CWWidth) ? ev->width : c->w; |
|
|
|
c->h = (ev->value_mask & CWHeight) ? ev->height : c->h; |
|
|
|
c->h = (ev->value_mask & CWHeight) ? ev->height : c->h; |
|
|
|
|
|
|
|
if((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight))) |
|
|
|
|
|
|
|
configure(c); |
|
|
|
resize(c, False); |
|
|
|
resize(c, False); |
|
|
|
if(!isvisible(c)) |
|
|
|
if(!isvisible(c)) |
|
|
|
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); |
|
|
|
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
configure(c); |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
else { |
|
|
|
wc.x = ev->x; |
|
|
|
wc.x = ev->x; |
|
|
|