17 |
17 |
18 /* extern */ |
18 /* extern */ |
19 |
19 |
20 char stext[256]; |
20 char stext[256]; |
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 bh, bmw, 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; |
26 Bool issel = True; |
26 Bool issel = True; |
27 Client *clients = NULL; |
27 Client *clients = NULL; |
134 sh = DisplayHeight(dpy, screen); |
134 sh = DisplayHeight(dpy, screen); |
135 master = MASTER; |
135 master = MASTER; |
136 nmaster = NMASTER; |
136 nmaster = NMASTER; |
137 bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); |
137 bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); |
138 /* bar */ |
138 /* bar */ |
139 bx = sx; |
|
140 by = sy; |
|
141 bw = sw; |
|
142 dc.h = bh = dc.font.height + 2; |
139 dc.h = bh = dc.font.height + 2; |
143 wa.override_redirect = 1; |
140 wa.override_redirect = 1; |
144 wa.background_pixmap = ParentRelative; |
141 wa.background_pixmap = ParentRelative; |
145 wa.event_mask = ButtonPressMask | ExposureMask; |
142 wa.event_mask = ButtonPressMask | ExposureMask; |
146 barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen), |
143 barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen), |
147 CopyFromParent, DefaultVisual(dpy, screen), |
144 CopyFromParent, DefaultVisual(dpy, screen), |
148 CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
145 CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
149 XDefineCursor(dpy, barwin, cursor[CurNormal]); |
146 XDefineCursor(dpy, barwin, cursor[CurNormal]); |
150 XMapRaised(dpy, barwin); |
147 XMapRaised(dpy, barwin); |
151 strcpy(stext, "dwm-"VERSION); |
148 strcpy(stext, "dwm-"VERSION); |