58 lines
1.7 KiB
Plaintext
58 lines
1.7 KiB
Plaintext
|
--- dwm.c
|
||
|
|
+++ dwm.c
|
||
|
|
@@ -64,7 +64,7 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||
|
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||
|
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||
|
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||
|
|
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkButton, ClkWinTitle,
|
||
|
|
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||
|
|
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||
|
|
|
||
|
|
typedef union {
|
||
|
|
@@ -431,23 +431,18 @@ buttonpress(XEvent *e)
|
||
|
|
}
|
||
|
|
if (ev->window == selmon->barwin) {
|
||
|
|
i = x = 0;
|
||
|
|
- x += TEXTW(buttonbar);
|
||
|
|
- if(ev->x < x) {
|
||
|
|
- click = ClkButton;
|
||
|
|
- } else {
|
||
|
|
- do
|
||
|
|
- x += TEXTW(tags[i]);
|
||
|
|
- while (ev->x >= x && ++i < LENGTH(tags));
|
||
|
|
- if (i < LENGTH(tags)) {
|
||
|
|
- click = ClkTagBar;
|
||
|
|
- arg.ui = 1 << i;
|
||
|
|
- } else if (ev->x < x + blw)
|
||
|
|
- click = ClkLtSymbol;
|
||
|
|
- else if (ev->x > selmon->ww - TEXTW(stext))
|
||
|
|
- click = ClkStatusText;
|
||
|
|
- else
|
||
|
|
- click = ClkWinTitle;
|
||
|
|
- }
|
||
|
|
+ do
|
||
|
|
+ x += TEXTW(tags[i]);
|
||
|
|
+ while (ev->x >= x && ++i < LENGTH(tags));
|
||
|
|
+ if (i < LENGTH(tags)) {
|
||
|
|
+ click = ClkTagBar;
|
||
|
|
+ arg.ui = 1 << i;
|
||
|
|
+ } else if (ev->x < x + blw)
|
||
|
|
+ click = ClkLtSymbol;
|
||
|
|
+ else if (ev->x > selmon->ww - TEXTW(stext))
|
||
|
|
+ click = ClkStatusText;
|
||
|
|
+ else
|
||
|
|
+ click = ClkWinTitle;
|
||
|
|
} else if ((c = wintoclient(ev->window))) {
|
||
|
|
focus(c);
|
||
|
|
restack(selmon);
|
||
|
|
@@ -719,9 +714,6 @@ drawbar(Monitor *m)
|
||
|
|
urg |= c->tags;
|
||
|
|
}
|
||
|
|
x = 0;
|
||
|
|
- w = blw = TEXTW(buttonbar);
|
||
|
|
- drw_setscheme(drw, scheme[SchemeNorm]);
|
||
|
|
- x = drw_text(drw, x, 0, w, bh, lrpad / 2, buttonbar, 0);
|
||
|
|
for (i = 0; i < LENGTH(tags); i++) {
|
||
|
|
w = TEXTW(tags[i]);
|
||
|
|
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
|