always get the first focused screen
This commit is contained in:
parent
ef48bd3dff
commit
88a4e59f44
1 changed files with 8 additions and 3 deletions
|
@ -148,6 +148,8 @@ Openbox::Openbox(int argc, char **argv)
|
||||||
python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
|
python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
|
||||||
|
|
||||||
// initialize all the screens
|
// initialize all the screens
|
||||||
|
_focused_screen = 0;
|
||||||
|
|
||||||
for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) {
|
for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) {
|
||||||
Screen *screen;
|
Screen *screen;
|
||||||
if (_single && i != DefaultScreen(**otk::display)) {
|
if (_single && i != DefaultScreen(**otk::display)) {
|
||||||
|
@ -155,14 +157,18 @@ Openbox::Openbox(int argc, char **argv)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
screen = new Screen(i);
|
screen = new Screen(i);
|
||||||
if (screen->managed())
|
if (screen->managed()) {
|
||||||
_screens.push_back(screen);
|
_screens.push_back(screen);
|
||||||
else {
|
if (!_focused_screen) // set this to the first screen managed
|
||||||
|
_focused_screen = screen;
|
||||||
|
} else {
|
||||||
delete screen;
|
delete screen;
|
||||||
_screens.push_back(0);
|
_screens.push_back(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assert(_focused_screen);
|
||||||
|
|
||||||
if (_screens.empty()) {
|
if (_screens.empty()) {
|
||||||
printf(_("No screens were found without a window manager. Exiting.\n"));
|
printf(_("No screens were found without a window manager. Exiting.\n"));
|
||||||
::exit(1);
|
::exit(1);
|
||||||
|
@ -177,7 +183,6 @@ Openbox::Openbox(int argc, char **argv)
|
||||||
_bindings->grabKeys(true);
|
_bindings->grabKeys(true);
|
||||||
|
|
||||||
// set up input focus
|
// set up input focus
|
||||||
_focused_screen = _screens[0];
|
|
||||||
setFocusedClient(0);
|
setFocusedClient(0);
|
||||||
|
|
||||||
_state = State_Normal; // done starting
|
_state = State_Normal; // done starting
|
||||||
|
|
Loading…
Reference in a new issue