From e6f74c04d66c9fad9b9388490625cbf7477ed302 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Tue, 8 Nov 2022 00:31:57 +0100 Subject: Wayland cursor handling is fucking stupid. --- profiler/src/BackendWayland.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/profiler/src/BackendWayland.cpp b/profiler/src/BackendWayland.cpp index 1ac93b63..3ef0d9b2 100644 --- a/profiler/src/BackendWayland.cpp +++ b/profiler/src/BackendWayland.cpp @@ -7,8 +7,10 @@ #include #include #include +#include #include #include +#include #include #include "xdg-shell.h" @@ -32,6 +34,9 @@ static struct xdg_surface* s_xdgSurf; static struct xdg_toplevel* s_toplevel; static struct wl_seat* s_seat; static struct wl_pointer* s_pointer; +static struct wl_cursor_theme* s_cursorTheme; +static struct wl_surface* s_cursorSurf; +static int32_t s_cursorX, s_cursorY; static bool s_running = true; static int s_w, s_h; @@ -42,6 +47,7 @@ static bool s_wheel; static void PointerEnter( void*, struct wl_pointer* pointer, uint32_t serial, struct wl_surface* surf, wl_fixed_t sx, wl_fixed_t sy ) { + wl_pointer_set_cursor( pointer, serial, s_cursorSurf, s_cursorX, s_cursorY ); ImGuiIO& io = ImGui::GetIO(); io.AddMousePosEvent( wl_fixed_to_double( sx ), wl_fixed_to_double( sy ) ); } @@ -239,6 +245,17 @@ Backend::Backend( const char* title, std::function redraw, RunQueue* mai s_xdgSurf = xdg_wm_base_get_xdg_surface( s_wm, s_surf ); xdg_surface_add_listener( s_xdgSurf, &surfaceListener, nullptr ); + auto env_xcursor_theme = getenv( "XCURSOR_THEME" ); + auto env_xcursor_size = getenv( "XCURSOR_SIZE" ); + + s_cursorTheme = wl_cursor_theme_load( env_xcursor_theme, env_xcursor_size ? atoi( env_xcursor_size ) : 24, s_shm ); + auto cursor = wl_cursor_theme_get_cursor( s_cursorTheme, "left_ptr" ); + s_cursorSurf = wl_compositor_create_surface( s_comp ); + wl_surface_attach( s_cursorSurf, wl_cursor_image_get_buffer( cursor->images[0] ), 0, 0 ); + wl_surface_commit( s_cursorSurf ); + s_cursorX = cursor->images[0]->hotspot_x; + s_cursorY = cursor->images[0]->hotspot_y; + constexpr EGLint eglConfigAttrib[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_RED_SIZE, 8, @@ -296,6 +313,8 @@ Backend::~Backend() eglDestroyContext( s_eglDpy, s_eglCtx ); eglTerminate( s_eglDpy ); xdg_toplevel_destroy( s_toplevel ); + wl_surface_destroy( s_cursorSurf ); + wl_cursor_theme_destroy( s_cursorTheme ); xdg_surface_destroy( s_xdgSurf ); wl_egl_window_destroy( s_eglWin ); wl_surface_destroy( s_surf ); -- cgit v1.2.3