commit 2aec823caaa3c17ef531b1b9c58fcf7d863711ac
parent a0b5de8d9da8bd121ba0ecf48867571bf43325ab
Author: Sander van Dijk <sander@wmii.de>
Date: Sun, 22 Jan 2006 20:19:45 +0100
move some code to a better place
Diffstat:
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/cmd/wm/page.c b/cmd/wm/page.c
@@ -128,17 +128,19 @@ destroy_page(Page * p)
npages--;
XChangeProperty(dpy, root, net_atoms[NET_NUMBER_OF_DESKTOPS], XA_CARDINAL,
32, PropModeReplace, (unsigned char *) &npages, 1);
- focus_page(newselpage);
+ if(newselpage)
+ focus_page(newselpage);
+ else {
+ invoke_wm_event(def[WM_EVENT_PAGE_UPDATE]);
+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+ }
}
void
focus_page(Page * p)
{
- if(!p) {
- XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
- invoke_wm_event(def[WM_EVENT_PAGE_UPDATE]);
+ if(!p)
return;
- }
if((p != selpage)) {
if(selpage) {