JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
rearranged several stuff
[dwm.git] / client.c
index caa523c..169c01e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -4,14 +4,39 @@
  */
 
 #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
-update_name(Client *c)
+ban(Client *c)
+{
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+}
+
+static void
+resizetitle(Client *c)
+{
+       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;
+       c->ty = c->y;
+       XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+}
+
+void
+settitle(Client *c)
 {
        XTextProperty name;
        int n;
@@ -35,20 +60,75 @@ update_name(Client *c)
                }
        }
        XFree(name.value);
+       resizetitle(c);
 }
 
 void
-focus(Client *c)
+setsize(Client *c)
+{
+       XSizeHints size;
+       long msize;
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+               size.flags = PSize;
+       c->flags = size.flags;
+       if(c->flags & PBaseSize) {
+               c->basew = size.base_width;
+               c->baseh = size.base_height;
+       }
+       else
+               c->basew = c->baseh = 0;
+       if(c->flags & PResizeInc) {
+               c->incw = size.width_inc;
+               c->inch = size.height_inc;
+       }
+       else
+               c->incw = c->inch = 0;
+       if(c->flags & PMaxSize) {
+               c->maxw = size.max_width;
+               c->maxh = size.max_height;
+       }
+       else
+               c->maxw = c->maxh = 0;
+       if(c->flags & PMinSize) {
+               c->minw = size.min_width;
+               c->minh = size.min_height;
+       }
+       else
+               c->minw = c->minh = 0;
+       if(c->flags & PWinGravity)
+               c->grav = size.win_gravity;
+       else
+               c->grav = NorthWestGravity;
+}
+
+void
+higher(Client *c)
 {
-       Client **l;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
-       c->snext = stack;
-       stack = c;
        XRaiseWindow(dpy, c->win);
+       XRaiseWindow(dpy, c->title);
+}
+
+void
+lower(Client *c)
+{
+       XLowerWindow(dpy, c->title);
+       XLowerWindow(dpy, c->win);
+}
+
+void
+focus(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
@@ -56,45 +136,162 @@ manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
-       long msize;
+       Window trans;
 
        c = emallocz(sizeof(Client));
        c->win = w;
-       c->r[RFloat].x = wa->x;
-       c->r[RFloat].y = wa->y;
-       c->r[RFloat].width = wa->width;
-       c->r[RFloat].height = wa->height;
-       c->border = wa->border_width;
-       XSetWindowBorderWidth(dpy, c->win, 0);
-       XGetTransientForHint(dpy, c->win, &c->trans);
-       if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize) || !c->size.flags)
-               c->size.flags = PSize;
-       c->fixedsize =
-               (c->size.flags & PMinSize && c->size.flags & PMaxSize
-                && c->size.min_width == c->size.max_width
-                && c->size.min_height == c->size.max_height);
-       update_name(c);
+       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->border = 1;
+       c->proto = getproto(c->win);
+       setsize(c);
+       XSelectInput(dpy, c->win,
+                       StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 
-       c->title = XCreateWindow(dpy, root, c->r[RFloat].x, c->r[RFloat].y,
-                       c->r[RFloat].width, barrect.height, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
+       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);
 
-       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;
-       XMapWindow(dpy, c->win);
-       focus(c);
+
+       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);
+
+       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, Bool inc)
+{
+       XConfigureEvent e;
+
+       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;
+       e.window = c->win;
+       e.x = c->x;
+       e.y = c->y;
+       e.width = c->w;
+       e.height = c->h;
+       e.border_width = c->border;
+       e.above = None;
+       e.override_redirect = False;
+       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
+       XFlush(dpy);
 }
 
 static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+xerrordummy(Display *dsply, XErrorEvent *ee)
 {
        return 0;
 }
@@ -105,25 +302,38 @@ unmanage(Client *c)
        Client **l;
 
        XGrabServer(dpy);
-       XSetErrorHandler(dummy_error_handler);
+       XSetErrorHandler(xerrordummy);
 
-       XUnmapWindow(dpy, c->win);
+       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);
-       flush_events(EnterWindowMask);
+       arrange(NULL);
+       if(sel)
+               focus(sel);
 }
 
+Client *
+getctitle(Window w)
+{
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->title == w)
+                       return c;
+       return NULL;
+}
 
 Client *
 getclient(Window w)
@@ -135,3 +345,79 @@ getclient(Window w)
        return NULL;
 }
 
+void
+zoom(Arg *arg)
+{
+       Client **l, *c;
+
+       if(!sel)
+               return;
+
+       if(sel == getnext(clients) && sel->next)  {
+               if((c = getnext(sel->next)))
+                       sel = c;
+       }
+
+       for(l = &clients; *l && *l != sel; l = &(*l)->next);
+       *l = sel->next;
+
+       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);
+}