X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/9d739090750ffb3b3a64e86e2331215b8901c360..f315832f75ce9f419a2942bc29fcaa737e8b2883:/client.c
diff --git a/client.c b/client.c
index 9645444..87c2f76 100644
--- a/client.c
+++ b/client.c
@@ -11,11 +11,17 @@
/* static functions */
static void
-grabbuttons(Client *c, Bool focus)
-{
+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);
- if(focus) {
+ if(focused) {
XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
@@ -46,12 +52,10 @@ grabbuttons(Client *c, Bool focus)
else
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
-
}
static void
-resizetitle(Client *c)
-{
+resizetitle(Client *c) {
c->tw = textw(c->name);
if(c->tw > c->w)
c->tw = c->w + 2;
@@ -61,48 +65,68 @@ resizetitle(Client *c)
XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
else
XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
-
}
static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {
return 0;
}
/* extern functions */
void
-ban(Client *c)
-{
+ban(Client *c) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
}
void
-focus(Client *c)
-{
- Client *old = sel;
+configure(Client *c) {
+ XEvent synev;
+
+ synev.type = ConfigureNotify;
+ synev.xconfigure.display = dpy;
+ synev.xconfigure.event = c->win;
+ synev.xconfigure.window = c->win;
+ synev.xconfigure.x = c->x;
+ synev.xconfigure.y = c->y;
+ synev.xconfigure.width = c->w;
+ synev.xconfigure.height = c->h;
+ synev.xconfigure.border_width = c->border;
+ synev.xconfigure.above = None;
+ XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
+void
+focus(Client *c) {
+ Client *old;
- if(!issel)
+ if(!issel || (c && !isvisible(c)))
return;
if(!sel)
sel = c;
else if(sel != c) {
- if(sel->ismax)
- togglemax(NULL);
+ old = sel;
sel = c;
- grabbuttons(old, False);
- drawtitle(old);
+ if(old) {
+ grabbuttons(old, False);
+ drawtitle(old);
+ }
}
- grabbuttons(c, True);
- drawtitle(c);
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+ if(c) {
+ detachstack(c);
+ c->snext = stack;
+ stack = c;
+ grabbuttons(c, True);
+ drawtitle(c);
+ XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+ }
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
Client *
-getclient(Window w)
-{
+getclient(Window w) {
Client *c;
for(c = clients; c; c = c->next)
@@ -112,8 +136,7 @@ getclient(Window w)
}
Client *
-getctitle(Window w)
-{
+getctitle(Window w) {
Client *c;
for(c = clients; c; c = c->next)
@@ -123,8 +146,7 @@ getctitle(Window w)
}
void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
int dx = 0, dy = 0;
switch(c->grav) {
@@ -178,8 +200,7 @@ gravitate(Client *c, Bool invert)
}
void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {
if(!sel)
return;
if(sel->proto & PROTODELWIN)
@@ -189,10 +210,8 @@ killclient(Arg *arg)
}
void
-manage(Window w, XWindowAttributes *wa)
-{
- unsigned int i;
- Client *c, *tc;
+manage(Window w, XWindowAttributes *wa) {
+ Client *c;
Window trans;
XSetWindowAttributes twa;
@@ -206,7 +225,7 @@ manage(Window w, XWindowAttributes *wa)
c->th = bh;
c->border = 0;
- setsize(c);
+ updatesize(c);
if(c->x + c->w + 2 > sw)
c->x = sw - c->w - 2;
@@ -231,11 +250,7 @@ manage(Window w, XWindowAttributes *wa)
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
grabbuttons(c, False);
- if((tc = getclient(trans))) /* inherit tags */
- for(i = 0; i < ntags; i++)
- c->tags[i] = tc->tags[i];
- else
- settags(c);
+ settags(c, getclient(trans));
if(!c->isfloat)
c->isfloat = trans
|| (c->maxw && c->minw &&
@@ -244,21 +259,20 @@ manage(Window w, XWindowAttributes *wa)
if(clients)
clients->prev = c;
c->next = clients;
- clients = c;
+ c->snext = stack;
+ stack = clients = c;
- settitle(c);
- if(isvisible(c))
- sel = c;
- arrange(NULL);
+ updatetitle(c);
+ ban(c);
XMapWindow(dpy, c->win);
XMapWindow(dpy, c->twin);
if(isvisible(c))
focus(c);
+ arrange(NULL);
}
void
-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {
int bottom = c->y + c->h;
int right = c->x + c->w;
XWindowChanges wc;
@@ -282,6 +296,16 @@ resize(Client *c, Bool sizehints, Corner sticky)
if(sticky == BotLeft || sticky == BotRight)
c->y = bottom - c->h;
+ /* offscreen appearance fixes */
+ if(c->x + c->w < 0)
+ c->x = 0;
+ if(c->y + c->h < bh)
+ c->y = bh;
+ if(c->x > sw)
+ c->x = sw - c->w;
+ if(c->y > sh)
+ c->y = sh - c->h;
+
resizetitle(c);
wc.x = c->x;
wc.y = c->y;
@@ -291,13 +315,13 @@ resize(Client *c, Bool sizehints, Corner sticky)
wc.border_width = 0;
else
wc.border_width = 1;
- XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+ XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+ configure(c);
XSync(dpy, False);
}
void
-setsize(Client *c)
-{
+updatesize(Client *c) {
long msize;
XSizeHints size;
@@ -335,8 +359,7 @@ setsize(Client *c)
}
void
-settitle(Client *c)
-{
+updatetitle(Client *c) {
char **list = NULL;
int n;
XTextProperty name;
@@ -363,64 +386,28 @@ settitle(Client *c)
}
void
-togglemax(Arg *arg)
-{
- int ox, oy, ow, oh;
- XEvent ev;
-
- if(!sel)
- return;
-
- if((sel->ismax = !sel->ismax)) {
- ox = sel->x;
- oy = sel->y;
- ow = sel->w;
- oh = sel->h;
- sel->x = sx;
- sel->y = sy + bh;
- sel->w = sw - 2;
- sel->h = sh - 2 - bh;
-
- restack();
- resize(sel, arrange == dofloat, TopLeft);
-
- sel->x = ox;
- sel->y = oy;
- sel->w = ow;
- sel->h = oh;
- }
- else
- resize(sel, False, TopLeft);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
+unmanage(Client *c) {
+ Client *nc;
-void
-unmanage(Client *c)
-{
- Client *tc;
- Window trans;
+ /* The server grab construct avoids race conditions. */
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
- XGetTransientForHint(dpy, c->win, &trans);
+ detach(c);
+ detachstack(c);
+ if(sel == c) {
+ for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+ focus(nc);
+ }
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
XDestroyWindow(dpy, c->twin);
- detach(c);
- if(sel == c) {
- if(trans && (tc = getclient(trans)) && isvisible(tc))
- sel = tc;
- else
- sel = getnext(clients);
- }
free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- if(sel)
- focus(sel);
arrange(NULL);
}