Faris
/
dwm
mirror of git://git.suckless.org/dwm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

next version will be 5.6, shortened some very long lines

This commit is contained in:
Anselm R Garbe 2009-04-20 11:03:33 +01:00
parent 0b45199cec
commit 7df39f3fc7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.mk
View File

@ -1,5 +1,5 @@
# dwm version # dwm version
VERSION = 5.5 VERSION = 5.6
# Customize below to fit your system # Customize below to fit your system

14
dwm.c
View File

@ -797,7 +797,10 @@ grabbuttons(Client *c, Bool focused) {
for(i = 0; i < LENGTH(buttons); i++) for(i = 0; i < LENGTH(buttons); i++)
if(buttons[i].click == ClkClientWin) if(buttons[i].click == ClkClientWin)
for(j = 0; j < LENGTH(modifiers); j++) for(j = 0; j < LENGTH(modifiers); j++)
XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); XGrabButton(dpy, buttons[i].button,
buttons[i].mask | modifiers[j],
c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
} else } else
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
@ -936,7 +939,8 @@ manage(Window w, XWindowAttributes *wa) {
c->y = sy + sh - HEIGHT(c); c->y = sy + sh - HEIGHT(c);
c->x = MAX(c->x, sx); c->x = MAX(c->x, sx);
/* only fix client y-offset, if the client center might cover the bar */ /* only fix client y-offset, if the client center might cover the bar */
c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy); c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx)
&& (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
c->bw = borderpx; c->bw = borderpx;
} }
@ -1035,7 +1039,8 @@ movemouse(const Arg *arg) {
ny = wy; ny = wy;
else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap) else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
ny = wy + wh - HEIGHT(c); ny = wy + wh - HEIGHT(c);
if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) if(!c->isfloating && lt[sellt]->arrange
&& (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL); togglefloating(NULL);
} }
if(!lt[sellt]->arrange || c->isfloating) if(!lt[sellt]->arrange || c->isfloating)
@ -1540,7 +1545,8 @@ updatenumlockmask(void) {
modmap = XGetModifierMapping(dpy); modmap = XGetModifierMapping(dpy);
for(i = 0; i < 8; i++) for(i = 0; i < 8; i++)
for(j = 0; j < modmap->max_keypermod; j++) for(j = 0; j < modmap->max_keypermod; j++)
if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock)) if(modmap->modifiermap[i * modmap->max_keypermod + j]
== XKeysymToKeycode(dpy, XK_Num_Lock))
numlockmask = (1 << i); numlockmask = (1 << i);
XFreeModifiermap(modmap); XFreeModifiermap(modmap);
} }