fixed several other stuff, coming closer to something useful

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 62f4d98..eb3acf4 100644 (file)
--- a/client.c
+++ b/client.c
@@ -3,14 +3,17 @@
  * 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)
+#define CLIENT_MASK            (StructureNotifyMask | PropertyChangeMask | EnterWindowMask)
+
+void
+update_name(Client *c)

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


@@ -36,56 +39,164 @@ update_client_name(Client *c)
        XFree(name.value);
 }
 
        XFree(name.value);
 }
 

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

 {
 {

-       Client *c;
-       XSetWindowAttributes twa;
+       XSizeHints size;

        long msize;
        long msize;

+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+               size.flags = PSize;
+       c->flags = size.flags;
+       if(c->flags & PBaseSize) {
+               c->basew = size.base_width;
+               c->baseh = size.base_height;
+       }
+       else
+               c->basew = c->baseh = 0;
+       if(c->flags & PResizeInc) {
+               c->incw = size.width_inc;
+               c->inch = size.height_inc;
+       }
+       else
+               c->incw = c->inch = 0;
+       if(c->flags & PMaxSize) {
+               c->maxw = size.max_width;
+               c->maxh = size.max_height;
+       }
+       else
+               c->maxw = c->maxh = 0;
+       if(c->flags & PMinSize) {
+               c->minw = size.min_width;
+               c->minh = size.min_height;
+       }
+       else
+               c->minw = c->minh = 0;
+}
+
+void
+focus(Client *c)
+{
+       Client **l, *old;
+
+       old = stack;
+       for(l=&stack; *l && *l != c; l=&(*l)->snext);
+       eassert(*l == c);
+       *l = c->snext;
+       c->snext = stack;
+       stack = c;
+       XRaiseWindow(dpy, c->win);
+       XRaiseWindow(dpy, c->title);
+       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       if(old && old != c) {
+               XMapWindow(dpy, old->title);
+               draw_client(old);
+       }
+       XUnmapWindow(dpy, c->title);
+       draw_bar();
+       XFlush(dpy);
+}
+
+void
+manage(Window w, XWindowAttributes *wa)
+{
+       Client *c, **l;
+       XSetWindowAttributes twa;

 
        c = emallocz(sizeof(Client));
        c->win = w;
 
        c = emallocz(sizeof(Client));
        c->win = w;

-       c->r[RFloat].x = wa->x;
-       c->r[RFloat].y = wa->y;
-       c->r[RFloat].width = wa->width;
-       c->r[RFloat].height = wa->height;
-       c->border = wa->border_width;
-       XSetWindowBorderWidth(dpy, c->win, 0);
+       c->tx = c->x = wa->x;
+       c->ty = c->y = wa->y;
+       c->tw = c->w = wa->width;
+       c->h = wa->height;
+       c->th = barrect.height;
+       update_size(c);
+       XSetWindowBorderWidth(dpy, c->win, 1);
+       XSetWindowBorder(dpy, c->win, brush.border);
+       XSelectInput(dpy, c->win, CLIENT_MASK);

        XGetTransientForHint(dpy, c->win, &c->trans);
        XGetTransientForHint(dpy, c->win, &c->trans);

-       if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize) || !c->size.flags)
-               c->size.flags = PSize;
-       c->fixedsize =
-               (c->size.flags & PMinSize && c->size.flags & PMaxSize
-                && c->size.min_width == c->size.max_width
-                && c->size.min_height == c->size.max_height);
-       update_client_name(c);

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

-       twa.event_mask = ExposureMask;
+       twa.event_mask = SubstructureNotifyMask | ExposureMask;

 
 

-       c->title = XCreateWindow(dpy, root, c->r[RFloat].x, c->r[RFloat].y,
-                       c->r[RFloat].width, barrect.height, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
+       c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+                       0, DefaultDepth(dpy, screen), CopyFromParent,

                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);

+       update_name(c);
+
+       for(l=&clients; *l; l=&(*l)->next);
+       c->next = *l; /* *l == nil */
+       *l = c;
+       c->snext = stack;
+       stack = c;
+       XMapWindow(dpy, c->win);
+       XMapWindow(dpy, c->title);
+       XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+       XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+       resize(c);
+       focus(c);
+}
+
+void
+resize(Client *c)
+{
+       XConfigureEvent e;
+
+       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+       e.type = ConfigureNotify;
+       e.event = c->win;
+       e.window = c->win;
+       e.x = c->x;
+       e.y = c->y;
+       e.width = c->w;
+       e.height = c->h;
+       e.border_width = 0;
+       e.above = None;
+       e.override_redirect = False;
+       XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
+       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
+       XSelectInput(dpy, c->win, CLIENT_MASK);

        XFlush(dpy);
        XFlush(dpy);

+}

 
 

-#if 0
-       for(t=&client, i=0; *t; t=&(*t)->next, i++);
-       c->next = *t; /* *t == nil */
-       *t = c;
-#endif
-       return 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);
+
+       XUngrabButton(dpy, AnyButton, AnyModifier, 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);
+       discard_events(EnterWindowMask);
+       if(stack)
+               focus(stack);

 }
 
 }
 

+

 Client *
 getclient(Window w)
 {
 Client *
 getclient(Window w)
 {


@@ -95,3 +206,24 @@ getclient(Window w)
                        return c;
        return NULL;
 }
                        return c;
        return NULL;
 }

+
+void
+draw_client(Client *c)
+{
+       if(c == stack)
+               draw_bar();
+
+       c->tw = textwidth(&brush.font, c->name) + labelheight(&brush.font);
+       c->tx = c->x + c->w - c->tw + 2;
+       c->ty = c->y;
+       XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+
+       brush.rect.x = brush.rect.y = 0;
+       brush.rect.width = c->tw;
+       brush.rect.height = c->th;
+
+       draw(dpy, &brush, True, c->name);
+       XCopyArea(dpy, brush.drawable, c->title, brush.gc,
+                       0, 0, c->tw, c->th, 0, 0);
+       XFlush(dpy);
+}