Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5861c15
)
more focus cleanz
author
Marco Peereboom
<marco@conformal.com>
Fri, 16 Oct 2009 04:40:05 +0000
(
04:40
+0000)
committer
Marco Peereboom
<marco@conformal.com>
Fri, 16 Oct 2009 04:40:05 +0000
(
04:40
+0000)
scrotwm.c
patch
|
blob
|
history
diff --git
a/scrotwm.c
b/scrotwm.c
index
d8e5d05
..
b0793f3
100644
(file)
--- a/
scrotwm.c
+++ b/
scrotwm.c
@@
-1657,11
+1657,10
@@
focus(struct swm_region *r, union arg *args)
return;
}
return;
}
- cur_focus = r->ws->focus;
- if (cur_focus == NULL) {
+ if (r->ws->focus == NULL)
return;
return;
- }
+ cur_focus = r->ws->focus;
ws = r->ws;
wl = &ws->winlist;
ws = r->ws;
wl = &ws->winlist;
@@
-1695,22
+1694,12
@@
focus(struct swm_region *r, union arg *args)
}
break;
case SWM_ARG_ID_FOCUSNEXT:
}
break;
case SWM_ARG_ID_FOCUSNEXT:
- cur_focus = r->ws->focus;
- if (cur_focus == NULL)
- return;
- wl = &cur_focus->ws->winlist;
-
winfocus = TAILQ_NEXT(cur_focus, entry);
if (winfocus == NULL)
winfocus = TAILQ_FIRST(wl);
break;
case SWM_ARG_ID_FOCUSMAIN:
winfocus = TAILQ_NEXT(cur_focus, entry);
if (winfocus == NULL)
winfocus = TAILQ_FIRST(wl);
break;
case SWM_ARG_ID_FOCUSMAIN:
- cur_focus = r->ws->focus;
- if (cur_focus == NULL)
- return;
- wl = &cur_focus->ws->winlist;
-
winfocus = TAILQ_FIRST(wl);
if (winfocus == cur_focus)
winfocus = cur_focus->ws->focus_prev;
winfocus = TAILQ_FIRST(wl);
if (winfocus == cur_focus)
winfocus = cur_focus->ws->focus_prev;