implemented bar for dwm (I miss status text), I plan that status text is read from...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 3c8825d..e0ab719 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,10 +11,11 @@
 
 #include "dwm.h"
 
-static void (*arrange)(Arg *) = tiling;
+void (*arrange)(Arg *) = tiling;
 
 static Rule rule[] = {
-       { "Firefox-bin", "Gecko", { [Twww] = "www" } },
+       /* class                        instance        tags                                            floating */
+       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
 };
 
 static Client *
@@ -48,43 +49,49 @@ max(Arg *arg)
        if(!sel)
                return;
        sel->x = sx;
-       sel->y = sy;
+       sel->y = sy + bh;
        sel->w = sw - 2 * sel->border;
-       sel->h = sh - 2 * sel->border;
+       sel->h = sh - 2 * sel->border - bh;
        craise(sel);
-       resize(sel);
+       resize(sel, False);
        discard_events(EnterWindowMask);
 }
 
 void
 view(Arg *arg)
 {
+       Client *c;
+
        tsel = arg->i;
        arrange(NULL);
+
+       for(c = clients; c; c = next(c->next))
+               draw_client(c);
+       draw_bar();
 }
 
 void
-tag(Arg *arg)
+tappend(Arg *arg)
 {
-       int i, n;
        if(!sel)
                return;
 
-       if(arg->i == tsel) {
-               for(n = i = 0; i < TLast; i++)
-                       if(sel->tags[i])
-                               n++;
-               if(n < 2)
-                       return;
-       }
-
-       if(sel->tags[arg->i])
-               sel->tags[arg->i] = NULL; /* toggle tag */
-       else
-               sel->tags[arg->i] = tags[arg->i];
+       sel->tags[arg->i] = tags[arg->i];
        arrange(NULL);
 }
 
+void
+ttrunc(Arg *arg)
+{
+       int i;
+       if(!sel)
+               return;
+
+       for(i = 0; i < TLast; i++)
+               sel->tags[i] = NULL;
+       tappend(arg);
+}
+
 static void
 ban_client(Client *c)
 {
@@ -100,7 +107,7 @@ floating(Arg *arg)
        arrange = floating;
        for(c = clients; c; c = c->next) {
                if(c->tags[tsel])
-                       resize(c);
+                       resize(c, True);
                else
                        ban_client(c);
        }
@@ -122,32 +129,40 @@ tiling(Arg *arg)
        w = sw - mw;
        arrange = tiling;
        for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel])
+               if(c->tags[tsel] && !c->floating)
                        n++;
 
-       h = (n > 2) ? sh / (n - 2) : sh;
+       if(n > 1)
+               h = (sh - bh) / (n - 1);
+       else
+               h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
                if(c->tags[tsel]) {
+                       if(c->floating) {
+                               craise(c);
+                               resize(c, True);
+                               continue;
+                       }
                        if(n == 1) {
                                c->x = sx;
-                               c->y = sy;
-                               c->w = sw;
-                               c->h = sh;
+                               c->y = sy + bh;
+                               c->w = sw - 2 * c->border;
+                               c->h = sh - 2 * c->border - bh;
                        }
-                       else if(i == 1) {
+                       else if(i == 0) {
                                c->x = sx;
-                               c->y = sy;
-                               c->w = mw;
-                               c->h = sh;
+                               c->y = sy + bh;
+                               c->w = mw - 2 * c->border;
+                               c->h = sh - 2 * c->border - bh;
                        }
                        else {
                                c->x = sx + mw;
-                               c->y = sy + (i - 2) * h;
-                               c->w = w;
-                               c->h = h;
+                               c->y = sy + (i - 1) * h + bh;
+                               c->w = w - 2 * c->border;
+                               c->h = h - 2 * c->border;
                        }
-                       resize(c);
+                       resize(c, False);
                        i++;
                }
                else
@@ -304,14 +319,11 @@ lower(Client *c)
 void
 focus(Client *c)
 {
-       if(sel && sel != c) {
-               XSetWindowBorder(dpy, sel->win, dc.bg);
-               XMapWindow(dpy, sel->title);
-               draw_client(sel);
-       }
+       Client *old = sel;
+
        sel = c;
-       XUnmapWindow(dpy, c->title);
-       XSetWindowBorder(dpy, c->win, dc.fg);
+       if(old && old != c)
+               draw_client(old);
        draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
@@ -333,14 +345,13 @@ init_tags(Client *c)
 
        if(XGetClassHint(dpy, c->win, &ch)) {
                if(ch.res_class && ch.res_name) {
-                       fprintf(stderr, "%s:%s\n", ch.res_class, ch.res_name);
                        for(i = 0; i < len; i++)
                                if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
                                        && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
                                {
-                       fprintf(stderr, "->>>%s:%s\n", ch.res_class, ch.res_name);
                                        for(j = 0; j < TLast; j++)
                                                c->tags[j] = rule[i].tags[j];
+                                       c->floating = rule[i].floating;
                                        matched = True;
                                        break;
                                }
@@ -360,20 +371,23 @@ manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
+       Window trans;
 
        c = emallocz(sizeof(Client));
        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 = th;
+       c->th = bh;
        c->border = 1;
        c->proto = win_proto(c->win);
        update_size(c);
        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       XGetTransientForHint(dpy, c->win, &c->trans);
+       XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
@@ -390,7 +404,6 @@ manage(Window w, XWindowAttributes *wa)
        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,
@@ -399,6 +412,11 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
+
+       if(!c->floating)
+               c->floating = trans
+                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
        arrange(NULL);
        if(c->tags[tsel])
                focus(c);
@@ -463,14 +481,16 @@ gravitate(Client *c, Bool invert)
 
 
 void
-resize(Client *c)
+resize(Client *c, Bool inc)
 {
        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(inc) {
+               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)
@@ -480,6 +500,7 @@ resize(Client *c)
        if(c->maxh && c->h > c->maxh)
                c->h = c->maxh;
        resize_title(c);
+       XSetWindowBorderWidth(dpy, c->win, 1);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
        e.type = ConfigureNotify;
        e.event = c->win;
@@ -554,23 +575,29 @@ void
 draw_client(Client *c)
 {
        int i;
-       if(c == sel)
+       if(c == sel) {
+               draw_bar();
+               XUnmapWindow(dpy, c->title);
+               XSetWindowBorder(dpy, c->win, dc.fg);
                return;
+       }
+
+       XSetWindowBorder(dpy, c->win, dc.bg);
+       XMapWindow(dpy, c->title);
 
        dc.x = dc.y = 0;
-       dc.h = c->th;
 
        dc.w = 0;
        for(i = 0; i < TLast; i++) {
                if(c->tags[i]) {
                        dc.x += dc.w;
                        dc.w = textw(c->tags[i]) + dc.font.height;
-                       draw(True, c->tags[i]);
+                       drawtext(c->tags[i], True);
                }
        }
        dc.x += dc.w;
        dc.w = textw(c->name) + dc.font.height;
-       draw(True, c->name);
+       drawtext(c->name, True);
        XCopyArea(dpy, dc.drawable, c->title, dc.gc,
                        0, 0, c->tw, c->th, 0, 0);
        XFlush(dpy);