removed obsolete stuff

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 34691be..679e2be 100644 (file)
--- a/client.c
+++ b/client.c
@@ -7,11 +7,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
 
-#include "util.h"
 #include "wm.h"
 
-void (*arrange)(void *aux);
+static void floating(void);
+static void tiling(void);
+static void (*arrange)(void) = tiling;
 
 void
 max(void *aux)
@@ -19,32 +21,30 @@ max(void *aux)
        if(!stack)
                return;
        stack->x = sx;
-       stack->y = bh;
+       stack->y = sy;
        stack->w = sw - 2 * stack->border;
-       stack->h = sh - bh - 2 * stack->border;
+       stack->h = sh - 2 * stack->border;
        resize(stack);
        discard_events(EnterWindowMask);
 }
 
-void
-floating(void *aux)
+static void
+floating(void)
 {
        Client *c;
 
-       arrange = floating;
        for(c = stack; c; c = c->snext)
                resize(c);
        discard_events(EnterWindowMask);
 }
 
-void
-grid(void *aux)
+static void
+tiling(void)
 {
        Client *c;
        int n, cols, rows, gw, gh, i, j;
     float rt, fd;
 
-       arrange = grid;
        if(!clients)
                return;
        for(n = 0, c = clients; c; c = c->next, n++);
@@ -59,11 +59,11 @@ grid(void *aux)
                cols = rows;
 
        gw = (sw - 2)  / cols;
-       gh = (sh - bh - 2) / rows;
+       gh = (sh - 2) / rows;
 
        for(i = j = 0, c = clients; c; c = c->next) {
                c->x = i * gw;
-               c->y = j * gh + bh;
+               c->y = j * gh;
                c->w = gw;
                c->h = gh;
                resize(c);
@@ -75,6 +75,17 @@ grid(void *aux)
        discard_events(EnterWindowMask);
 }
 
+void
+toggle(void *aux)
+{
+       if(arrange == floating)
+               arrange = tiling;
+       else
+               arrange = floating;
+       arrange();
+}
+
+
 void
 sel(void *aux)
 {
@@ -89,12 +100,12 @@ sel(void *aux)
                for(c = stack; c && c->snext; c = c->snext);
        if(!c)
                c = stack;
-       raise(c);
+       craise(c);
        focus(c);
 }
 
 void
-kill(void *aux)
+ckill(void *aux)
 {
        Client *c = stack;
 
@@ -114,8 +125,8 @@ resize_title(Client *c)
        c->tw = 0;
        for(i = 0; i < TLast; i++)
                if(c->tags[i])
-                       c->tw += textw(&brush.font, c->tags[i]) + bh;
-       c->tw += textw(&brush.font, c->name) + bh;
+                       c->tw += textw(&dc.font, c->tags[i]) + dc.font.height;
+       c->tw += textw(&dc.font, c->name) + dc.font.height;
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
@@ -190,7 +201,7 @@ update_size(Client *c)
 }
 
 void
-raise(Client *c)
+craise(Client *c)
 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);
@@ -234,15 +245,13 @@ manage(Window w, XWindowAttributes *wa)
        c->win = w;
        c->tx = c->x = wa->x;
        c->ty = c->y = wa->y;
-       if(c->y < bh)
-               c->ty = c->y += bh;
        c->tw = c->w = wa->width;
        c->h = wa->height;
-       c->th = bh;
+       c->th = th;
        c->border = 1;
        update_size(c);
        XSetWindowBorderWidth(dpy, c->win, 1);
-       XSetWindowBorder(dpy, c->win, brush.border);
+       XSetWindowBorder(dpy, c->win, dc.border);
        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &c->trans);
@@ -268,7 +277,7 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
-       arrange(NULL);
+       arrange();
        focus(c);
 }
 
@@ -362,7 +371,7 @@ resize(Client *c)
 }
 
 static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+dummy_error_handler(Display *dsply, XErrorEvent *err)
 {
        return 0;
 }
@@ -379,17 +388,15 @@ unmanage(Client *c)
        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);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);
-       arrange(NULL);
+       arrange();
        if(stack)
                focus(stack);
 }
@@ -418,26 +425,24 @@ void
 draw_client(Client *c)
 {
        int i;
-       if(c == stack) {
-               draw_bar();
+       if(c == stack)
                return;
-       }
 
-       brush.x = brush.y = 0;
-       brush.h = c->th;
+       dc.x = dc.y = 0;
+       dc.h = c->th;
 
-       brush.w = 0;
+       dc.w = 0;
        for(i = 0; i < TLast; i++) {
                if(c->tags[i]) {
-                       brush.x += brush.w;
-                       brush.w = textw(&brush.font, c->tags[i]) + bh;
-                       draw(dpy, &brush, True, c->tags[i]);
+                       dc.x += dc.w;
+                       dc.w = textw(&dc.font, c->tags[i]) + dc.font.height;
+                       draw(True, c->tags[i]);
                }
        }
-       brush.x += brush.w;
-       brush.w = textw(&brush.font, c->name) + bh;
-       draw(dpy, &brush, True, c->name);
-       XCopyArea(dpy, brush.drawable, c->title, brush.gc,
+       dc.x += dc.w;
+       dc.w = textw(&dc.font, 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);
        XFlush(dpy);
 }