several other additions/fixes, dwm is quite usable already

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 95ec3a6..2ff1994 100644 (file)
--- a/client.c
+++ b/client.c
@@ -7,95 +7,218 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>

+#include <X11/Xutil.h>

 
 

-#include "util.h"
-#include "wm.h"
+#include "dwm.h"
+
+static void (*arrange)(Arg *) = floating;
+
+static void
+center(Client *c)
+{
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
+}
+
+static Client *
+next(Client *c)
+{
+       for(; c && !c->tags[tsel]; c = c->next);
+       return c;
+}
+
+void
+zoom(Arg *arg)
+{
+       Client **l;
+
+       if(!sel)
+               return;
+
+       for(l = &clients; *l && *l != sel; l = &(*l)->next);
+       *l = sel->next;
+
+       sel->next = clients; /* pop */
+       clients = sel;
+       arrange(NULL);
+       center(sel);
+       focus(sel);
+}
+
+void
+max(Arg *arg)
+{
+       if(!sel)
+               return;
+       sel->x = sx;
+       sel->y = sy;
+       sel->w = sw - 2 * sel->border;
+       sel->h = sh - 2 * sel->border;
+       craise(sel);
+       resize(sel);
+       discard_events(EnterWindowMask);
+}
+
+void
+view(Arg *arg)
+{
+       tsel = arg->i;
+       arrange(NULL);
+}

 
 void
 
 void

-max(void *aux)
+tag(Arg *arg)

 {
 {

-       if(!stack)
+       int i, n;
+       if(!sel)

                return;
                return;

-       stack->x = sx;
-       stack->y = bh;
-       stack->w = sw - 2 * stack->border;
-       stack->h = sh - bh - 2 * stack->border;
-       resize(stack);
+
+       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];
+       arrange(NULL);
+}
+
+static void
+ban_client(Client *c)
+{
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+}
+
+void
+floating(Arg *arg)
+{
+       Client *c;
+
+       arrange = floating;
+       for(c = clients; c; c = c->next) {
+               if(c->tags[tsel])
+                       resize(c);
+               else
+                       ban_client(c);
+       }
+       if(sel && !sel->tags[tsel]) {
+               if((sel = next(clients))) {
+                       craise(sel);
+                       focus(sel);
+               }
+       }

        discard_events(EnterWindowMask);
 }
 
 void
        discard_events(EnterWindowMask);
 }
 
 void

-arrange(void *aux)
+tiling(Arg *arg)

 {
        Client *c;
        int n, cols, rows, gw, gh, i, j;
     float rt, fd;
 
 {
        Client *c;
        int n, cols, rows, gw, gh, i, j;
     float rt, fd;
 

-       if(!clients)
-               return;
-       for(n = 0, c = clients; c; c = c->next, n++);
-       rt = sqrt(n);
-       if(modff(rt, &fd) < 0.5)
-               rows = floor(rt);
-       else
-               rows = ceil(rt);
-       if(rows * rows < n)
-               cols = rows + 1;
+       arrange = tiling;
+       for(n = 0, c = clients; c; c = next(c->next), n++);
+       if(n) {
+               rt = sqrt(n);
+               if(modff(rt, &fd) < 0.5)
+                       rows = floor(rt);
+               else
+                       rows = ceil(rt);
+               if(rows * rows < n)
+                       cols = rows + 1;
+               else
+                       cols = rows;
+
+               gw = (sw - 2)  / cols;
+               gh = (sh - 2) / rows;
+       }

        else
        else

-               cols = rows;
-
-       gw = (sw - 2)  / cols;
-       gh = (sh - bh - 2) / rows;
+               cols = rows = gw = gh = 0;

 
        for(i = j = 0, c = clients; c; c = c->next) {
 
        for(i = j = 0, c = clients; c; c = c->next) {

-               c->x = i * gw;
-               c->y = j * gh + bh;
-               c->w = gw;
-               c->h = gh;
-               resize(c);
-               if(++i == cols) {
-                       j++;
-                       i = 0;
+               if(c->tags[tsel]) {
+                       c->x = i * gw;
+                       c->y = j * gh;
+                       c->w = gw;
+                       c->h = gh;
+                       resize(c);
+                       if(++i == cols) {
+                               j++;
+                               i = 0;
+                       }
+               }
+               else
+                       ban_client(c);
+       }
+       if(sel && !sel->tags[tsel]) {
+               if((sel = next(clients))) {
+                       craise(sel);
+                       focus(sel);

                }
        }
        discard_events(EnterWindowMask);
 }
 
 void
                }
        }
        discard_events(EnterWindowMask);
 }
 
 void

-sel(void *aux)
+prevc(Arg *arg)

 {
 {

-       const char *arg = aux;
-       Client *c = NULL;
+       Client *c;

 
 

-       if(!arg || !stack)
+       if(!sel)

                return;
                return;

-       if(!strncmp(arg, "next", 5))
-               c = stack->snext ? stack->snext : stack;
-       else if(!strncmp(arg, "prev", 5))
-               for(c = stack; c && c->snext; c = c->snext);
-       if(!c)
-               c = stack;
-       raise(c);
-       focus(c);
+
+       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+               craise(c);
+               center(c);
+               focus(c);
+       }

 }
 
 void
 }
 
 void

