JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
rearranged several stuff
[dwm.git] / client.c
index 537336c..169c01e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -3,97 +3,31 @@
  * See LICENSE file for license details.
  */
 
-#include <math.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
 
-#include "util.h"
-#include "wm.h"
+#include "dwm.h"
 
 void
-max(void *aux)
+ban(Client *c)
 {
-       if(!stack)
-               return;
-       stack->x = sx;
-       stack->y = bh;
-       stack->w = sw - 2;
-       stack->h = sh - bh - 2;
-       resize(stack);
-}
-
-void
-arrange(void *aux)
-{
-       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;
-       else
-               cols = rows;
-
-       gw = (sw - 1)  / cols;
-       gh = (sh - bh - 1) / rows;
-
-       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;
-               }
-       }
-}
-
-void
-sel(void *aux)
-{
-       const char *arg = aux;
-       Client *c = NULL;
-
-       if(!arg || !stack)
-               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);
-}
-
-void
-kill(void *aux)
-{
-       Client *c = stack;
-
-       if(!c)
-               return;
-       if(c->proto & WM_PROTOCOL_DELWIN)
-               send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-       else
-               XKillClient(dpy, c->win);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 
 static void
-resize_title(Client *c)
+resizetitle(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]);
+       c->tw += textw(c->name);
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
@@ -102,7 +36,7 @@ resize_title(Client *c)
 }
 
 void
-update_name(Client *c)
+settitle(Client *c)
 {
        XTextProperty name;
        int n;
@@ -126,11 +60,11 @@ update_name(Client *c)
                }
        }
        XFree(name.value);
-       resize_title(c);
+       resizetitle(c);
 }
 
 void
-update_size(Client *c)
+setsize(Client *c)
 {
        XSizeHints size;
        long msize;
@@ -161,10 +95,14 @@ update_size(Client *c)
        }
        else
                c->minw = c->minh = 0;
+       if(c->flags & PWinGravity)
+               c->grav = size.win_gravity;
+       else
+               c->grav = NorthWestGravity;
 }
 
 void
-raise(Client *c)
+higher(Client *c)
 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);
@@ -180,22 +118,17 @@ lower(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);
-       }
-       XUnmapWindow(dpy, c->title);
-       draw_client(c);
+       Client *old = sel;
+       XEvent ev;
+
+       XFlush(dpy);
+       sel = c;
+       if(old && old != c)
+               drawtitle(old);
+       drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
@@ -203,6 +136,7 @@ manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
+       Window trans;
 
        c = emallocz(sizeof(Client));
        c->win = w;
@@ -213,12 +147,12 @@ manage(Window w, XWindowAttributes *wa)
        c->tw = c->w = wa->width;
        c->h = wa->height;
        c->th = bh;
