sanitized names

[dwm.git] / client.c

diff --git a/client.c b/client.c
index b2318ab..7bb8459 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,210 +11,25 @@
 
 #include "dwm.h"
 
 
 #include "dwm.h"
 

-void (*arrange)(Arg *) = tiling;
-

 static Rule rule[] = {
        /* class                        instance        tags                                            floating */
        { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
 };
 
 static Rule rule[] = {
        /* class                        instance        tags                                            floating */
        { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
 };
 

-static Client *
-next(Client *c)
+Client *
+getnext(Client *c)

 {
        for(; c && !c->tags[tsel]; c = c->next);
        return c;
 }
 
 void
 {
        for(; c && !c->tags[tsel]; c = c->next);
        return c;
 }
 
 void

-zoom(Arg *arg)
-{
-       Client **l, *old;
-
-       if(!(old = sel))
-               return;
-
-       for(l = &clients; *l && *l != sel; l = &(*l)->next);
-       *l = sel->next;
-
-       old->next = clients; /* pop */
-       clients = old;
-       sel = old;
-       arrange(NULL);
-       focus(sel);
-}
-
-void
-max(Arg *arg)
-{
-       if(!sel)
-               return;
-       sel->x = sx;
-       sel->y = sy;
-       sel->w = sw - 2 * sel->border;
-       sel->h = sh - 2 * sel->border;
-       craise(sel);
-       resize(sel, False);
-       discard_events(EnterWindowMask);
-}
-
-void
-view(Arg *arg)
-{
-       Client *c;
-
-       tsel = arg->i;
-       arrange(NULL);
-
-       for(c = clients; c; c = next(c->next))
-               draw_client(c);
-}
-
-void
-tappend(Arg *arg)
-{
-       if(!sel)
-               return;
-
-       sel->tags[arg->i] = tags[arg->i];
-       arrange(NULL);
-}
-
-void
-ttrunc(Arg *arg)
-{
-       int i;
-       if(!sel)
-               return;
-
-       for(i = 0; i < TLast; i++)
-               sel->tags[i] = NULL;
-       tappend(arg);
-}
-
-static void
-ban_client(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);
 }
 
 {
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 

-void
-floating(Arg *arg)
-{
-       Client *c;
-
-       arrange = floating;
-       for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
-                       resize(c, True);
-               else
-                       ban_client(c);
-       }
-       if(sel && !sel->tags[tsel]) {
-               if((sel = next(clients))) {
-                       craise(sel);
-                       focus(sel);
-               }
-       }
-       discard_events(EnterWindowMask);
-}
-
-void
-tiling(Arg *arg)
-{
-       Client *c;
-       int n, i, w, h;
-
-       w = sw - mw;
-       arrange = tiling;
-       for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel] && !c->floating)
-                       n++;
-
-       h = (n > 1) ? sh / (n - 1) : sh;
-
-       for(i = 0, c = clients; c; c = c->next) {
-               if(c->tags[tsel]) {
-                       if(c->floating) {
-                               craise(c);
-                               resize(c, True);
-                               continue;
-                       }
-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy;
-                               c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border;
-                       }
-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy;
-                               c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border;
-                       }
-                       else {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
-                       }
-                       resize(c, False);
-                       i++;
-               }
-               else
-                       ban_client(c);
-       }
-       if(sel && !sel->tags[tsel]) {
-               if((sel = next(clients))) {
-                       craise(sel);
-                       focus(sel);
-               }
-       }
-       discard_events(EnterWindowMask);
-}
-
-void
-prevc(Arg *arg)
-{
-       Client *c;
-
-       if(!sel)
-               return;
-
-       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-               craise(c);
-               focus(c);
-       }
-}
-
-void
-nextc(Arg *arg)
-{
-       Client *c;
-   
-       if(!sel)
-               return;
-
-       if(!(c = next(sel->next)))
-               c = next(clients);
-       if(c) {
-               craise(c);
-               c->revert = sel;
-               focus(c);
-       }
-}
-
-void
-ckill(Arg *arg)
-{
-       if(!sel)
-               return;
-       if(sel->proto & WM_PROTOCOL_DELWIN)
-               send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-       else
-               XKillClient(dpy, sel->win);
-}
-

 static void
 resize_title(Client *c)
 {
 static void
 resize_title(Client *c)
 {


@@ -223,8 +38,8 @@ resize_title(Client *c)
        c->tw = 0;
        for(i = 0; i < TLast; i++)
                if(c->tags[i])
        c->tw = 0;
        for(i = 0; i < TLast; i++)
                if(c->tags[i])

-                       c->tw += textw(c->tags[i]) + dc.font.height;
-       c->tw += textw(c->name) + dc.font.height;
+                       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;
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;


@@ -233,7 +48,7 @@ resize_title(Client *c)
 }
 
 void
 }
 
 void

-update_name(Client *c)
+settitle(Client *c)

 {
        XTextProperty name;
        int n;
 {
        XTextProperty name;
        int n;


@@ -261,7 +76,7 @@ update_name(Client *c)
 }
 
 void
 }
 
 void

-update_size(Client *c)
+setsize(Client *c)

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


