diff options
author | Campbell Barton <campbell@blender.org> | 2022-11-12 09:10:25 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-11-12 09:10:25 +0300 |
commit | e87b99d7f32a5f75816dfaaa9d419a014620dc1f (patch) | |
tree | 676d35c297aa77528120951424feee1b3796b91a /intern/ghost/intern/GHOST_SystemWayland.h | |
parent | fcfa9ac219ffa7cd7acfa9975ed17350c9ec1f72 (diff) | |
parent | 7931ae0df3f2541316871c7b2ce7be3bd114e848 (diff) |
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'intern/ghost/intern/GHOST_SystemWayland.h')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWayland.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWayland.h b/intern/ghost/intern/GHOST_SystemWayland.h index a8e8d8ddc45..45eb1d9d3e3 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.h +++ b/intern/ghost/intern/GHOST_SystemWayland.h @@ -137,26 +137,28 @@ class GHOST_SystemWayland : public GHOST_System { const bool is_dialog, const GHOST_IWindow *parentWindow) override; - GHOST_TSuccess setCursorShape(GHOST_TStandardCursor shape); + bool supportsCursorWarp() override; + bool supportsWindowPosition() override; - GHOST_TSuccess hasCursorShape(GHOST_TStandardCursor cursorShape); + /* WAYLAND utility functions (share window/system logic). */ - GHOST_TSuccess setCustomCursorShape(uint8_t *bitmap, - uint8_t *mask, - int sizex, - int sizey, - int hotX, - int hotY, - bool canInvertColor); + GHOST_TSuccess cursor_shape_set(GHOST_TStandardCursor shape); - GHOST_TSuccess getCursorBitmap(GHOST_CursorBitmapRef *bitmap); + GHOST_TSuccess cursor_shape_check(GHOST_TStandardCursor cursorShape); - GHOST_TSuccess setCursorVisibility(bool visible); + GHOST_TSuccess cursor_shape_custom_set(uint8_t *bitmap, + uint8_t *mask, + int sizex, + int sizey, + int hotX, + int hotY, + bool canInvertColor); - bool supportsCursorWarp() override; - bool supportsWindowPosition() override; + GHOST_TSuccess cursor_bitmap_get(GHOST_CursorBitmapRef *bitmap); + + GHOST_TSuccess cursor_visibility_set(bool visible); - bool getCursorGrabUseSoftwareDisplay(const GHOST_TGrabCursorMode mode); + bool cursor_grab_use_software_display_get(const GHOST_TGrabCursorMode mode); /* WAYLAND direct-data access. */ |