-kill(void *aux)
+nextc(Arg *arg)

 {
 {

-       Client *c = stack;
+       Client *c;
+   
+       if(!sel)
+               return;
+
+       if(!(c = next(sel->next)))
+               c = next(clients);
+       if(c) {
+               craise(c);
+               center(c);
+               c->revert = sel;
+               focus(c);
+       }
+}

 
 

-       if(!c)
+void
+ckill(Arg *arg)
+{
+       if(!sel)

                return;
                return;

-       if(c->proto & WM_PROTOCOL_DELWIN)
-               send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+       if(sel->proto & WM_PROTOCOL_DELWIN)
+               send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);

        else
        else

-               XKillClient(dpy, c->win);
+               XKillClient(dpy, sel->win);

 }
 
 static void
 resize_title(Client *c)
 {
 }
 
 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(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;
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;


@@ -170,7 +293,7 @@ update_size(Client *c)
 }
 
 void
 }
 
 void

-raise(Client *c)
+craise(Client *c)

 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);
 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);


@@ -186,22 +309,18 @@ lower(Client *c)
 void
 focus(Client *c)
 {
 void
 focus(Client *c)
 {

-       Client **l, *old;
-
-       old = stack;
-       for(l = &stack; *l && *l != c; l = &(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
-       c->snext = stack;
-       stack = c;
-       if(old && old != c) {
-               XMapWindow(dpy, old->title);
-               draw_client(old);
+       if(sel && sel != c) {
+               XSetWindowBorder(dpy, sel->win, dc.bg);
+               XMapWindow(dpy, sel->title);
+               draw_client(sel);

        }
        }

+       sel = c;

        XUnmapWindow(dpy, c->title);
        XUnmapWindow(dpy, c->title);

+       XSetWindowBorder(dpy, c->win, dc.fg);

        draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
        draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);

+       discard_events(EnterWindowMask);

 }
 
 void
 }
 
 void


@@ -214,15 +333,12 @@ manage(Window w, XWindowAttributes *wa)
        c->win = w;
        c->tx = c->x = wa->x;
        c->ty = c->y = wa->y;
        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->tw = c->w = wa->width;
        c->h = wa->height;

-       c->th = bh;
+       c->th = th;

        c->border = 1;
        c->border = 1;

+       c->proto = win_proto(c->win);

        update_size(c);
        update_size(c);

-       XSetWindowBorderWidth(dpy, c->win, 1);
-       XSetWindowBorder(dpy, c->win, brush.border);

        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &c->trans);
        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &c->trans);


@@ -230,17 +346,19 @@ manage(Window w, XWindowAttributes *wa)
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 
        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);
        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);
+       for(l = &clients; *l; l = &(*l)->next);

        c->next = *l; /* *l == nil */
        *l = c;
        c->next = *l; /* *l == nil */
        *l = c;

-       c->snext = stack;
-       stack = c;
+
+       XSetWindowBorderWidth(dpy, c->win, 1);

        XMapRaised(dpy, c->win);
        XMapRaised(dpy, c->title);
        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
        XMapRaised(dpy, c->win);
        XMapRaised(dpy, c->title);
        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,


@@ -249,7 +367,8 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);

-       resize(c);
+       arrange(NULL);
+       center(c);

        focus(c);
 }
 
        focus(c);
 }
 


@@ -308,11 +427,24 @@ gravitate(Client *c, Bool invert)
        c->y += dy;
 }
 
        c->y += dy;
 }
 

+

 void
 resize(Client *c)
 {
        XConfigureEvent e;
 
 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;
        resize_title(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
        e.type = ConfigureNotify;


@@ -330,7 +462,7 @@ resize(Client *c)
 }
 
 static int
 }
 
 static int

-dummy_error_handler(Display *dpy, XErrorEvent *error)
+dummy_error_handler(Display *dsply, XErrorEvent *err)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -346,19 +478,22 @@ unmanage(Client *c)
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 

-       for(l=&clients; *l && *l != c; l=&(*l)->next);
-       eassert(*l == c);
+       for(l = &clients; *l && *l != c; l = &(*l)->next);

        *l = c->next;
        *l = c->next;

-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
+       for(l = &clients; *l; l = &(*l)->next)
+               if((*l)->revert == c)
+                       (*l)->revert = NULL;
+       if(sel == c)
+               sel = sel->revert ? sel->revert : clients;
+

        free(c);
 
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);
        free(c);
 
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);

-       if(stack)
-               focus(stack);
+       arrange(NULL);
+       if(sel)
+               focus(sel);

 }
 
 Client *
 }
 
 Client *


@@ -384,17 +519,25 @@ getclient(Window w)
 void
 draw_client(Client *c)
 {
 void
 draw_client(Client *c)
 {

-       if(c == stack) {
-               draw_bar();
+       int i;
+       if(c == sel)

                return;
                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(c->tags[i]) + dc.font.height;
+                       draw(True, c->tags[i]);
+               }
+       }
+       dc.x += dc.w;
+       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);
        XFlush(dpy);
 }
                        0, 0, c->tw, c->th, 0, 0);
        XFlush(dpy);
 }