From d97997b5e9aeb872ea9bf23c4829696667317999 Mon Sep 17 00:00:00 2001 From: kojima Date: Fri, 3 Mar 2000 20:28:44 +0000 Subject: [PATCH] *** empty log message *** --- src/event.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/event.c b/src/event.c index c4fbee71..05315e13 100644 --- a/src/event.c +++ b/src/event.c @@ -1330,11 +1330,11 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next) scr->flags.doing_alt_tab = 1; - XRaiseWindow(dpy, newFocused->frame->core->window); + if (wPreferences.circ_raise) + XRaiseWindow(dpy, newFocused->frame->core->window); wWindowFocus(newFocused, scr->focused_window); oldFocused = newFocused; - if (wPreferences.circ_raise) - wRaiseFrame(newFocused->frame->core); + #if 0 if (wPreferences.popup_switchmenu && (!scr->switch_menu || !scr->switch_menu->flags.mapped)) { @@ -1364,10 +1364,12 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next) wWindowFocus(newFocused, oldFocused); oldFocused = newFocused; - /* restore order */ - CommitStacking(scr); - XRaiseWindow(dpy, newFocused->frame->core->window); - + if (wPreferences.circ_raise) { + /* restore order */ + CommitStacking(scr); + XRaiseWindow(dpy, newFocused->frame->core->window); + } + UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE); } else if (wKeyBindings[WKBD_FOCUSPREV].keycode == ev.xkey.keycode @@ -1378,10 +1380,11 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next) wWindowFocus(newFocused, oldFocused); oldFocused = newFocused; - /* restore order */ - CommitStacking(scr); - XRaiseWindow(dpy, newFocused->frame->core->window); - + if (wPreferences.circ_raise) { + /* restore order */ + CommitStacking(scr); + XRaiseWindow(dpy, newFocused->frame->core->window); + } UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE); } else if (wKeyBindings[WKBD_LOWER].keycode == ev.xkey.keycode @@ -1415,9 +1418,6 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next) if (wPreferences.circ_raise) { wRaiseFrame(newFocused->frame->core); CommitStacking(scr); - } else { - /* restore order */ - CommitStacking(scr); } scr->flags.doing_alt_tab = 0; -- 2.11.4.GIT