some more additions/fixes

[dwm.git] / client.c

diff --git a/client.c b/client.c
index b7c9455..ee659c4 100644 (file)
--- a/client.c
+++ b/client.c
@@ -93,6 +93,7 @@ focus(Client *c)
        }
        XUnmapWindow(dpy, c->title);
        draw_bar();
        }
        XUnmapWindow(dpy, c->title);
        draw_bar();

+       discard_events(EnterWindowMask);

        XFlush(dpy);
 }
 
        XFlush(dpy);
 }
 


@@ -104,19 +105,21 @@ manage(Window w, XWindowAttributes *wa)
 
        c = emallocz(sizeof(Client));
        c->win = w;
 
        c = emallocz(sizeof(Client));
        c->win = w;

-       c->x = wa->x;
-       c->y = wa->y;
-       c->w = wa->width;
+       c->tx = c->x = wa->x;
+       c->ty = c->y = wa->y;
+       c->tw = c->w = wa->width;

        c->h = wa->height;
        c->h = wa->height;

+       c->th = barrect.height;

        update_size(c);
        XSetWindowBorderWidth(dpy, c->win, 1);
        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);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 
        XSelectInput(dpy, c->win, CLIENT_MASK);
        XGetTransientForHint(dpy, c->win, &c->trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 

-       c->title = XCreateWindow(dpy, root, c->x, c->y, c->w, barrect.height,
+       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);
                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);


@@ -145,7 +148,6 @@ resize(Client *c)
        XConfigureEvent e;
 
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
        XConfigureEvent e;
 
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);

-       XMoveResizeWindow(dpy, c->title, c->x + c->w / 3, c->y, 2 * c->w / 3, barrect.height);

        e.type = ConfigureNotify;
        e.event = c->win;
        e.window = c->win;
        e.type = ConfigureNotify;
        e.event = c->win;
        e.window = c->win;


@@ -177,7 +179,6 @@ unmanage(Client *c)
        XSetErrorHandler(dummy_error_handler);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        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);
        XDestroyWindow(dpy, c->title);
 
        for(l=&clients; *l && *l != c; l=&(*l)->next);


@@ -191,11 +192,19 @@ unmanage(Client *c)
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);

-       discard_events(EnterWindowMask);

        if(stack)
                focus(stack);
 }
 
        if(stack)
                focus(stack);
 }
 

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

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


@@ -210,17 +219,20 @@ getclient(Window w)
 void
 draw_client(Client *c)
 {
 void
 draw_client(Client *c)
 {

-       if(!c)
-               return;

        if(c == stack)
                draw_bar();
 
        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.x = brush.rect.y = 0;

-       brush.rect.width = 2 * c->w / 3;
-       brush.rect.height = barrect.height;
+       brush.rect.width = c->tw;
+       brush.rect.height = c->th;

 
        draw(dpy, &brush, True, c->name);
 
        draw(dpy, &brush, True, c->name);

-       XCopyArea(dpy, brush.drawable, c->title, brush.gc, 0, 0,
-                       brush.rect.width, brush.rect.height, 0, 0);
+       XCopyArea(dpy, brush.drawable, c->title, brush.gc,
+                       0, 0, c->tw, c->th, 0, 0);

        XFlush(dpy);
 }
        XFlush(dpy);
 }