diff options
author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
tree | 0cbb1b91fe26c750197126085b74224a795a103c /intern/ghost/intern/GHOST_System.h | |
parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'intern/ghost/intern/GHOST_System.h')
-rw-r--r-- | intern/ghost/intern/GHOST_System.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index b60ce09f743..8c51b3421b2 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -120,8 +120,7 @@ class GHOST_System : public GHOST_ISystem { */ GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting &setting, GHOST_IWindow **window, - const bool stereoVisual, - const bool alphaBackground); + const bool stereoVisual); /** * Updates the resolution while in fullscreen mode. @@ -203,6 +202,15 @@ class GHOST_System : public GHOST_ISystem { * Cursor management functionality ***************************************************************************************/ + /* Client relative functions use a default implementation + * that converts from screen-coordinates to client coordinates. + * Implementations may override. */ + + GHOST_TSuccess getCursorPositionClientRelative(const GHOST_IWindow *window, + int32_t &x, + int32_t &y) const; + GHOST_TSuccess setCursorPositionClientRelative(GHOST_IWindow *window, int32_t x, int32_t y); + /** * Inherited from GHOST_ISystem but left pure virtual * <pre> @@ -221,7 +229,7 @@ class GHOST_System : public GHOST_ISystem { * \param isDown: The state of a modifier key (true == pressed). * \return Indication of success. */ - GHOST_TSuccess getModifierKeyState(GHOST_TModifierKeyMask mask, bool &isDown) const; + GHOST_TSuccess getModifierKeyState(GHOST_TModifierKey mask, bool &isDown) const; /** * Returns the state of a mouse button (outside the message queue). @@ -229,7 +237,7 @@ class GHOST_System : public GHOST_ISystem { * \param isDown: Button state. * \return Indication of success. */ - GHOST_TSuccess getButtonState(GHOST_TButtonMask mask, bool &isDown) const; + GHOST_TSuccess getButtonState(GHOST_TButton mask, bool &isDown) const; /** * Set which tablet API to use. Only affects Windows, other platforms have a single API. @@ -367,8 +375,7 @@ class GHOST_System : public GHOST_ISystem { */ GHOST_TSuccess createFullScreenWindow(GHOST_Window **window, const GHOST_DisplaySetting &settings, - const bool stereoVisual, - const bool alphaBackground = 0); + const bool stereoVisual); /** The display manager (platform dependent). */ GHOST_DisplayManager *m_displayManager; |