added protocol killing stuff

[dwm.git] / client.c

diff --git a/client.c b/client.c
index a5141ea..caa523c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -3,18 +3,19 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

+#include <stdlib.h>

 #include <string.h>
 #include <X11/Xatom.h>
 
 #include "util.h"
 #include "wm.h"
 
 #include <string.h>
 #include <X11/Xatom.h>
 
 #include "util.h"
 #include "wm.h"
 

-static void
-update_client_name(Client *c)
+void
+update_name(Client *c)

 {
        XTextProperty name;
        int n;
 {
        XTextProperty name;
        int n;

-       char **list = 0;
+       char **list = NULL;

 
        name.nitems = 0;
        c->name[0] = 0;
 
        name.nitems = 0;
        c->name[0] = 0;


@@ -36,10 +37,24 @@ update_client_name(Client *c)
        XFree(name.value);
 }
 
        XFree(name.value);
 }
 

-Client *
-create_client(Window w, XWindowAttributes *wa)
+void
+focus(Client *c)

 {
 {

-       Client *c;
+       Client **l;
+       for(l=&stack; *l && *l != c; l=&(*l)->snext);
+       eassert(*l == c);
+       *l = c->snext;
+       c->snext = stack;
+       stack = c;
+       XRaiseWindow(dpy, c->win);
+       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       XFlush(dpy);
+}
+
+void
+manage(Window w, XWindowAttributes *wa)
+{
+       Client *c, **l;

        XSetWindowAttributes twa;
        long msize;
 
        XSetWindowAttributes twa;
        long msize;
 


@@ -51,7 +66,6 @@ create_client(Window w, XWindowAttributes *wa)
        c->r[RFloat].height = wa->height;
        c->border = wa->border_width;
        XSetWindowBorderWidth(dpy, c->win, 0);
        c->r[RFloat].height = wa->height;
        c->border = wa->border_width;
        XSetWindowBorderWidth(dpy, c->win, 0);

-       c->proto = win_proto(c->win);

        XGetTransientForHint(dpy, c->win, &c->trans);
        if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize) || !c->size.flags)
                c->size.flags = PSize;
        XGetTransientForHint(dpy, c->win, &c->trans);
        if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize) || !c->size.flags)
                c->size.flags = PSize;


@@ -59,8 +73,7 @@ create_client(Window w, XWindowAttributes *wa)
                (c->size.flags & PMinSize && c->size.flags & PMaxSize
                 && c->size.min_width == c->size.max_width
                 && c->size.min_height == c->size.max_height);
                (c->size.flags & PMinSize && c->size.flags & PMaxSize
                 && c->size.min_width == c->size.max_width
                 && c->size.min_height == c->size.max_height);

-       XAddToSaveSet(dpy, c->win);
-       update_client_name(c);
+       update_name(c);

        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;


@@ -70,20 +83,55 @@ create_client(Window w, XWindowAttributes *wa)
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);

-       XFlush(dpy);

 
 

-#if 0
-       for(t=&client, i=0; *t; t=&(*t)->next, i++);
-       c->next = *t; /* *t == nil */
-       *t = c;
-#endif
-       return c;
+       for(l=&clients; *l; l=&(*l)->next);
+       c->next = *l; /* *l == nil */
+       *l = c;
+       c->snext = stack;
+       stack = c;
+       XMapWindow(dpy, c->win);
+       focus(c);
+}
+
+static int
+dummy_error_handler(Display *dpy, XErrorEvent *error)
+{
+       return 0;

 }
 
 void
 }
 
 void

-manage(Client *c)
+unmanage(Client *c)

 {
 {

-       XMapRaised(dpy, c->win);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       Client **l;
+
+       XGrabServer(dpy);
+       XSetErrorHandler(dummy_error_handler);
+
+       XUnmapWindow(dpy, c->win);
+       XDestroyWindow(dpy, c->title);
+
+       for(l=&clients; *l && *l != c; l=&(*l)->next);
+       eassert(*l == c);
+       *l = c->next;
+       for(l=&stack; *l && *l != c; l=&(*l)->snext);
+       eassert(*l == c);
+       *l = c->snext;
+       free(c);
+

        XFlush(dpy);
        XFlush(dpy);

+       XSetErrorHandler(error_handler);
+       XUngrabServer(dpy);
+       flush_events(EnterWindowMask);

 }
 }

+
+
+Client *
+getclient(Window w)
+{
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->win == w)
+                       return c;
+       return NULL;
+}
+