removed obsolete stuff

[dwm.git] / client.c

diff --git a/client.c b/client.c
index e9b83fe..679e2be 100644 (file)
--- a/client.c
+++ b/client.c
@@ -7,25 +7,39 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
 
-#include "util.h"
 #include "wm.h"
 
+static void floating(void);
+static void tiling(void);
+static void (*arrange)(void) = tiling;
+
 void
 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
-arrange(void *aux)
+static void
+floating(void)
+{
+       Client *c;
+
+       for(c = stack; c; c = c->snext)
+               resize(c);
+       discard_events(EnterWindowMask);
+}
+
+static void
+tiling(void)
 {
        Client *c;
        int n, cols, rows, gw, gh, i, j;
@@ -44,12 +58,12 @@ arrange(void *aux)
        else
                cols = rows;
 
-       gw = (sw - 2 * c->border)  / cols;
-       gh = (sh - bh - 2 * c->border) / rows;
+       gw = (sw - 2)  / cols;
+       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);
@@ -61,6 +75,17 @@ arrange(void *aux)
        discard_events(EnterWindowMask);
 }
 
+void
+toggle(void *aux)
+{
+       if(arrange == floating)
+               arrange = tiling;
+       else
+               arrange = floating;
+       arrange();
+}
+
+
 void
 sel(void *aux)
 {
@@ -75,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;
 
@@ -95,7 +120,13 @@ kill(void *aux)
 static void
 resize_title(Client *c)
 {
-       c->tw = textw(&brush.font, c->name) + bh;
+       int i;
+
+       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;
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
@@ -170,7 +201,7 @@ update_size(Client *c)
 }
 
 void
-raise(Client *c)
+craise(Client *c)
 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);
@@ -190,8 +221,8 @@ focus(Client *c)
 
        old = stack;
        for(l = &stack; *l && *l != c; l = &(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
+       if(*l)
+               *l = c->snext;
        c->snext = stack;
        stack = c;
        if(old && old != c) {
@@ -214,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);
@@ -230,17 +259,16 @@ manage(Window w, XWindowAttributes *wa)
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 
+       c->tags[tsel] = tags[tsel];
        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);
 
+       update_name(c);
        for(l=&clients; *l; l=&(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;
-       c->snext = stack;
-       stack = c;
        XMapRaised(dpy, c->win);
        XMapRaised(dpy, c->title);
        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
@@ -249,7 +277,7 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
-       resize(c);
+       arrange();
        focus(c);
 }
 
@@ -308,11 +336,24 @@ gravitate(Client *c, Bool invert)
        c->y += dy;
 }
 
+
 void
 resize(Client *c)
 {
        XConfigureEvent e;
 
+       if(c->incw)
+               c->w -= (c->w - c->basew) % c->incw;
+       if(c->inch)
+               c->h -= (c->h - c->baseh) % c->inch;
+       if(c->minw && c->w < c->minw)
+               c->w = c->minw;
+       if(c->minh && c->h < c->minh)
+               c->h = c->minh;
+       if(c->maxw && c->w > c->maxw)
+               c->w = c->maxw;
+       if(c->maxh && c->h > c->maxh)
+               c->h = c->maxh;
        resize_title(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
        e.type = ConfigureNotify;
@@ -330,7 +371,7 @@ resize(Client *c)
 }
 
 static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+dummy_error_handler(Display *dsply, XErrorEvent *err)
 {
        return 0;
 }
@@ -347,16 +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();
        if(stack)
                focus(stack);
 }
@@ -384,17 +424,25 @@ getclient(Window w)
 void
 draw_client(Client *c)
 {
-       if(c == stack) {
-               draw_bar();
+       int i;
+       if(c == stack)
                return;
-       }
 
-       brush.x = brush.y = 0;
-       brush.w = c->tw;
-       brush.h = c->th;
+       dc.x = dc.y = 0;
+       dc.h = c->th;
 
-       draw(dpy, &brush, True, c->name);
-       XCopyArea(dpy, brush.drawable, c->title, brush.gc,
+       dc.w = 0;
+       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;
+                       draw(True, c->tags[i]);
+               }
+       }
+       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);
 }