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
replacing Mod1-i with Mod1-Shift-j, Mod1-d with Mod1-Shift-k
[dwm.git]
/
client.c
diff --git
a/client.c
b/client.c
index
e7a3864
..
d180278
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-10,6
+10,20
@@
/* static */
static void
/* static */
static void
+attachstack(Client *c) {
+ c->snext = stack;
+ stack = c;
+}
+
+static void
+detachstack(Client *c) {
+ Client **tc;
+
+ for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ *tc = c->snext;
+}
+
+static void
grabbuttons(Client *c, Bool focused) {
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
grabbuttons(Client *c, Bool focused) {
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
@@
-46,9
+60,25
@@
grabbuttons(Client *c, Bool focused) {
GrabModeAsync, GrabModeSync, None, None);
}
GrabModeAsync, GrabModeSync, None, None);
}
+static Bool
+isprotodel(Client *c) {
+ int i, n;
+ Atom *protocols;
+ Bool ret = False;
+
+ if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+ for(i = 0; !ret && i < n; i++)
+ if(protocols[i] == wmatom[WMDelete])
+ ret = True;
+ XFree(protocols);
+ }
+ return ret;
+}
+
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);
}
@@
-61,6
+91,14
@@
xerrordummy(Display *dsply, XErrorEvent *ee) {
/* extern */
void
/* extern */
void
+attach(Client *c) {
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ clients = c;
+}
+
+void
configure(Client *c) {
XConfigureEvent ce;
configure(Client *c) {
XConfigureEvent ce;
@@
-79,6
+117,17
@@
configure(Client *c) {
}
void
}
void
+detach(Client *c) {
+ if(c->prev)
+ c->prev->next = c->next;
+ if(c->next)
+ c->next->prev = c->prev;
+ if(c == clients)
+ clients = c->next;
+ c->next = c->prev = NULL;
+}
+
+void
focus(Client *c) {
if(c && !isvisible(c))
return;
focus(Client *c) {
if(c && !isvisible(c))
return;
@@
-103,23
+152,8
@@
focus(Client *c) {
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
-Bool
-isprotodel(Client *c) {
- int i, n;
- Atom *protocols;
- Bool ret = False;
-
- if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
- for(i = 0; !ret && i < n; i++)
- if(protocols[i] == wmatom[WMDelete])
- ret = True;
- XFree(protocols);
- }
- return ret;
-}
-
void
void
-killclient(Arg *arg) {
+killclient(const char *arg) {
if(!sel)
return;
if(isprotodel(sel))
if(!sel)
return;
if(isprotodel(sel))
@@
-158,28
+192,28
@@
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);
- t = getclient(trans);
+ 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->isfloating)
+ c->isfloating = (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();
}
void
}
void
@@
-251,6
+285,14
@@
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
}
void
}
void
+togglefloating(const char *arg) {
+ if(!sel || lt->arrange == floating)
+ return;
+ sel->isfloating = !sel->isfloating;
+ lt->arrange();
+}
+
+void
updatesizehints(Client *c) {
long msize;
XSizeHints size;
updatesizehints(Client *c) {
long msize;
XSizeHints size;
@@
-340,5
+382,5
@@
unmanage(Client *c) {
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange();
+ lt->arrange();
}
}