mirror of git://git.suckless.org/dwm
applied nsz's patches (many thanks!)
This commit is contained in:
parent
08bcf721b4
commit
32f36ab2d5
11
dwm.c
11
dwm.c
|
@ -551,8 +551,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
|
||||||
|
|
||||||
void
|
void
|
||||||
drawtext(const char *text, ulong col[ColLast], Bool invert) {
|
drawtext(const char *text, ulong col[ColLast], Bool invert) {
|
||||||
int i, x, y, h;
|
int i, x, y, h, len, olen;
|
||||||
uint len, olen;
|
|
||||||
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
|
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
|
||||||
char buf[256];
|
char buf[256];
|
||||||
|
|
||||||
|
@ -612,7 +611,7 @@ expose(XEvent *e) {
|
||||||
|
|
||||||
void
|
void
|
||||||
focus(Client *c) {
|
focus(Client *c) {
|
||||||
if(!c || (c && c->isbanned))
|
if(!c || c->isbanned)
|
||||||
for(c = stack; c && c->isbanned; c = c->snext);
|
for(c = stack; c && c->isbanned; c = c->snext);
|
||||||
if(sel && sel != c) {
|
if(sel && sel != c) {
|
||||||
grabbuttons(sel, False);
|
grabbuttons(sel, False);
|
||||||
|
@ -622,14 +621,12 @@ focus(Client *c) {
|
||||||
detachstack(c);
|
detachstack(c);
|
||||||
attachstack(c);
|
attachstack(c);
|
||||||
grabbuttons(c, True);
|
grabbuttons(c, True);
|
||||||
}
|
|
||||||
sel = c;
|
|
||||||
if(c) {
|
|
||||||
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
|
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
|
||||||
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
|
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
|
||||||
|
sel = c;
|
||||||
drawbar();
|
drawbar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1565,8 +1562,8 @@ updatebar(void) {
|
||||||
|
|
||||||
void
|
void
|
||||||
updategeom(void) {
|
updategeom(void) {
|
||||||
int i;
|
|
||||||
#ifdef XINERAMA
|
#ifdef XINERAMA
|
||||||
|
int i;
|
||||||
XineramaScreenInfo *info = NULL;
|
XineramaScreenInfo *info = NULL;
|
||||||
|
|
||||||
/* window area geometry */
|
/* window area geometry */
|
||||||
|
|
Loading…
Reference in New Issue