jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get window construction a bit more solid

Browse source
This commit is contained in:
Simon Fels 2016-08-10 16:40:23 +02:00
commit 32d7f4ba5f
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/anbox/ubuntu/window.cpp
View file

@ -342,8 +342,10 @@ Window::Window(const std::shared_ptr<input::Manager> &input_manager,
width, width,
height, height,
SDL_WINDOW_OPENGL | SDL_WINDOW_MAXIMIZED); SDL_WINDOW_OPENGL | SDL_WINDOW_MAXIMIZED);
if (!window_) if (!window_) {
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create new window")); const auto message = utils::string_format("Failed to create window: %s", SDL_GetError());
BOOST_THROW_EXCEPTION(std::runtime_error(message));
}
SDL_SysWMinfo info; SDL_SysWMinfo info;

13
src/anbox/ubuntu/window_creator.cpp
View file

@ -68,21 +68,26 @@ void WindowCreator::process_events() {
} }
} }
EGLNativeWindowType WindowCreator::create_window(int x, int y, int width, int height) { EGLNativeWindowType WindowCreator::create_window(int x, int y, int width, int height)
DEBUG("x %i y %i width %i height %i", x, y, width, height); try {
if (windows_.size() == 1) { if (windows_.size() == 1) {
WARNING("Tried to create another window but we currently only allow one"); WARNING("Tried to create another window but we currently only allow one");
return 0; return 0;
} }
auto window = std::make_shared<Window>(input_manager_, width, height); auto window = std::make_shared<Window>(input_manager_, width, height);
windows_.insert({window->native_window(), window}); if (not window)
BOOST_THROW_EXCEPTION(std::bad_alloc());
windows_.insert({window->native_window(), window});
current_window_ = window; current_window_ = window;
return window->native_window(); return window->native_window();
} }
catch (std::exception &err) {
DEBUG("Failed to create window: %s", err.what());
return 0;
}
void WindowCreator::destroy_window(EGLNativeWindowType win) { void WindowCreator::destroy_window(EGLNativeWindowType win) {
auto iter = windows_.find(win); auto iter = windows_.find(win);