removed client title bar

[dwm.git] / client.c

diff --git a/client.c b/client.c
index d691340..af13797 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -60,12 +60,6 @@ xerrordummy(Display *dsply, XErrorEvent *ee) {
 
 /* extern functions */
 
-void
-ban(Client *c) {
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
-}
-
 void
 configure(Client *c) {
        XEvent synev;
@@ -96,7 +90,7 @@ focus(Client *c) {
                sel = c;
                if(old) {
                        grabbuttons(old, False);
-                       drawtitle(old);
+                       drawclient(old);
                }
        }
        if(c) {
@@ -104,7 +98,7 @@ focus(Client *c) {
                c->snext = stack;
                stack = c;
                grabbuttons(c, True);
-               drawtitle(c);
+               drawclient(c);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else
@@ -121,69 +115,6 @@ getclient(Window w) {
        return NULL;
 }
 
-Client *
-getctitle(Window w) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->twin == w)
-                       return c;
-       return NULL;
-}
-
-void
-gravitate(Client *c, Bool invert) {
-       int dx = 0, dy = 0;
-
-       return;
-       switch(c->grav) {
-       default:
-               break;
-       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;
-       }
-       switch (c->grav) {
-       default:
-               break;
-       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;
-       }
-       if(invert) {
-               dx = -dx;
-               dy = -dy;
-       }
-       c->x += dx;
-       c->y += dy;
-}
-
 void
 killclient(Arg *arg) {
        if(!sel)
@@ -198,18 +129,16 @@ void
 manage(Window w, XWindowAttributes *wa) {
        Client *c;
        Window trans;
-       XSetWindowAttributes twa;
 
        c = emallocz(sizeof(Client));
        c->tags = emallocz(ntags * sizeof(Bool));
        c->win = w;
        c->border = 0;
-       c->x = c->tx = wa->x;
-       c->y = c->ty = wa->y;
-       c->w = c->tw = wa->width;
+       c->x = wa->x;
+       c->y = wa->y;
+       c->w = wa->width;
        c->h = wa->height;
-       c->th = bh;
-       updatesize(c);
+       updatesizehints(c);
        if(c->x + c->w + 2 * BORDERPX > sw)
                c->x = sw - c->w - 2 * BORDERPX;
        if(c->x < sx)
@@ -222,27 +151,18 @@ manage(Window w, XWindowAttributes *wa) {
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);
-       twa.override_redirect = 1;
-       twa.background_pixmap = ParentRelative;
-       twa.event_mask = ExposureMask | EnterWindowMask;
-       c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
-                       0, DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
        grabbuttons(c, False);
        updatetitle(c);
        settags(c, getclient(trans));
        if(!c->isfloat)
                c->isfloat = trans || c->isfixed;
-       resizetitle(c);
        if(clients)
                clients->prev = c;
        c->next = clients;
        c->snext = stack;
        stack = clients = c;
-       ban(c);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMapWindow(dpy, c->win);
-       XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);
        arrange();
@@ -281,7 +201,6 @@ resize(Client *c, Bool sizehints, Corner sticky) {
                c->x = sw - c->w;
        if(c->y > sh)
                c->y = sh - c->h;
-       resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;
@@ -291,25 +210,12 @@ resize(Client *c, Bool sizehints, Corner sticky) {
        else
                wc.border_width = BORDERPX;
        XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
-       /*configure(c);*/
+       configure(c);
        XSync(dpy, False);
 }
 
 void
-resizetitle(Client *c) {
-       c->tw = textw(c->name);
-       if(c->tw > c->w)
-               c->tw = c->w + 2 * BORDERPX;
-       c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
-       c->ty = c->y;
-       if(isvisible(c))
-               XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
-       else
-               XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
-}
-
-void
-updatesize(Client *c) {
+updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
@@ -342,10 +248,6 @@ updatesize(Client *c) {
                c->minw = c->minh = 0;
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
                                c->maxw == c->minw && c->maxh == c->minh);
-       if(c->flags & PWinGravity)
-               c->grav = size.win_gravity;
-       else
-               c->grav = NorthWestGravity;
 }
 
 void
@@ -388,7 +290,6 @@ unmanage(Client *c) {
                focus(nc);
        }
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       XDestroyWindow(dpy, c->twin);
        free(c->tags);
        free(c);
        XSync(dpy, False);