-       update_size(c);
-       XSetWindowBorderWidth(dpy, c->win, 1);
-       XSetWindowBorder(dpy, c->win, brush.border);
+       c->border = 1;
+       c->proto = getproto(c->win);
+       setsize(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;
@@ -227,31 +161,120 @@ manage(Window w, XWindowAttributes *wa)
                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
-       update_name(c);
 
-       for(l=&clients; *l; l=&(*l)->next);
+       settitle(c);
+       settags(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,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
-       resize(c);
-       focus(c);
+
+       if(!c->dofloat)
+               c->dofloat = trans
+                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
+       arrange(NULL);
+       /* mapping the window now prevents flicker */
+       if(c->tags[tsel]) {
+               XMapRaised(dpy, c->win);
+               XMapRaised(dpy, c->title);
+               focus(c);
+       }
+       else {
+               ban(c);
+               XMapRaised(dpy, c->win);
+               XMapRaised(dpy, c->title);
+       }
+}
+
+void
+gravitate(Client *c, Bool invert)
+{
+       int dx = 0, dy = 0;
+
+       switch(c->grav) {
+       case StaticGravity:
+       case NorthWestGravity:
+       case NorthGravity:
+       case NorthEastGravity:
+               dy = c->border;
+               break;
+       case EastGravity:
+       case CenterGravity:
+       case WestGravity:
+               dy = -(c->h / 2) + c->border;
+               break;
+       case SouthEastGravity:
+       case SouthGravity:
+       case SouthWestGravity:
+               dy = -c->h;
+               break;
+       default:
+               break;
+       }
+
+       switch (c->grav) {
+       case StaticGravity:
+       case NorthWestGravity:
+       case WestGravity:
+       case SouthWestGravity:
+               dx = c->border;
+               break;
+       case NorthGravity:
+       case CenterGravity:
+       case SouthGravity:
+               dx = -(c->w / 2) + c->border;
+               break;
+       case NorthEastGravity:
+       case EastGravity:
+       case SouthEastGravity:
+               dx = -(c->w + c->border);
+               break;
+       default:
+               break;
+       }
+
+       if(invert) {
+               dx = -dx;
+               dy = -dy;
+       }
+       c->x += dx;
+       c->y += dy;
 }
 
+
 void
-resize(Client *c)
+resize(Client *c, Bool inc)
 {
        XConfigureEvent e;
 
-       resize_title(c);
+       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->x > sw) /* might happen on restart */
+               c->x = sw - c->w;
+       if(c->y > sh)
+               c->ty = c->y = sh - c->h;
+       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;
+       resizetitle(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;
@@ -260,7 +283,7 @@ resize(Client *c)
        e.y = c->y;
        e.width = c->w;
        e.height = c->h;
-       e.border_width = 0;
+       e.border_width = c->border;
        e.above = None;
        e.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
@@ -268,7 +291,7 @@ resize(Client *c)
 }
 
 static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+xerrordummy(Display *dsply, XErrorEvent *ee)
 {
        return 0;
 }
@@ -279,28 +302,31 @@ unmanage(Client *c)
        Client **l;
 
        XGrabServer(dpy);
-       XSetErrorHandler(dummy_error_handler);
+       XSetErrorHandler(xerrordummy);
 
        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;
-       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);
+       XSetErrorHandler(xerror);
        XUngrabServer(dpy);
-       if(stack)
-               focus(stack);
+       arrange(NULL);
+       if(sel)
+               focus(sel);
 }
 
 Client *
-gettitle(Window w)
+getctitle(Window w)
 {
        Client *c;
        for(c = clients; c; c = c->next)
@@ -320,19 +346,78 @@ getclient(Window w)
 }
 
 void
-draw_client(Client *c)
+zoom(Arg *arg)
 {
-       if(c == stack) {
-               draw_bar();
+       Client **l, *c;
+
+       if(!sel)
                return;
+
+       if(sel == getnext(clients) && sel->next)  {
+               if((c = getnext(sel->next)))
+                       sel = c;
        }
 
-       brush.x = brush.y = 0;
-       brush.w = c->tw;
-       brush.h = c->th;
+       for(l = &clients; *l && *l != sel; l = &(*l)->next);
+       *l = sel->next;
 
-       draw(dpy, &brush, True, c->name);
-       XCopyArea(dpy, brush.drawable, c->title, brush.gc,
-                       0, 0, c->tw, c->th, 0, 0);
-       XFlush(dpy);
+       sel->next = clients; /* pop */
+       clients = sel;
+       arrange(NULL);
+       focus(sel);
+}
+
+void
+maximize(Arg *arg)
+{
+       if(!sel)
+               return;
+       sel->x = sx;
+       sel->y = sy + bh;
+       sel->w = sw - 2 * sel->border;
+       sel->h = sh - 2 * sel->border - bh;
+       higher(sel);
+       resize(sel, False);
+}
+
+void
+focusprev(Arg *arg)
+{
+       Client *c;
+
+       if(!sel)
+               return;
+
+       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+               higher(c);
+               focus(c);
+       }
+}
+
+void
+focusnext(Arg *arg)
+{
+       Client *c;
+   
+       if(!sel)
+               return;
+
+       if(!(c = getnext(sel->next)))
+               c = getnext(clients);
+       if(c) {
+               higher(c);
+               c->revert = sel;
+               focus(c);
+       }
+}
+
+void
+killclient(Arg *arg)
+{
+       if(!sel)
+               return;
+       if(sel->proto & WM_PROTOCOL_DELWIN)
+               sendevent(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+       else
+               XKillClient(dpy, sel->win);
 }