removed swap(), implemented pop for everything

[dwm.git] / client.c

diff --git a/client.c b/client.c
index d5bc30e..8110263 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,5 +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"
  * See LICENSE file for license details.
  */
 #include "dwm.h"


@@ -54,19 +53,6 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
                                GrabModeAsync, GrabModeSync, None, None);
 }
 

-static void
-resizetitle(Client *c) {
-       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;
-       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);
-}
-

 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;


@@ -80,6 +66,23 @@ ban(Client *c) {
        XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
        XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 

+void
+configure(Client *c) {
+       XEvent synev;
+
+       synev.type = ConfigureNotify;
+       synev.xconfigure.display = dpy;
+       synev.xconfigure.event = c->win;
+       synev.xconfigure.window = c->win;
+       synev.xconfigure.x = c->x;
+       synev.xconfigure.y = c->y;
+       synev.xconfigure.width = c->w;
+       synev.xconfigure.height = c->h;
+       synev.xconfigure.border_width = c->border;
+       synev.xconfigure.above = None;
+       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+

 void
 focus(Client *c) {
        Client *old;
 void
 focus(Client *c) {
        Client *old;


@@ -93,7 +96,7 @@ focus(Client *c) {
                sel = c;
                if(old) {
                        grabbuttons(old, False);
                sel = c;
                if(old) {
                        grabbuttons(old, False);

-                       drawtitle(old);
+                       drawclient(old);

                }
        }
        if(c) {
                }
        }
        if(c) {


@@ -101,7 +104,7 @@ focus(Client *c) {
                c->snext = stack;
                stack = c;
                grabbuttons(c, True);
                c->snext = stack;
                stack = c;
                grabbuttons(c, True);

-               drawtitle(c);
+               drawclient(c);

                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else


@@ -128,60 +131,6 @@ getctitle(Window w) {
        return NULL;
 }
 
        return NULL;
 }
 

-void
-gravitate(Client *c, Bool invert) {
-       int dx = 0, dy = 0;
-
-       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)
 void
 killclient(Arg *arg) {
        if(!sel)


@@ -201,24 +150,21 @@ manage(Window w, XWindowAttributes *wa) {
        c = emallocz(sizeof(Client));
        c->tags = emallocz(ntags * sizeof(Bool));
        c->win = w;
        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->h = wa->height;
        c->th = bh;
        c->x = c->tx = wa->x;
        c->y = c->ty = wa->y;
        c->w = c->tw = wa->width;
        c->h = wa->height;
        c->th = bh;

-
-       c->border = 0;
-       updatesize(c);
-
-       if(c->x + c->w + 2 > sw)
-               c->x = sw - c->w - 2;
-       if(c->x < 0)
-               c->x = 0;
-       if(c->y + c->h + 2 > sh)
-               c->y = sh - c->h - 2;
+       updatesizehints(c);
+       if(c->x + c->w + 2 * BORDERPX > sw)
+               c->x = sw - c->w - 2 * BORDERPX;
+       if(c->x < sx)
+               c->x = sx;
+       if(c->y + c->h + 2 * BORDERPX > sh)
+               c->y = sh - c->h - 2 * BORDERPX;

        if(c->h != sh && c->y < bh)
                c->y = bh;
        if(c->h != sh && c->y < bh)
                c->y = bh;

-

        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);


@@ -226,32 +172,27 @@ manage(Window w, XWindowAttributes *wa) {
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask | EnterWindowMask;
        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);
        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);
        grabbuttons(c, False);

+       updatetitle(c);

        settags(c, getclient(trans));
        if(!c->isfloat)
        settags(c, getclient(trans));
        if(!c->isfloat)

-               c->isfloat = trans
-                       || (c->maxw && c->minw &&
-                               c->maxw == c->minw && c->maxh == c->minh);
-
+               c->isfloat = trans || c->isfixed;
+       resizetitle(c);

        if(clients)
                clients->prev = c;
        c->next = clients;
        c->snext = stack;
        stack = clients = c;
        if(clients)
                clients->prev = c;
        c->next = clients;
        c->snext = stack;
        stack = clients = c;

-
-       updatetitle(c);

        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);
        ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);

-       arrange(NULL);
+       arrange();

 }
 
 void
 }
 
 void


@@ -278,17 +219,15 @@ resize(Client *c, Bool sizehints, Corner sticky) {
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;

-

        /* offscreen appearance fixes */
        /* offscreen appearance fixes */

-       if(c->x + c->w < 0)
-               c->x = 0;
+       if(c->x + c->w < sx)
+               c->x = sx;

        if(c->y + c->h < bh)
                c->y = bh;
        if(c->x > sw)
                c->x = sw - c->w;
        if(c->y > sh)
                c->y = sh - c->h;
        if(c->y + c->h < bh)
                c->y = bh;
        if(c->x > sw)
                c->x = sw - c->w;
        if(c->y > sh)
                c->y = sh - c->h;

-

        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;
        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;


@@ -297,13 +236,27 @@ resize(Client *c, Bool sizehints, Corner sticky) {
        if(c->w == sw && c->h == sh)
                wc.border_width = 0;
        else
        if(c->w == sw && c->h == sh)
                wc.border_width = 0;
        else

-               wc.border_width = 1;
+               wc.border_width = BORDERPX;

        XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
        XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);

+       configure(c);

        XSync(dpy, False);
 }
 
 void
        XSync(dpy, False);
 }
 
 void

-updatesize(Client *c) {
+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
+updatesizehints(Client *c) {

        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 


@@ -334,10 +287,8 @@ updatesize(Client *c) {
        }
        else
                c->minw = c->minh = 0;
        }
        else
                c->minw = c->minh = 0;

-       if(c->flags & PWinGravity)
-               c->grav = size.win_gravity;
-       else
-               c->grav = NorthWestGravity;
+       c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
+                               c->maxw == c->minw && c->maxh == c->minh);

 }
 
 void
 }
 
 void


@@ -354,17 +305,16 @@ updatetitle(Client *c) {
        if(!name.nitems)
                return;
        if(name.encoding == XA_STRING)
        if(!name.nitems)
                return;
        if(name.encoding == XA_STRING)

-               strncpy(c->name, (char *)name.value, sizeof(c->name));
+               strncpy(c->name, (char *)name.value, sizeof c->name);

        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                                && n > 0 && *list)
                {
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                                && n > 0 && *list)
                {

-                       strncpy(c->name, *list, sizeof(c->name));
+                       strncpy(c->name, *list, sizeof c->name);

                        XFreeStringList(list);
                }
        }
        XFree(name.value);
                        XFreeStringList(list);
                }
        }
        XFree(name.value);

-       resizetitle(c);

 }
 
 void
 }
 
 void


@@ -374,22 +324,18 @@ unmanage(Client *c) {
        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);

-

        detach(c);
        detachstack(c);
        if(sel == c) {
                for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
                focus(nc);
        }
        detach(c);
        detachstack(c);
        if(sel == c) {
                for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
                focus(nc);
        }

-

        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);

-

        free(c->tags);
        free(c);
        free(c->tags);
        free(c);

-

        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       arrange(NULL);
+       arrange();

 }
 }