Skip to content

Fix Wayland window creation to comply with Weston 15 xdg-shell protocol #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pleasurefish wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Wayland window creation to comply with Weston 15 xdg-shell protocol #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 75 additions & 31 deletions patrace/src/retracer/glws_egl_wayland.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
namespace retracer
{

static void handle_configure(void *data, struct xdg_surface *surface, uint32_t serial);
static void handle_toplevel_configure(void *data, struct xdg_toplevel *toplevel,
int32_t width, int32_t height,
struct wl_array *states);
static void handle_toplevel_close(void *data, struct xdg_toplevel *toplevel);

static void shsurf_handle_ping(void *data, struct xdg_wm_base *shell_surface, uint32_t serial)
{
struct wl_display *display = (struct wl_display *)data;
Expand All @@ -22,14 +28,15 @@ static const struct xdg_wm_base_listener shell_listener = {
shsurf_handle_ping
};

static void handle_configure(void *data, struct xdg_surface *surface, uint32_t serial) {
xdg_surface_ack_configure(surface, serial);
}

static const struct xdg_surface_listener surface_listener = {
.configure = handle_configure
};

static const struct xdg_toplevel_listener toplevel_listener = {
.configure = handle_toplevel_configure,
.close = handle_toplevel_close,
};

class WaylandWindow : public NativeWindow
{
public:
Expand All @@ -38,27 +45,26 @@ class WaylandWindow : public NativeWindow
int fs_width, int fs_height)
: NativeWindow(width, height, title)
, mDisplay(display), mOutput(output), mFSWidth(fs_width), mFSHeight(fs_height)
, mConfigured(false)
{
mSurface = wl_compositor_create_surface(compositor);
if (!mSurface) {
DBG_LOG("Failed to initialize wayland surface\n");
return;
}

mShellSurface = xdg_wm_base_get_xdg_surface(shell,mSurface);
mShellSurface = xdg_wm_base_get_xdg_surface(shell, mSurface);

if (!mShellSurface) {
DBG_LOG("Failed to initialize wayland shell surface\n");
return;
}

mXdg_toplevel = xdg_surface_get_toplevel(mShellSurface);

xdg_wm_base_add_listener(shell, &shell_listener, mDisplay);
xdg_surface_add_listener(mShellSurface,&surface_listener,NULL);
/* TODO we set the shell surface listener, so it responds to compositor
* pings. However the retracer doesn't regularly dispatch events
* from the Wayland default queue, so some compositors might think
* the application is unresponsive. */
xdg_surface_add_listener(mShellSurface, &surface_listener, this);
xdg_toplevel_add_listener(mXdg_toplevel, &toplevel_listener, this);

mHandle = (EGLNativeWindowType)wl_egl_window_create(mSurface, width, height);
if (!mHandle) {
Expand All @@ -81,47 +87,64 @@ class WaylandWindow : public NativeWindow
{
NativeWindow::show();

eglWaitClient();

/* TODO: I *think* its the wl_shell_surface_set_* function that
* that triggers it to be displayed and not just the creation
* of the shell surface, but I might be wrong */
// Set fullscreen or windowed mode before initial commit
if (getWidth() == mFSWidth && getHeight() == mFSHeight) {
/* We assume that if the desired size is the size of the
* framebuffer then we want it fullscreen */
xdg_toplevel_set_fullscreen(mXdg_toplevel,mOutput);
} else{
xdg_toplevel_unset_fullscreen(mXdg_toplevel);
xdg_toplevel_set_fullscreen(mXdg_toplevel, mOutput);
}

// Commit the surface to trigger configure event
wl_surface_commit(mSurface);

// Wait for configure event
while (!mConfigured) {
wl_display_dispatch(mDisplay);
}
wl_display_roundtrip(mDisplay);

mVisible = true;
}

struct wl_surface* getSurface() const {
return mSurface;
}

bool resize(int w, int h)
{
if (NativeWindow::resize(w, h))
{
/* NB: The resize won't actually happen yet, it'll
* only affect the next frame that EGL renders */
wl_egl_window_resize((wl_egl_window*)mHandle, w, h, 0, 0);

if (mVisible) {
/* We are already showing the window, so may need to
* transition to fullscreen or vice-versa */
// Request fullscreen state change
if (getWidth() == mFSWidth && getHeight() == mFSHeight) {
/* We assume that if the desired size is the size of the
* framebuffer then we want it fullscreen */
xdg_toplevel_set_fullscreen(mXdg_toplevel,mOutput);
} else{
xdg_toplevel_set_fullscreen(mXdg_toplevel, mOutput);
} else {
xdg_toplevel_unset_fullscreen(mXdg_toplevel);
}
wl_display_roundtrip(mDisplay);

// Commit and wait for configure
wl_surface_commit(mSurface);
mConfigured = false;
while (!mConfigured) {
wl_display_dispatch(mDisplay);
}
}
return true;
}

return false;
}

void setConfigured(bool configured) {
mConfigured = configured;
}

void handleResize(int width, int height) {
// Handle compositor-requested resize if needed
if (width > 0 && height > 0) {
wl_egl_window_resize((wl_egl_window*)mHandle, width, height, 0, 0);
}
}

private:
struct wl_display* mDisplay;
struct wl_output* mOutput;
Expand All @@ -130,10 +153,31 @@ class WaylandWindow : public NativeWindow
struct wl_surface* mSurface;
struct xdg_surface *mShellSurface;
struct xdg_toplevel *mXdg_toplevel;
int configured;
bool mConfigured;
bool mVisible;
};

// Callback implementations after class definition
static void handle_configure(void *data, struct xdg_surface *surface, uint32_t serial) {
WaylandWindow *window = static_cast<WaylandWindow *>(data);
xdg_surface_ack_configure(surface, serial);
wl_surface_commit(window->getSurface());
window->setConfigured(true);
}

static void handle_toplevel_configure(void *data, struct xdg_toplevel *toplevel,
int32_t width, int32_t height,
struct wl_array *states) {
WaylandWindow *window = static_cast<WaylandWindow *>(data);
if (width > 0 && height > 0) {
window->handleResize(width, height);
}
}

static void handle_toplevel_close(void *data, struct xdg_toplevel *toplevel) {
// Handle window close if needed
}


GlwsEglWayland::GlwsEglWayland()
: GlwsEgl()
Expand Down