diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 3cc0648..fb03d5a 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.cc,v 1.54 2002/06/02 22:48:38 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.55 2002/07/10 14:51:32 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -1119,8 +1119,8 @@ void BScreen::nextFocus(int opts) { | |||
1119 | const int num_windows = getCurrentWorkspace()->getCount(); | 1119 | const int num_windows = getCurrentWorkspace()->getCount(); |
1120 | 1120 | ||
1121 | if ((focused = fluxbox->getFocusedWindow())) { | 1121 | if ((focused = fluxbox->getFocusedWindow())) { |
1122 | if (focused->getScreen()->getScreenNumber() == | 1122 | if (focused->getScreen()->getScreenNumber() == |
1123 | getScreenNumber()) { | 1123 | getScreenNumber()) { |
1124 | have_focused = true; | 1124 | have_focused = true; |
1125 | focused_window_number = focused->getWindowNumber(); | 1125 | focused_window_number = focused->getWindowNumber(); |
1126 | } | 1126 | } |
@@ -1130,7 +1130,8 @@ void BScreen::nextFocus(int opts) { | |||
1130 | Workspace *wksp = getCurrentWorkspace(); | 1130 | Workspace *wksp = getCurrentWorkspace(); |
1131 | Workspace::Windows wins = wksp->getWindowList(); | 1131 | Workspace::Windows wins = wksp->getWindowList(); |
1132 | Workspace::Windows::iterator it = wins.begin(); | 1132 | Workspace::Windows::iterator it = wins.begin(); |
1133 | for (; *it != focused; ++it); | 1133 | for (; *it != focused; ++it); //get focused window iterator |
1134 | |||
1134 | do { | 1135 | do { |
1135 | ++it; | 1136 | ++it; |
1136 | if (it == wins.end()) | 1137 | if (it == wins.end()) |
@@ -1142,6 +1143,7 @@ void BScreen::nextFocus(int opts) { | |||
1142 | 1143 | ||
1143 | if (*it != focused) | 1144 | if (*it != focused) |
1144 | wksp->raiseWindow(*it); | 1145 | wksp->raiseWindow(*it); |
1146 | |||
1145 | } else if (num_windows >= 1) { | 1147 | } else if (num_windows >= 1) { |
1146 | FluxboxWindow *next = current_workspace->getWindow(0); | 1148 | FluxboxWindow *next = current_workspace->getWindow(0); |
1147 | //don't raise next window if input focus fails | 1149 | //don't raise next window if input focus fails |