this variant is known to work, but focus() is ugly - we need in general a better way to handle multihead, this issel-stuff looks awkward (maybe it might be a good idea to set sel to NULL but to introduce a Client *revert which is set if a screen is unfocused, have to think about it further).

This commit is contained in:
Anselm R. Garbe 2007-01-22 10:35:58 +01:00
parent b233089815
commit fcd98308ba
2 changed files with 13 additions and 9 deletions

View file

@ -81,7 +81,7 @@ void
focus(Client *c) { focus(Client *c) {
Client *old = sel; Client *old = sel;
if(!issel || (c && !isvisible(c))) if(c && !isvisible(c))
return; return;
if(old && old != c) { if(old && old != c) {
@ -89,14 +89,18 @@ focus(Client *c) {
XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]); XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
} }
if(c) { if(c) {
detachstack(c); if(issel) {
c->snext = stack; detachstack(c);
stack = c; c->snext = stack;
grabbuttons(c, True); stack = c;
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); grabbuttons(c, True);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
else
XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
} }
else else if(issel)
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
sel = c; sel = c;
drawstatus(); drawstatus();

View file

@ -269,8 +269,8 @@ leavenotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing; XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) { if((ev->window == root) && !ev->same_screen) {
focus(NULL);
issel = False; issel = False;
focus(sel);
} }
} }