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

applied noviewprev.diff, fix.diff and unusedflags.diff

This commit is contained in:
Anselm R Garbe 2008-06-01 10:54:02 +01:00
parent 6e9387793b
commit c2784e4a38
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -51,7 +51,7 @@ Key keys[] = {
{ MODKEY, XK_l, setmfact, (double[]){+0.05} }, { MODKEY, XK_l, setmfact, (double[]){+0.05} },
{ MODKEY, XK_m, togglemax, NULL }, { MODKEY, XK_m, togglemax, NULL },
{ MODKEY, XK_Return, zoom, NULL }, { MODKEY, XK_Return, zoom, NULL },
{ MODKEY, XK_Tab, viewprevtag, NULL }, { MODKEY, XK_Tab, view, NULL },
{ MODKEY|ShiftMask, XK_c, killclient, NULL }, { MODKEY|ShiftMask, XK_c, killclient, NULL },
{ MODKEY, XK_space, togglelayout, NULL }, { MODKEY, XK_space, togglelayout, NULL },
{ MODKEY|ShiftMask, XK_space, togglefloating, NULL }, { MODKEY|ShiftMask, XK_space, togglefloating, NULL },

37
dwm.c
View File

@ -69,7 +69,6 @@ struct Client {
int x, y, w, h; int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh; int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay; int minax, maxax, minay, maxay;
long flags;
int bw, oldbw; int bw, oldbw;
Bool isbanned, isfixed, isfloating, ismoved, isurgent; Bool isbanned, isfixed, isfloating, ismoved, isurgent;
uint tags; uint tags;
@ -183,7 +182,6 @@ void updatesizehints(Client *c);
void updatetitle(Client *c); void updatetitle(Client *c);
void updatewmhints(Client *c); void updatewmhints(Client *c);
void view(const void *arg); void view(const void *arg);
void viewprevtag(const void *arg);
int xerror(Display *dpy, XErrorEvent *ee); int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee); int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee); int xerrorstart(Display *dpy, XErrorEvent *ee);
@ -419,7 +417,9 @@ configurerequest(XEvent *e) {
if((c = getclient(ev->window))) { if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth) if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width; c->bw = ev->border_width;
if(c->isfixed || c->isfloating || !lt->arrange) { if(ismax && !c->isbanned && !c->isfixed)
XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
else if(c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX) if(ev->value_mask & CWX)
c->x = sx + ev->x; c->x = sx + ev->x;
if(ev->value_mask & CWY) if(ev->value_mask & CWY)
@ -946,6 +946,8 @@ manage(Window w, XWindowAttributes *wa) {
applyrules(c); applyrules(c);
if(!c->isfloating) if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed; c->isfloating = (rettrans == Success) || c->isfixed;
if(c->isfloating)
XRaiseWindow(dpy, c->win);
attach(c); attach(c);
attachstack(c); attachstack(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
@ -1124,7 +1126,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
if(w < bh) if(w < bh)
w = bh; w = bh;
if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) { if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
c->isbanned = c->ismoved = False; c->ismoved = False;
c->x = wc.x = x; c->x = wc.x = x;
c->y = wc.y = y; c->y = wc.y = y;
c->w = wc.width = w; c->w = wc.width = w;
@ -1601,42 +1603,40 @@ updatesizehints(Client *c) {
long msize; long msize;
XSizeHints size; XSizeHints size;
if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags) XGetWMNormalHints(dpy, c->win, &size, &msize);
size.flags = PSize; if(size.flags & PBaseSize) {
c->flags = size.flags;
if(c->flags & PBaseSize) {
c->basew = size.base_width; c->basew = size.base_width;
c->baseh = size.base_height; c->baseh = size.base_height;
} }
else if(c->flags & PMinSize) { else if(size.flags & PMinSize) {
c->basew = size.min_width; c->basew = size.min_width;
c->baseh = size.min_height; c->baseh = size.min_height;
} }
else else
c->basew = c->baseh = 0; c->basew = c->baseh = 0;
if(c->flags & PResizeInc) { if(size.flags & PResizeInc) {
c->incw = size.width_inc; c->incw = size.width_inc;
c->inch = size.height_inc; c->inch = size.height_inc;
} }
else else
c->incw = c->inch = 0; c->incw = c->inch = 0;
if(c->flags & PMaxSize) { if(size.flags & PMaxSize) {
c->maxw = size.max_width; c->maxw = size.max_width;
c->maxh = size.max_height; c->maxh = size.max_height;
} }
else else
c->maxw = c->maxh = 0; c->maxw = c->maxh = 0;
if(c->flags & PMinSize) { if(size.flags & PMinSize) {
c->minw = size.min_width; c->minw = size.min_width;
c->minh = size.min_height; c->minh = size.min_height;
} }
else if(c->flags & PBaseSize) { else if(size.flags & PBaseSize) {
c->minw = size.base_width; c->minw = size.base_width;
c->minh = size.base_height; c->minh = size.base_height;
} }
else else
c->minw = c->minh = 0; c->minw = c->minh = 0;
if(c->flags & PAspect) { if(size.flags & PAspect) {
c->minax = size.min_aspect.x; c->minax = size.min_aspect.x;
c->maxax = size.max_aspect.x; c->maxax = size.max_aspect.x;
c->minay = size.min_aspect.y; c->minay = size.min_aspect.y;
@ -1669,18 +1669,11 @@ updatewmhints(Client *c) {
void void
view(const void *arg) { view(const void *arg) {
if(*(int *)arg & TAGMASK) {
seltags ^= 1; /* toggle sel tagset */ seltags ^= 1; /* toggle sel tagset */
if(arg && (*(int *)arg & TAGMASK))
tagset[seltags] = *(int *)arg & TAGMASK; tagset[seltags] = *(int *)arg & TAGMASK;
arrange(); arrange();
} }
}
void
viewprevtag(const void *arg) {
seltags ^= 1; /* toggle sel tagset */
arrange();
}
/* There's no way to check accesses to destroyed windows, thus those cases are /* There's no way to check accesses to destroyed windows, thus those cases are
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs * ignored (especially on UnmapNotify's). Other types of errors call Xlibs