admin/wayland-starter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: proper window closing

Browse Source
This commit is contained in:
Amir Adal
2026-02-12 13:02:34 +01:00
parent 6cbb72f0ec
commit d20f393278
3 changed files with 354 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,7 +1,7 @@
CFLAGS = -Wall -Wextra -I./include/ -g
LIBS = $(shell pkg-config --libs wayland-client wayland-egl egl glesv2)
build/main: src/main.cpp build/shader.o build/xdg-shell-protocol.o
build/main: src/main.cpp include/window.hpp build/shader.o build/xdg-shell-protocol.o
g++ -o build/main $(CFLAGS) src/main.cpp build/shader.o build/xdg-shell-protocol.o $(LIBS)
build/shader.o: src/shader.cpp include/shader.h

218
include/window.hpp
View File

@@ -1,11 +1,12 @@
#ifndef H_WINDOW_
#define H_WINDOW_
#include <string>
#include <cstddef>
#include <cstdio>
#include <stdbool.h>
#include <string>
#include <wayland-client-core.h>
#include <wayland-client-protocol.h>
#include <wayland-client.h>
@@ -15,8 +16,8 @@
#include <wayland-egl-core.h>
#include <wayland-egl.h>
#include "xdg-shell-client-protocol.h"
#include "shader.h"
#include "xdg-shell-client-protocol.h"
#define UNUSED(x) (void)(x)
@@ -25,51 +26,57 @@ class Renderer;
class AppState {
public:
static AppState* GetInstance() {
if (!AppState::s_instance) AppState::s_instance = new AppState();
static AppState *GetInstance() {
if (!AppState::s_instance)
AppState::s_instance = new AppState();
return AppState::s_instance;
}
private:
static void wm_base_handle_ping(void *data, struct xdg_wm_base *wm_base,
static void wm_base_handle_ping(void *data, struct xdg_wm_base *wm_base,
uint32_t serial) {
UNUSED(data);
printf("INFO: ping method fired! sending pong...\n");
xdg_wm_base_pong(wm_base, serial);
}
}
static void registry_handle_global(void *data, struct wl_registry *registry,
uint32_t name, const char *interface,
uint32_t version) {
UNUSED(data);
auto state = reinterpret_cast<AppState*>(data);
auto state = reinterpret_cast<AppState *>(data);
printf("HANDLE_GLOBAL: new interface '%s', name = %d, version = %d\n",
interface, name, version);
// printf("HANDLE_GLOBAL: new interface '%s', name = %d, version = %d\n",
// interface, name, version);
std::string interface_name(interface);
if (interface_name == "wl_compositor") {
state->m_compositor = reinterpret_cast<struct wl_compositor *>(
wl_registry_bind(registry, name, &wl_compositor_interface, version));
printf("%p compositor binding\n", state->m_compositor);
printf("[DEBUG] global_binding(%s): compositor %p\n", interface,
state->m_compositor);
}
if (interface_name == "xdg_wm_base") {
state->m_wm_base = reinterpret_cast<struct xdg_wm_base *>(
wl_registry_bind(registry, name, &xdg_wm_base_interface, version));
printf("[DEBUG] global_binding(%s): xdg_wm_base %p\n", interface,
state->m_wm_base);
if (state->m_wm_base == NULL) {
fprintf(stderr, "ERROR: could not bind to xdg_wm_base\n");
}
state->m_wm_base_listener.ping = wm_base_handle_ping;
int res = xdg_wm_base_add_listener(state->m_wm_base, &state->m_wm_base_listener,
xdg_wm_base_add_listener(state->m_wm_base, &state->m_wm_base_listener,
NULL);
printf("bound to wm_base: %d\n", res);
}
}
static void registry_handle_global_remove(void *data, struct wl_registry *registry,
static void registry_handle_global_remove(void *data,
struct wl_registry *registry,
uint32_t name) {
UNUSED(data);
UNUSED(registry);
UNUSED(name);
}
private:
AppState() {
m_display = wl_display_connect(NULL);
@@ -88,12 +95,24 @@ private:
m_reg_listener.global_remove = registry_handle_global_remove;
auto handle = wl_registry_add_listener(registry, &m_reg_listener, this);
printf("registry listener bound: %d\n", handle);
printf("[DEBUG] wl_registry listener bound: %d\n", handle);
wl_display_roundtrip(m_display);
}
~AppState() {
wl_display_flush(m_display);
wl_display_roundtrip(m_display);
if (m_wm_base)
xdg_wm_base_destroy(m_wm_base);
if (m_compositor)
wl_compositor_destroy(m_compositor);
wl_display_disconnect(m_display);
}
private:
static AppState* s_instance;
static AppState *s_instance;
struct wl_display *m_display = nullptr;
struct wl_compositor *m_compositor = nullptr;
@@ -106,53 +125,65 @@ private:
friend class Renderer;
};
AppState* AppState::s_instance = nullptr;
AppState *AppState::s_instance = nullptr;
class Renderer {
public:
static Renderer* GetInstance() {
if (!s_instance) s_instance = new Renderer;
static Renderer *GetInstance() {
if (!s_instance)
s_instance = new Renderer;
return s_instance;
}
public:
const EGLConfig& GetConfig() const { return m_config; }
const EGLConfig &GetConfig() const { return m_config; }
public:
void DestroyWindow(const EGLSurface& surface, struct wl_egl_window* window) {
eglMakeCurrent(m_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroySurface(m_egl_display, surface);
wl_egl_window_destroy(window);
}
void DestroyContext(const EGLContext& context) {
eglDestroyContext(m_egl_display, context);
}
EGLContext CreateContext() {
EGLint ctx_attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
return eglCreateContext(m_egl_display, m_config,
EGL_NO_CONTEXT, ctx_attribs);
return eglCreateContext(m_egl_display, m_config, EGL_NO_CONTEXT,
ctx_attribs);
}
EGLSurface CreateSurface(struct wl_egl_window* window) {
EGLSurface CreateSurface(struct wl_egl_window *window) {
PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC createPlatformWindowSurface =
reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>(
eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"));
return createPlatformWindowSurface(
m_egl_display, m_config, window, NULL);
return createPlatformWindowSurface(m_egl_display, m_config, window, NULL);
}
void SurfaceSetContext(const EGLSurface& surface, const EGLContext& context) {
if (!eglMakeCurrent(m_egl_display, surface,
surface, context)) {
void SurfaceSetContext(const EGLSurface &surface, const EGLContext &context) {
if (!eglMakeCurrent(m_egl_display, surface, surface, context)) {
fprintf(stderr, "ERROR: could not change current EGL context\n");
fprintf(stderr, "EGL error: 0x%x\n", eglGetError());
exit(1);
}
}
void SwapBuffers(const EGLSurface& surface)
{
void SwapBuffers(const EGLSurface &surface) {
eglSwapBuffers(m_egl_display, surface);
}
private:
Renderer() {
PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplay =
reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
eglGetProcAddress("eglGetPlatformDisplayEXT"));
m_egl_display = getPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, AppState::GetInstance()->m_display, NULL);
m_egl_display = getPlatformDisplay(
EGL_PLATFORM_WAYLAND_KHR, AppState::GetInstance()->m_display, NULL);
if (m_egl_display == NULL) {
fprintf(stderr, "ERROR: could not get platform display\n");
fprintf(stderr, "EGL error: 0x%x\n", eglGetError());
@@ -187,24 +218,33 @@ private:
exit(1);
}
}
~Renderer() {
// After all windows are destroyed:
eglTerminate(m_egl_display);
}
private:
static Renderer* s_instance;
static Renderer *s_instance;
EGLDisplay m_egl_display;
EGLConfig m_config;
};
Renderer* Renderer::s_instance = nullptr;
Renderer *Renderer::s_instance = nullptr;
class Window {
private:
static void handle_frame_callback(void *data,
struct wl_callback *cb,
static void handle_frame_callback(void *data, struct wl_callback *cb,
uint32_t time) {
auto window = reinterpret_cast<Window*>(data);
UNUSED(time);
printf("INFO: frame callback\n");
auto window = reinterpret_cast<Window *>(data);
if (!window->m_runnning) return;
// auto delta_time = time - window->m_last_time;
// printf("INFO: frame callback called\n");
// printf("INFO: time: {%u}\n", time);
// printf("INFO: last_time: {%u}\n", window->m_last_time);
// printf("INFO: delta_time: {%u}\n", delta_time);
// printf("INFO: fps: {%u}\n", 1000 / delta_time);
window->m_last_time = time;
wl_callback_destroy(cb);
auto frame_callback = wl_surface_frame(window->m_wsurface);
@@ -228,7 +268,7 @@ private:
static void xsurface_handle_configure(void *data, struct xdg_surface *surface,
uint32_t serial) {
auto window = reinterpret_cast<Window*>(data);
auto window = reinterpret_cast<Window *>(data);
xdg_surface_ack_configure(surface, serial);
@@ -246,16 +286,71 @@ private:
Renderer::GetInstance()->SwapBuffers(window->m_egl_surface);
}
static void xtoplevel_handle_configure(void *data,
struct xdg_toplevel *toplevel,
int32_t width, int32_t height,
struct wl_array *states) {
UNUSED(toplevel);
auto window = reinterpret_cast<Window*>(data);
printf("[DEBUG] received toplevel configure event\n");
printf("[DEBUG] width = %d, height = %d\n", width, height);
printf("[DEBUG] %zu states\n", states->size);
wl_egl_window_resize(window->m_egl_window, width, height, 0, 0);
glViewport(0, 0, width, height);
xdg_surface_set_window_geometry(window->m_xsurface, 0, 0, width, height);
}
static void xtoplevel_handle_close(void *data,
struct xdg_toplevel *toplevel) {
auto window = reinterpret_cast<Window*>(data);
UNUSED(toplevel);
printf("[DEBUG] window close request received\n");
window->m_runnning = false;
glDeleteProgram(window->m_program);
Renderer::GetInstance()->DestroyWindow(window->m_egl_surface, window->m_egl_window);
xdg_toplevel_destroy(window->m_toplevel);
xdg_surface_destroy(window->m_xsurface);
wl_surface_destroy(window->m_wsurface);
// if (window->m_program) {
// eglMakeCurrent(renderer_display, m_egl_surface, m_egl_surface, m_egl_context);
// glDeleteProgram(m_program);
// glDeleteBuffers(1, &m_vbo); // if used
// eglMakeCurrent(renderer_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
// m_program = 0;
// }
Renderer::GetInstance()->DestroyContext(window->m_egl_context);
}
static void xtoplevel_handle_configure_bounds(void *data,
struct xdg_toplevel *toplevel,
int32_t width, int32_t height) {
UNUSED(data);
UNUSED(toplevel);
printf("[DEBUG] window configure bounds, width = %d, height = %d\n", width,
height);
}
static void xtoplevel_handle_wm_capabilities(void *data,
struct xdg_toplevel *toplevel,
struct wl_array *capabilities) {
UNUSED(data);
UNUSED(toplevel);
UNUSED(capabilities);
printf("[DEBUG] window wm_capabilities event received\n");
}
public:
Window(size_t width, size_t height) {
m_wsurface = wl_compositor_create_surface(AppState::GetInstance()->m_compositor);
Window(size_t width, size_t height) : m_frame_listener({0}), m_last_time(0), m_width(width), m_height(height) {
m_wsurface =
wl_compositor_create_surface(AppState::GetInstance()->m_compositor);
if (m_wsurface == NULL) {
fprintf(stderr, "ERROR: could not connect create a surface\n");
exit(1);
}
m_egl_window =
wl_egl_window_create(m_wsurface, width, height);
m_egl_window = wl_egl_window_create(m_wsurface, width, height);
if (m_egl_window == NULL) {
fprintf(stderr, "ERROR: could not create wl_egl_window\n");
exit(1);
@@ -297,15 +392,15 @@ public:
GLint pos_loc = glGetAttribLocation(m_program, "pos");
// GLint angle_loc = glGetUniformLocation(app_state->program, "angle");
float vertices[] = {0.0f, 0.6f, -0.6f, -0.6f, 0.6f, -0.6f};
float *vertices = new float[6]{0.0f, 0.6f, -0.6f, -0.6f, 0.6f, -0.6f};
glEnableVertexAttribArray(pos_loc);
glVertexAttribPointer(pos_loc, 2, GL_FLOAT, GL_FALSE, 0, vertices);
glViewport(0, 0, width, height);
glClearColor(0.2f, 0.4f, 0.8f, 1.0f);
m_xsurface =
xdg_wm_base_get_xdg_surface(AppState::GetInstance()->m_wm_base, m_wsurface);
m_xsurface = xdg_wm_base_get_xdg_surface(AppState::GetInstance()->m_wm_base,
m_wsurface);
if (m_xsurface == NULL) {
fprintf(stderr, "ERROR: could not get an xdg surface\n");
exit(1);
@@ -318,17 +413,29 @@ public:
}
m_xsurface_listener.configure = xsurface_handle_configure;
xdg_surface_add_listener(m_xsurface, &m_xsurface_listener, this);
wl_surface_commit(m_wsurface);
while (wl_display_dispatch(AppState::GetInstance()->m_display)) {
}
m_toplevel_listener.configure = xtoplevel_handle_configure;
m_toplevel_listener.configure_bounds = xtoplevel_handle_configure_bounds;
m_toplevel_listener.close = xtoplevel_handle_close;
m_toplevel_listener.wm_capabilities = xtoplevel_handle_wm_capabilities;
xdg_toplevel_add_listener(m_toplevel, &m_toplevel_listener, this);
wl_surface_commit(m_wsurface);
}
~Window() {}
Window(const Window&) = delete;
Window(Window&&) = delete;
Window(const Window &) = delete;
Window(Window &&) = delete;
public:
void Run() {
m_runnning = true;
printf("[DEBUG] Run(): display = %p\n", AppState::GetInstance()->m_display);
while (m_runnning && wl_display_dispatch(AppState::GetInstance()->m_display) != -1) {
}
}
private:
EGLSurface m_egl_surface;
EGLContext m_egl_context;
@@ -342,6 +449,13 @@ private:
struct wl_callback_listener m_frame_listener;
struct xdg_surface_listener m_xsurface_listener;
struct xdg_toplevel_listener m_toplevel_listener;
private: // app logic
uint32_t m_last_time;
size_t m_width;
size_t m_height;
bool m_runnning;
};
#endif // H_WINDOW_

4
src/main.cpp
View File

@@ -6,7 +6,11 @@ int main(int argc, char **argv) {
UNUSED(argc);
UNUSED(argv);
AppState::GetInstance();
Renderer::GetInstance();
Window window(720, 480);
window.Run();
return 0;
}