diff --git a/src/lib/base/DirectionTypes.h b/src/lib/base/DirectionTypes.h index ac10a5017..7de2f2274 100644 --- a/src/lib/base/DirectionTypes.h +++ b/src/lib/base/DirectionTypes.h @@ -9,6 +9,7 @@ #pragma once #include + /** * @brief Screen edge directions for mouse movement * diff --git a/src/lib/deskflow/PlatformScreen.cpp b/src/lib/deskflow/PlatformScreen.cpp index 3ae6f3605..28b2588d3 100644 --- a/src/lib/deskflow/PlatformScreen.cpp +++ b/src/lib/deskflow/PlatformScreen.cpp @@ -6,8 +6,8 @@ */ #include "deskflow/PlatformScreen.h" +#include "base/DirectionTypes.h" #include "deskflow/App.h" -#include "deskflow/ArgsBase.h" PlatformScreen::PlatformScreen(IEventQueue *events, deskflow::ClientScrollDirection scrollDirection) : IPlatformScreen(events), @@ -88,3 +88,22 @@ int32_t PlatformScreen::mapClientScrollDirection(int32_t x) const { return (x * static_cast(m_clientScrollDirection)); } + +std::string PlatformScreen::sidesMaskToString(uint32_t sides) +{ + using enum DirectionMask; + std::string sidesText; + if ((sides & static_cast(LeftMask)) != 0) { + sidesText += "L"; + } + if ((sides & static_cast(RightMask)) != 0) { + sidesText += "R"; + } + if ((sides & static_cast(TopMask)) != 0) { + sidesText += "T"; + } + if ((sides & static_cast(BottomMask)) != 0) { + sidesText += "B"; + } + return sidesText; +} diff --git a/src/lib/deskflow/PlatformScreen.h b/src/lib/deskflow/PlatformScreen.h index e5f611f94..6b8648587 100644 --- a/src/lib/deskflow/PlatformScreen.h +++ b/src/lib/deskflow/PlatformScreen.h @@ -106,6 +106,11 @@ protected: */ virtual int32_t mapClientScrollDirection(int32_t) const; + /*! + Converts a sides mask (e.g. LeftMask | RightMask) to a string representation (e.g. "LR"). + */ + static std::string sidesMaskToString(uint32_t sides); + private: /*! * \brief m_clientScrollDirection diff --git a/src/lib/platform/EiScreen.cpp b/src/lib/platform/EiScreen.cpp index 4131b1819..8385f1f31 100644 --- a/src/lib/platform/EiScreen.cpp +++ b/src/lib/platform/EiScreen.cpp @@ -179,7 +179,8 @@ void EiScreen::getCursorPos(int32_t &x, int32_t &y) const void EiScreen::reconfigure(uint32_t activeSides) { - LOG((CLOG_DEBUG "active sides: %x", activeSides)); + const static auto sidesText = sidesMaskToString(activeSides); + LOG_DEBUG("active sides: %s (0x%02x)", sidesText.c_str(), activeSides); m_activeSides = activeSides; } diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index 69ad5875a..b355b734a 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -507,7 +507,8 @@ void MSWindowsScreen::reconfigure(uint32_t activeSides) { assert(m_isPrimary); - LOG((CLOG_DEBUG "active sides: %x", activeSides)); + const static auto sidesText = sidesMaskToString(activeSides); + LOG_DEBUG("active sides: %s (0x%02x)", sidesText.c_str(), activeSides); m_hook.setSides(activeSides); } diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm index bd65f3de4..400840942 100644 --- a/src/lib/platform/OSXScreen.mm +++ b/src/lib/platform/OSXScreen.mm @@ -246,7 +246,8 @@ void OSXScreen::getCursorPos(int32_t &x, int32_t &y) const void OSXScreen::reconfigure(uint32_t activeSides) { - LOG((CLOG_DEBUG "active sides: %x", activeSides)); + const static auto sidesText = sidesMaskToString(activeSides); + LOG_DEBUG("active sides: %s (0x%02x)", sidesText.c_str(), activeSides); m_activeSides = activeSides; } diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp index c727593fa..f88ae33dc 100644 --- a/src/lib/platform/XWindowsScreen.cpp +++ b/src/lib/platform/XWindowsScreen.cpp @@ -479,6 +479,8 @@ void XWindowsScreen::getCursorPos(int32_t &x, int32_t &y) const void XWindowsScreen::reconfigure(uint32_t activeSides) { + const static auto sidesText = sidesMaskToString(activeSides); + LOG_DEBUG("active sides: %s (0x%02x)", sidesText.c_str(), activeSides); m_activeSides = activeSides; }