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

Implement quick&dirty approach to update window size and position

Browse source
This commit is contained in:
Simon Fels 2016-11-08 18:07:00 +01:00
commit b05b8bae8b
9 changed files with 53 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
external/android-emugl/host/libs/libOpenglRender/FrameBuffer.cpp vendored
View file

@ -497,6 +497,13 @@ FrameBufferWindow* FrameBuffer::createWindow(int x, int y, int width, int height
return window;
}
void FrameBuffer::updateWindow(FrameBufferWindow *window, int x, int y, int width, int height) {
if (!window)
return;
updateSubWindow(window->native_window, x, y, width, height);
}
void FrameBuffer::destroyWindow(FrameBufferWindow *window) {
if (!window)
return;

1
external/android-emugl/host/libs/libOpenglRender/FrameBuffer.h vendored
View file

@ -79,6 +79,7 @@ public:
static bool initialize(EGLNativeDisplayType nativeDisplay);
FrameBufferWindow* createWindow(int x, int y, int width, int height);
void updateWindow(FrameBufferWindow *window, int x, int y, int width, int height);
void destroyWindow(FrameBufferWindow *window);
// Finalize the instance.

22
external/android-emugl/host/libs/libOpenglRender/LayerManager.cpp vendored
View file

@ -82,13 +82,16 @@ void LayerManager::post_layer(const LayerInfo &layer) {
l.second.updated = true;
}
}
else {
printf("New layer '%s' {%d,%d,%d,%d}\n", layer.name.c_str());
window = FrameBuffer::getFB()->createWindow(
layer.display_frame.left,
layer.display_frame.top,
layer.display_frame.right,
layer.display_frame.bottom);
auto width = layer.display_frame.right - layer.display_frame.left;
auto height = layer.display_frame.bottom - layer.display_frame.top;
if (!window) {
auto buffer = FrameBuffer::getFB()->getColorBufferFromHandle(layer.buffer_handle);
window = FrameBuffer::getFB()->createWindow(layer.display_frame.left,
layer.display_frame.top,
width, height);
if (!window) {
printf("Failed to create window for layer '%s'\n", layer.name.c_str());
return;
@ -97,7 +100,10 @@ void LayerManager::post_layer(const LayerInfo &layer) {
}
printf("%s: window %p buffer %d\n", __func__, window, layer.buffer_handle);
FrameBuffer::getFB()->updateWindow(window,
layer.display_frame.left,
layer.display_frame.top,
width, height);
FrameBuffer::getFB()->post(window, layer.buffer_handle);
}

3
external/android-emugl/host/libs/libOpenglRender/NativeSubWindow.h vendored
View file

@ -30,6 +30,7 @@ class SubWindowHandler {
public:
virtual ~SubWindowHandler() { }
virtual EGLNativeWindowType create_window(int x, int y, int width, int height) = 0;
virtual void update_window(EGLNativeWindowType win, int x, int y, int width, int height) = 0;
virtual void destroy_window(EGLNativeWindowType win) = 0;
};
@ -55,6 +56,8 @@ EGLNativeWindowType createSubWindow(FBNativeWindowType p_window,
int width,
int height);
void updateSubWindow(EGLNativeWindowType win, int x, int y, int width, int height);
// Destroy a sub-window previously created through createSubWindow() above.
void destroySubWindow(EGLNativeWindowType win);

7
external/android-emugl/host/libs/libOpenglRender/NativeSubWindow_delegate.cpp vendored
View file

@ -44,6 +44,13 @@ EGLNativeWindowType createSubWindow(FBNativeWindowType p_window,
return current_handler->create_window(x, y, width, height);
}
void updateSubWindow(EGLNativeWindowType win, int x, int y, int width, int height) {
if (!current_handler)
return;
return current_handler->update_window(win, x, y, width, height);
}
void destroySubWindow(EGLNativeWindowType win) {
if (!current_handler)
return;

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

@ -62,6 +62,14 @@ Window::~Window() {
SDL_DestroyWindow(window_);
}
void Window::resize(int width, int height) {
SDL_SetWindowSize(window_, width, height);
}
int Window::update_position(int x, int y) {
SDL_SetWindowPosition(window_, x, y);
}
EGLNativeWindowType Window::native_window() const {
return native_window_;
}

3
src/anbox/ubuntu/window.h
View file

@ -32,6 +32,9 @@ public:
Window(int x, int y, int width, int height);
~Window();
void resize(int width, int height);
int update_position(int x, int y);
EGLNativeWindowType native_window() const;
private:

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

@ -91,6 +91,15 @@ catch (std::exception &err) {
return 0;
}
void WindowCreator::update_window(EGLNativeWindowType win, int x, int y, int width, int height) {
auto iter = windows_.find(win);
if (iter == windows_.end())
return;
iter->second->resize(width, height);
iter->second->update_position(x, y);
}
void WindowCreator::destroy_window(EGLNativeWindowType win) {
auto iter = windows_.find(win);
if (iter == windows_.end())

1
src/anbox/ubuntu/window_creator.h
View file

@ -39,6 +39,7 @@ public:
~WindowCreator();
EGLNativeWindowType create_window(int x, int y, int width, int height) override;
void update_window(EGLNativeWindowType win, int x, int y, int width, int height) override;
void destroy_window(EGLNativeWindowType win) override;
DisplayInfo display_info() const override;