2 files changed, 10 insertions, 20 deletions

diff --git a/config.h b/config.h
index 5293939..9d05af4 100644
--- a/config.h
+++ b/config.h
@@ -146,10 +146,10 @@ static Button buttons[] = {
         /* click                event mask      button          function        argument */
         { ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
         { ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[5]}},
-        { ClkWinTitle,          0,              Button2,        zoom,           {0} },
         { ClkStatusText,        0,              Button1,        sigstatusbar,   {.i = 1} },
         { ClkStatusText,        0,              Button2,        sigstatusbar,   {.i = 2} },
         { ClkStatusText,        0,              Button3,        sigstatusbar,   {.i = 3} },
+        { ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
         { ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
         { ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
         { ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
diff --git a/dwm.c b/dwm.c
index df84af1..c983b33 100644
--- a/dwm.c
+++ b/dwm.c
@@ -68,8 +68,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
        NetWMFullscreen, NetActiveWindow, NetWMWindowType,
        NetWMWindowTypeDialog, NetClientList, NetClientInfo, NetLast }; /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
-       ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin,
+       ClkRootWin, ClkLast }; /* clicks */
 
 typedef union {
         int i;
@@ -531,9 +531,11 @@ buttonpress(XEvent *e)
                         arg.ui = 1 << i;
                 } else if (ev->x < x + blw)
                         click = ClkLtSymbol;
-                else if (ev->x > selmon->ww - statusw) {
-                        x = selmon->ww - statusw;
+                else
                         click = ClkStatusText;
+        } else if ((c = wintoclient(ev->window))) {
+                focus(c);
+                restack(selmon);
                         statussig = 0;
                         for (text = s = stext; *s && x <= ev->x; s++) {
                                 if ((unsigned char)(*s) < ' ') {
@@ -547,8 +549,6 @@ buttonpress(XEvent *e)
                                         statussig = ch;
                                 }
             }
-                } else
-                        click = ClkWinTitle;
         } else if ((c = wintoclient(ev->window))) {
                 focus(c);
                 restack(selmon);
@@ -868,15 +868,8 @@ drawbar(Monitor *m)
         x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
 
         if ((w = m->ww - sw - x) > bh) {
-                if (m->sel) {
-                        drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
-                        drw_text(drw, x, 0, w - 2 * sp, bh, lrpad / 2, m->sel->name, 0);
-                        if (m->sel->isfloating)
-                                drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
-                } else {
-                        drw_setscheme(drw, scheme[SchemeNorm]);
-                        drw_rect(drw, x, 0, w - 2 * sp, bh, 1, 1);
-                }
+                drw_setscheme(drw, scheme[SchemeNorm]);
+                drw_rect(drw, x, 0, w - 2 * sp, bh, 1, 1);
         }
         drw_map(drw, m->barwin, 0, 0, m->ww, bh);
 }
@@ -1422,11 +1415,8 @@ propertynotify(XEvent *e)
                         drawbars();
                         break;
                 }
-                if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+                if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
                         updatetitle(c);
-                        if (c == c->mon->sel)
-                                drawbar(c->mon);
-                }
                 if (ev->atom == netatom[NetWMWindowType])
                         updatewindowtype(c);
         }