@@ -299,7 +114,7 @@ update_size(Client *c)
 }
 
 void
 }
 
 void

-craise(Client *c)
+higher(Client *c)

 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);
 {
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->title);


@@ -316,14 +131,16 @@ void
 focus(Client *c)
 {
        Client *old = sel;
 focus(Client *c)
 {
        Client *old = sel;

+       XEvent ev;

 
 

+       XFlush(dpy);

        sel = c;
        if(old && old != c)
        sel = c;
        if(old && old != c)

-               draw_client(old);
-       draw_client(c);
+               drawtitle(old);
+       drawtitle(c);

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

-       discard_events(EnterWindowMask);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 static void
 }
 
 static void


@@ -373,12 +190,14 @@ manage(Window w, XWindowAttributes *wa)
        c->win = w;
        c->tx = c->x = wa->x;
        c->ty = c->y = wa->y;
        c->win = w;
        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->tw = c->w = wa->width;
        c->h = wa->height;

-       c->th = th;
+       c->th = bh;

        c->border = 1;
        c->border = 1;

-       c->proto = win_proto(c->win);
-       update_size(c);
+       c->proto = proto(c->win);
+       setsize(c);

        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);
        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);


@@ -391,16 +210,13 @@ manage(Window w, XWindowAttributes *wa)
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 

-       update_name(c);
+       settitle(c);

        init_tags(c);
 
        for(l = &clients; *l; l = &(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;
 
        init_tags(c);
 
        for(l = &clients; *l; l = &(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;
 

-       XSetWindowBorderWidth(dpy, c->win, 1);
-       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,
        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,


@@ -413,10 +229,17 @@ manage(Window w, XWindowAttributes *wa)
                        || ((c->maxw == c->minw) && (c->maxh == c->minh));
 
        arrange(NULL);
                        || ((c->maxw == c->minw) && (c->maxh == c->minh));
 
        arrange(NULL);

-       if(c->tags[tsel])
+       /* mapping the window now prevents flicker */
+       if(c->tags[tsel]) {
+               XMapRaised(dpy, c->win);
+               XMapRaised(dpy, c->title);

                focus(c);
                focus(c);

-       else
-               ban_client(c);
+       }
+       else {
+               ban(c);
+               XMapRaised(dpy, c->win);
+               XMapRaised(dpy, c->title);
+       }

 }
 
 void
 }
 
 void


@@ -486,6 +309,10 @@ resize(Client *c, Bool inc)
                if(c->inch)
                        c->h -= (c->h - c->baseh) % c->inch;
        }
                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)
        if(c->minw && c->w < c->minw)
                c->w = c->minw;
        if(c->minh && c->h < c->minh)


@@ -495,6 +322,7 @@ resize(Client *c, Bool inc)
        if(c->maxh && c->h > c->maxh)
                c->h = c->maxh;
        resize_title(c);
        if(c->maxh && c->h > c->maxh)
                c->h = c->maxh;
        resize_title(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;
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
        e.type = ConfigureNotify;
        e.event = c->win;


@@ -511,7 +339,7 @@ resize(Client *c, Bool inc)
 }
 
 static int
 }
 
 static int

-dummy_error_handler(Display *dsply, XErrorEvent *err)
+dummy_xerror(Display *dsply, XErrorEvent *err)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -522,7 +350,7 @@ unmanage(Client *c)
        Client **l;
 
        XGrabServer(dpy);
        Client **l;
 
        XGrabServer(dpy);

-       XSetErrorHandler(dummy_error_handler);
+       XSetErrorHandler(dummy_xerror);

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


@@ -538,7 +366,7 @@ unmanage(Client *c)
        free(c);
 
        XFlush(dpy);
        free(c);
 
        XFlush(dpy);

-       XSetErrorHandler(error_handler);
+       XSetErrorHandler(xerror);

        XUngrabServer(dpy);
        arrange(NULL);
        if(sel)
        XUngrabServer(dpy);
        arrange(NULL);
        if(sel)


@@ -564,35 +392,3 @@ getclient(Window w)
                        return c;
        return NULL;
 }
                        return c;
        return NULL;
 }

-
-void
-draw_client(Client *c)
-{
-       int i;
-       if(c == sel) {
-               XUnmapWindow(dpy, c->title);
-               XSetWindowBorder(dpy, c->win, dc.fg);
-               return;
-       }
-
-       XSetWindowBorder(dpy, c->win, dc.bg);
-       XMapWindow(dpy, c->title);
-
-       dc.x = dc.y = 0;
-       dc.h = c->th;
-
-       dc.w = 0;
-       for(i = 0; i < TLast; i++) {
-               if(c->tags[i]) {
-                       dc.x += dc.w;
-                       dc.w = textw(c->tags[i]) + dc.font.height;
-                       draw(True, c->tags[i]);
-               }
-       }
-       dc.x += dc.w;
-       dc.w = textw(c->name) + dc.font.height;
-       draw(True, c->name);
-       XCopyArea(dpy, dc.drawable, c->title, dc.gc,
-                       0, 0, c->tw, c->th, 0, 0);
-       XFlush(dpy);
-}