| changeset 674 | 5d79c351e30a |
| parent 650 | f3b8c71a69d4 |
| child 675 | 1438e35b622e |
| 673:d47d6e28441b | 674:5d79c351e30a |
|---|---|
15 #include <X11/Xatom.h> |
15 #include <X11/Xatom.h> |
16 #include <X11/Xproto.h> |
16 #include <X11/Xproto.h> |
17 |
17 |
18 /* extern */ |
18 /* extern */ |
19 |
19 |
20 char stext[1024]; |
20 char stext[1024], mtext[32]; |
21 Bool *seltag; |
21 Bool *seltag; |
22 int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah; |
22 int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah; |
23 unsigned int master, nmaster, ntags, numlockmask; |
23 unsigned int master, nmaster, ntags, numlockmask; |
24 Atom wmatom[WMLast], netatom[NetLast]; |
24 Atom wmatom[WMLast], netatom[NetLast]; |
25 Bool running = True; |
25 Bool running = True; |
126 dc.sel[ColFG] = getcolor(SELFGCOLOR); |
126 dc.sel[ColFG] = getcolor(SELFGCOLOR); |
127 dc.status[ColBG] = getcolor(STATUSBGCOLOR); |
127 dc.status[ColBG] = getcolor(STATUSBGCOLOR); |
128 dc.status[ColFG] = getcolor(STATUSFGCOLOR); |
128 dc.status[ColFG] = getcolor(STATUSFGCOLOR); |
129 setfont(FONT); |
129 setfont(FONT); |
130 /* geometry */ |
130 /* geometry */ |
131 bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); |
|
132 sx = sy = 0; |
131 sx = sy = 0; |
133 sw = DisplayWidth(dpy, screen); |
132 sw = DisplayWidth(dpy, screen); |
134 sh = DisplayHeight(dpy, screen); |
133 sh = DisplayHeight(dpy, screen); |
135 master = MASTER; |
134 master = MASTER; |
136 nmaster = NMASTER; |
135 nmaster = NMASTER; |
136 snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster); |
|
137 bmw = textw(mtext); |
|
137 /* bar */ |
138 /* bar */ |
138 bx = sx; |
139 bx = sx; |
139 by = sy; |
140 by = sy; |
140 bw = sw; |
141 bw = sw; |
141 dc.h = bh = dc.font.height + 2; |
142 dc.h = bh = dc.font.height + 2; |