s/TILED/TILE/g

[dwm.git] / client.c

diff --git a/client.c b/client.c
index cb5334e..c18d88b 100644 (file)
--- a/client.c
+++ b/client.c
@@ -28,19 +28,15 @@ resizetitle(Client *c)
 {
        int i;
 
 {
        int i;
 

-       c->tw = 0;
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i])
-                       c->tw += textw(tags[i]);
-       c->tw += textw(c->name);
+       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))
        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->title, c->tx, c->ty, c->tw, c->th);
+               XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);

        else
        else

-               XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
+               XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);

 
 }
 
 
 }
 


@@ -65,7 +61,7 @@ void
 ban(Client *c)
 {
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 ban(Client *c)
 {
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

-       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+       XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);

 }
 
 void
 }
 
 void


@@ -73,12 +69,14 @@ focus(Client *c)
 {
        Client *old = sel;
 
 {
        Client *old = sel;
 

-       if (!issel)
+       if(!issel)

                return;
                return;

-       if(sel && sel->ismax && sel != c)
-               togglemax(NULL);
-       sel = c;
-       if(old && old != c) {
+       if(!sel)
+               sel = c;
+       else if(sel != c) {
+               if(sel->ismax)
+                       togglemax(NULL);
+               sel = c;

                grabbutton(old, AnyButton, 0);
                drawtitle(old);
        }
                grabbutton(old, AnyButton, 0);
                drawtitle(old);
        }


@@ -87,40 +85,6 @@ focus(Client *c)
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
 
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
 

-void
-focusnext(Arg *arg)
-{
-       Client *c;
-   
-       if(!sel)
-               return;
-
-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-void
-focusprev(Arg *arg)
-{
-       Client *c;
-
-       if(!sel)
-               return;
-
-       if(!(c = getprev(sel->prev))) {
-               for(c = clients; c && c->next; c = c->next);
-               c = getprev(c);
-       }
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-

 Client *
 getclient(Window w)
 {
 Client *
 getclient(Window w)
 {


@@ -138,7 +102,7 @@ getctitle(Window w)
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(c->title == w)
+               if(c->twin == w)

                        return c;
        return NULL;
 }
                        return c;
        return NULL;
 }


@@ -212,6 +176,7 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

+       unsigned int i;

        Client *c, *tc;
        Window trans;
        XSetWindowAttributes twa;
        Client *c, *tc;
        Window trans;
        XSetWindowAttributes twa;


@@ -245,7 +210,7 @@ manage(Window w, XWindowAttributes *wa)
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask | EnterWindowMask;
 
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask | EnterWindowMask;
 

-       c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+       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);
                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);


@@ -259,7 +224,11 @@ manage(Window w, XWindowAttributes *wa)
        grabbutton(c, Button2, MODKEY);
        grabbutton(c, Button3, MODKEY);
 
        grabbutton(c, Button2, MODKEY);
        grabbutton(c, Button3, MODKEY);
 

-       settags(c);
+       if((tc = getclient(trans))) /* inherit tags */
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = tc->tags[i];
+       else
+               settags(c);

        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&


@@ -269,7 +238,7 @@ manage(Window w, XWindowAttributes *wa)
                sel = c;
        arrange(NULL);
        XMapWindow(dpy, c->win);
                sel = c;
        arrange(NULL);
        XMapWindow(dpy, c->win);

-       XMapWindow(dpy, c->title);
+       XMapWindow(dpy, c->twin);

        if(isvisible(c))
                focus(c);
 }
        if(isvisible(c))
                focus(c);
 }


@@ -356,7 +325,7 @@ void
 settitle(Client *c)
 {
        char **list = NULL;
 settitle(Client *c)
 {
        char **list = NULL;

-       int n;
+       int i, n;

        XTextProperty name;
 
        name.nitems = 0;
        XTextProperty name;
 
        name.nitems = 0;


@@ -419,7 +388,7 @@ unmanage(Client *c)
        XSetErrorHandler(xerrordummy);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XSetErrorHandler(xerrordummy);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

-       XDestroyWindow(dpy, c->title);
+       XDestroyWindow(dpy, c->twin);

 
        if(c->prev)
                c->prev->next = c->next;
 
        if(c->prev)
                c->prev->next = c->next;


@@ -439,30 +408,3 @@ unmanage(Client *c)
                focus(sel);
        arrange(NULL);
 }
                focus(sel);
        arrange(NULL);
 }

-
-void
-zoom(Arg *arg)
-{
-       Client *c;
-
-       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
-               return;
-
-       if(sel == getnext(clients))  {
-               if((c = getnext(sel->next)))
-                       sel = c;
-               else
-                       return;
-       }
-
-       /* pop */
-       sel->prev->next = sel->next;
-       if(sel->next)
-               sel->next->prev = sel->prev;
-       sel->prev = NULL;
-       clients->prev = sel;
-       sel->next = clients;
-       clients = sel;
-       focus(sel);
-       arrange(NULL);
-}