Xinqi Bao's Git
projects
/
dwm.git
/ commitdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b233089
)
this variant is known to work, but focus() is ugly - we need in general a better...
author
Anselm R. Garbe <
[email protected]
>
Mon, 22 Jan 2007 09:35:58 +0000
(10:35 +0100)
committer
Anselm R. Garbe <
[email protected]
>
Mon, 22 Jan 2007 09:35:58 +0000
(10:35 +0100)
client.c
patch
|
blob
|
history
event.c
patch
|
blob
|
history
diff --git
a/client.c
b/client.c
index
177eb94
..
510ec59
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-81,7
+81,7
@@
void
focus(Client *c) {
Client *old = sel;
focus(Client *c) {
Client *old = sel;
- if(
!issel || (c && !isvisible(c)
))
+ if(
c && !isvisible(c
))
return;
if(old && old != c) {
return;
if(old && old != c) {
@@
-89,14
+89,18
@@
focus(Client *c) {
XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
}
if(c) {
XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
}
if(c) {
- detachstack(c);
- c->snext = stack;
- stack = c;
- grabbuttons(c, True);
- XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+ if(issel) {
+ detachstack(c);
+ c->snext = stack;
+ stack = c;
+ grabbuttons(c, True);
+ 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);
sel = c;
drawstatus();
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
sel = c;
drawstatus();
diff --git
a/event.c
b/event.c
index
e0718d3
..
2e021d5
100644
(file)
--- a/
event.c
+++ b/
event.c
@@
-269,8
+269,8
@@
leavenotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
- focus(NULL);
issel = False;
issel = False;
+ focus(sel);
}
}
}
}