diff options
author | Campbell Barton <campbell@blender.org> | 2022-07-01 15:45:10 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-07-01 15:50:58 +0300 |
commit | da00d62c4913a71e116f74f874d7a17cfee9c14e (patch) | |
tree | 08cc56d0a62f24796bc3ca0224536a3fcd8a4974 /intern/ghost/intern/GHOST_WindowWayland.h | |
parent | 56b218296c228acbe00940d50336a3b6f0df2915 (diff) |
Fix crash with window decorations (libdecor) in Wayland
Surfaces from window decorations were passed into GHOST's listeners
since libdecor & GHOST share a connection.
This error introduced by recent changes that assumed surfaces passed to
GHOST's handler functions were owned by GHOST.
Tag GHOST surfaces & outputs to ensure GHOST only attempts to access
data it created.
Diffstat (limited to 'intern/ghost/intern/GHOST_WindowWayland.h')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowWayland.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWayland.h b/intern/ghost/intern/GHOST_WindowWayland.h index 1afad3b47b3..c754e4cd9e7 100644 --- a/intern/ghost/intern/GHOST_WindowWayland.h +++ b/intern/ghost/intern/GHOST_WindowWayland.h @@ -100,19 +100,6 @@ class GHOST_WindowWayland : public GHOST_Window { struct wl_surface *surface() const; const std::vector<output_t *> &outputs(); - /* WAYLAND query access. */ - - /** - * Use window find function when the window may have been closed. - * Typically this is needed when accessing surfaces outside WAYLAND handlers. - */ - static GHOST_WindowWayland *from_surface_find(const wl_surface *surface); - /** - * Use direct access when from WAYLAND handlers. - */ - static const GHOST_WindowWayland *from_surface(const wl_surface *surface); - static GHOST_WindowWayland *from_surface_mut(wl_surface *surface); - /* WAYLAND window-level functions. */ GHOST_TSuccess close(); @@ -124,8 +111,6 @@ class GHOST_WindowWayland : public GHOST_Window { bool outputs_enter(output_t *reg_output); bool outputs_leave(output_t *reg_output); - bool outputs_enter_wl(const struct wl_output *output); - bool outputs_leave_wl(const struct wl_output *output); bool outputs_changed_update_scale(); |