added attach/detach functions which don't attach at the begin of list, but at the...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index c18d88b..0a7df77 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,23 +11,47 @@
 /* static functions */
 
 static void
-grabbutton(Client *c, unsigned int button, unsigned int modifier)
+grabbuttons(Client *c, Bool focus)
 {
-       XGrabButton(dpy, button, modifier, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, button, modifier | LockMask, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, button, modifier | numlockmask, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, button, modifier | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+       if(focus) {
+               XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+
+               XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+
+               XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+       }
+       else
+               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+
 }
 
 static void
 resizetitle(Client *c)
 {
-       int i;
-
        c->tw = textw(c->name);
        if(c->tw > c->w)
                c->tw = c->w + 2;
@@ -40,15 +64,6 @@ resizetitle(Client *c)
 
 }
 
-static void
-ungrabbutton(Client *c, unsigned int button, unsigned int modifier)
-{
-       XUngrabButton(dpy, button, modifier, c->win);
-       XUngrabButton(dpy, button, modifier | LockMask, c->win);
-       XUngrabButton(dpy, button, modifier | numlockmask, c->win);
-       XUngrabButton(dpy, button, modifier | numlockmask | LockMask, c->win);
-}
-
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee)
 {
@@ -77,10 +92,10 @@ focus(Client *c)
                if(sel->ismax)
                        togglemax(NULL);
                sel = c;
-               grabbutton(old, AnyButton, 0);
+               grabbuttons(old, False);
                drawtitle(old);
        }
-       ungrabbutton(c, AnyButton, 0);
+       grabbuttons(c, True);
        drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
@@ -215,15 +230,7 @@ manage(Window w, XWindowAttributes *wa)
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
-
-       grabbutton(c, Button1, MODKEY);
-       grabbutton(c, Button2, MODKEY);
-       grabbutton(c, Button3, MODKEY);
-
+       grabbuttons(c, False);
        if((tc = getclient(trans))) /* inherit tags */
                for(i = 0; i < ntags; i++)
                        c->tags[i] = tc->tags[i];
@@ -233,6 +240,9 @@ manage(Window w, XWindowAttributes *wa)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
+
+       attach(c);
+
        settitle(c);
        if(isvisible(c))
                sel = c;
@@ -325,7 +335,7 @@ void
 settitle(Client *c)
 {
        char **list = NULL;
-       int i, n;
+       int n;
        XTextProperty name;
 
        name.nitems = 0;
@@ -384,20 +394,23 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
+       Client *tc;
+       Window trans;
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
+       XGetTransientForHint(dpy, c->win, &trans);
+
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);
 
-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
-               clients = c->next;
-       if(sel == c)
-               sel = getnext(clients);
+       detach(c);
+       if(sel == c) {
+               if(trans && (tc = getclient(trans)) && isvisible(tc))
+                       sel = tc;
+               else
+                       sel = getnext(clients);
+       }
        free(c->tags);
        free(c);