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
renamed floating into swimming (this does not clash with C naming conventions and...
[dwm.git]
/
client.c
diff --git
a/client.c
b/client.c
index
0251445
..
e312a9a
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-18,6
+18,7
@@
attachstack(Client *c) {
static void
detachstack(Client *c) {
Client **tc;
static void
detachstack(Client *c) {
Client **tc;
+
for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
*tc = c->snext;
}
for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
*tc = c->snext;
}
@@
-77,6
+78,7
@@
isprotodel(Client *c) {
static void
setclientstate(Client *c, long state) {
long data[] = {state, None};
static void
setclientstate(Client *c, long state) {
long data[] = {state, None};
+
XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
PropModeReplace, (unsigned char *)data, 2);
}
XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
PropModeReplace, (unsigned char *)data, 2);
}
@@
-240,33
+242,33
@@
manage(Window w, XWindowAttributes *wa) {
c->y = way;
}
updatesizehints(c);
c->y = way;
}
updatesizehints(c);
- XSelectInput(dpy, c->win,
+ XSelectInput(dpy, w,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
- XGetTransientForHint(dpy, c->win, &trans);
+ XGetTransientForHint(dpy, w, &trans);
grabbuttons(c, False);
wc.border_width = c->border;
grabbuttons(c, False);
wc.border_width = c->border;
- XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
- XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+ XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+ XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
updatetitle(c);
configure(c); /* propagates border_width, if size doesn't change */
updatetitle(c);
- for(t = clients; t && t->win != c->win; t = t->next);
+ for(t = clients; t && t->win != trans; t = t->next);
settags(c, t);
settags(c, t);
- if(!c->isfloat)
- c->isfloat = (t != 0) || c->isfixed;
+ if(!c->swimming)
+ c->swimming = (t != NULL) || c->isfixed;
attach(c);
attachstack(c);
c->isbanned = True;
attach(c);
attachstack(c);
c->isbanned = True;
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- XMapWindow(dpy, c->win);
+ XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+ XMapWindow(dpy, w);
setclientstate(c, NormalState);
if(isvisible(c))
focus(c);
setclientstate(c, NormalState);
if(isvisible(c))
focus(c);
- arrange();
+ lt->arrange();
}
Client *
nexttiled(Client *c) {
}
Client *
nexttiled(Client *c) {
- for(; c && (c->isfloat || !isvisible(c)); c = c->next);
+ for(; c && (c->swimming || !isvisible(c)); c = c->next);
return c;
}
return c;
}
@@
-428,7
+430,7
@@
unmanage(Client *c) {
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange();
+ lt->arrange();
}
void
}
void
@@
-438,18
+440,17
@@
zoom(Arg *arg) {
if(!sel)
return;
if(!sel)
return;
- if(sel->isfloat || (arrange == dofloat)) {
+ if(sel->swimming || (lt->arrange == swim)) {
togglemax(sel);
return;
}
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
togglemax(sel);
return;
}
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
-
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;
detach(c);
attach(c);
focus(c);
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;
detach(c);
attach(c);
focus(c);
- arrange();
+ lt->arrange();
}
}