several fixes

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 679e2be..d3b731b 100644 (file)
--- a/client.c
+++ b/client.c
@@ -9,11 +9,9 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "wm.h"
+#include "dwm.h"
 
-static void floating(void);
-static void tiling(void);
-static void (*arrange)(void) = tiling;
+static void (*arrange)(void *) = floating;
 
 void
 max(void *aux)
@@ -24,27 +22,30 @@ max(void *aux)
        stack->y = sy;
        stack->w = sw - 2 * stack->border;
        stack->h = sh - 2 * stack->border;
+       craise(stack);
        resize(stack);
        discard_events(EnterWindowMask);
 }
 
-static void
-floating(void)
+void
+floating(void *aux)
 {
        Client *c;
 
+       arrange = floating;
        for(c = stack; c; c = c->snext)
                resize(c);
        discard_events(EnterWindowMask);
 }
 
-static void
-tiling(void)
+void
+tiling(void *aux)
 {
        Client *c;
        int n, cols, rows, gw, gh, i, j;
     float rt, fd;
 
+       arrange = tiling;
        if(!clients)
                return;
        for(n = 0, c = clients; c; c = c->next, n++);
@@ -75,17 +76,6 @@ tiling(void)
        discard_events(EnterWindowMask);
 }
 
-void
-toggle(void *aux)
-{
-       if(arrange == floating)
-               arrange = tiling;
-       else
-               arrange = floating;
-       arrange();
-}
-
-
 void
 sel(void *aux)
 {
@@ -101,6 +91,7 @@ sel(void *aux)
        if(!c)
                c = stack;
        craise(c);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
        focus(c);
 }
 
@@ -125,8 +116,8 @@ resize_title(Client *c)
        c->tw = 0;
        for(i = 0; i < TLast; i++)
                if(c->tags[i])
-                       c->tw += textw(&dc.font, c->tags[i]) + dc.font.height;
-       c->tw += textw(&dc.font, c->name) + dc.font.height;
+                       c->tw += textw(c->tags[i]) + dc.font.height;
+       c->tw += textw(c->name) + dc.font.height;
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
@@ -226,13 +217,16 @@ focus(Client *c)
        c->snext = stack;
        stack = c;
        if(old && old != c) {
+               XSetWindowBorder(dpy, old->win, dc.bg);
                XMapWindow(dpy, old->title);
                draw_client(old);
        }
        XUnmapWindow(dpy, c->title);
+       XSetWindowBorder(dpy, c->win, dc.fg);
        draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
+       discard_events(EnterWindowMask);
 }
 
 void
@@ -250,8 +244,6 @@ manage(Window w, XWindowAttributes *wa)
        c->th = th;
        c->border = 1;
        update_size(c);
-       XSetWindowBorderWidth(dpy, c->win, 1);
-       XSetWindowBorder(dpy, c->win, dc.border);
        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &c->trans);
@@ -269,6 +261,7 @@ manage(Window w, XWindowAttributes *wa)
        for(l=&clients; *l; l=&(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;
+       XSetWindowBorderWidth(dpy, c->win, 1);
        XMapRaised(dpy, c->win);
        XMapRaised(dpy, c->title);
        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
@@ -277,7 +270,8 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
-       arrange();
+       arrange(NULL);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
        focus(c);
 }
 
@@ -396,7 +390,7 @@ unmanage(Client *c)
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);
-       arrange();
+       arrange(NULL);
        if(stack)
                focus(stack);
 }
@@ -435,12 +429,12 @@ draw_client(Client *c)
        for(i = 0; i < TLast; i++) {
                if(c->tags[i]) {
                        dc.x += dc.w;
-                       dc.w = textw(&dc.font, c->tags[i]) + dc.font.height;
+                       dc.w = textw(c->tags[i]) + dc.font.height;
                        draw(True, c->tags[i]);
                }
        }
        dc.x += dc.w;
-       dc.w = textw(&dc.font, c->name) + dc.font.height;
+       dc.w = textw(c->name) + dc.font.height;
        draw(True, c->name);
        XCopyArea(dpy, dc.drawable, c->title, dc.gc,
                        0, 0, c->tw, c->th, 0, 0);