applied nsz's patches (many thanks!)
32f36ab2
1 file(s) · +4 −7
| 551 | 551 | ||
| 552 | 552 | void |
|
| 553 | 553 | drawtext(const char *text, ulong col[ColLast], Bool invert) { |
|
| 554 | - | int i, x, y, h; |
|
| 555 | - | uint len, olen; |
|
| 554 | + | int i, x, y, h, len, olen; |
|
| 556 | 555 | XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
|
| 557 | 556 | char buf[256]; |
|
| 558 | 557 | ||
| 612 | 611 | ||
| 613 | 612 | void |
|
| 614 | 613 | focus(Client *c) { |
|
| 615 | - | if(!c || (c && c->isbanned)) |
|
| 614 | + | if(!c || c->isbanned) |
|
| 616 | 615 | for(c = stack; c && c->isbanned; c = c->snext); |
|
| 617 | 616 | if(sel && sel != c) { |
|
| 618 | 617 | grabbuttons(sel, False); |
|
| 622 | 621 | detachstack(c); |
|
| 623 | 622 | attachstack(c); |
|
| 624 | 623 | grabbuttons(c, True); |
|
| 625 | - | } |
|
| 626 | - | sel = c; |
|
| 627 | - | if(c) { |
|
| 628 | 624 | XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); |
|
| 629 | 625 | XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); |
|
| 630 | 626 | } |
|
| 631 | 627 | else |
|
| 632 | 628 | XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); |
|
| 629 | + | sel = c; |
|
| 633 | 630 | drawbar(); |
|
| 634 | 631 | } |
|
| 635 | 632 | ||
| 1565 | 1562 | ||
| 1566 | 1563 | void |
|
| 1567 | 1564 | updategeom(void) { |
|
| 1568 | - | int i; |
|
| 1569 | 1565 | #ifdef XINERAMA |
|
| 1566 | + | int i; |
|
| 1570 | 1567 | XineramaScreenInfo *info = NULL; |
|
| 1571 | 1568 | ||
| 1572 | 1569 | /* window area geometry */ |
|