fixed several other stuff, coming closer to something useful

[dwm.git] / client.c

diff --git a/client.c b/client.c
index c11d5d5..eb3acf4 100644 (file)
--- a/client.c
+++ b/client.c
@@ -37,23 +37,62 @@ update_name(Client *c)
                }
        }
        XFree(name.value);
-       if(c == stack)
-               draw_bar();
+}
+
+void
+update_size(Client *c)
+{
+       XSizeHints size;
+       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
-               draw_client(c);
+               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;
+       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);
 }
 
@@ -62,33 +101,28 @@ manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
-       long msize;
 
        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->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);
-       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_name(c);
        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);
+       update_name(c);
 
        for(l=&clients; *l; l=&(*l)->next);
        c->next = *l; /* *l == nil */
@@ -96,12 +130,14 @@ manage(Window w, XWindowAttributes *wa)
        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);
 }
 
@@ -110,15 +146,14 @@ resize(Client *c)
 {
        XConfigureEvent e;
 
-       XMoveResizeWindow(dpy, c->win, c->r[RFloat].x, c->r[RFloat].y,
-                       c->r[RFloat].width, c->r[RFloat].height);
+       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->r[RFloat].x;
-       e.y = c->r[RFloat].y;
-       e.width = c->r[RFloat].width;
-       e.height = c->r[RFloat].height;
+       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;
@@ -143,7 +178,6 @@ unmanage(Client *c)
        XSetErrorHandler(dummy_error_handler);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       XUnmapWindow(dpy, c->win);
        XDestroyWindow(dpy, c->title);
 
        for(l=&clients; *l && *l != c; l=&(*l)->next);
@@ -176,7 +210,20 @@ getclient(Window w)
 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);
 }