From f2793f3bd34528bd6e89b50addd3dde9256001a1 Mon Sep 17 00:00:00 2001 From: Virt <41426325+VirtCode@users.noreply.github.com> Date: Tue, 2 Jul 2024 16:53:52 +0200 Subject: [PATCH] fix: shake enabling compatible with nix close #7 --- README.md | 14 +++++++------- src/globals.hpp | 15 +++++++++------ src/main.cpp | 6 +++--- src/mode/ModeRotate.cpp | 2 +- src/mode/ModeTilt.cpp | 4 ++-- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index bb8074b..c39a719 100644 --- a/README.md +++ b/README.md @@ -142,23 +142,23 @@ plugin:dynamic-cursors { stretch { # controls how much the cursor is stretched - # this value controls at which speed (px/s) the full stretch + # this value controls at which speed (px/s) the full stretch is reached limit = 3000 - # relationship between speed and tilt, supports these vaules: + # relationship between speed and stretch amount, supports these vaules: # linear - a linear function is used # quadratic - a quadratic function is used # negative_quadratic - negative version of the quadratic one, feels more aggressive function = quadratic } - # enable shake to find - # magnifies the cursor if its is being shaken - shake = true - - # for when shake = true + # configure shake to find shake { + # enables shake to find + # magnifies the cursor if its is being shaken + enabled = true + # controls how soon a shake is detected # lower values mean sooner threshold = 4.0 diff --git a/src/globals.hpp b/src/globals.hpp index 4a91cda..f86df57 100644 --- a/src/globals.hpp +++ b/src/globals.hpp @@ -4,20 +4,23 @@ #define CONFIG_ENABLED "plugin:dynamic-cursors:enabled" #define CONFIG_MODE "plugin:dynamic-cursors:mode" -#define CONFIG_SHAKE "plugin:dynamic-cursors:shake" #define CONFIG_THRESHOLD "plugin:dynamic-cursors:threshold" +#define CONFIG_HW_DEBUG "plugin:dynamic-cursors:hw_debug" + +#define CONFIG_SHAKE "plugin:dynamic-cursors:shake:enabled" #define CONFIG_SHAKE_NEAREST "plugin:dynamic-cursors:shake:nearest" #define CONFIG_SHAKE_THRESHOLD "plugin:dynamic-cursors:shake:threshold" #define CONFIG_SHAKE_FACTOR "plugin:dynamic-cursors:shake:factor" #define CONFIG_SHAKE_EFFECTS "plugin:dynamic-cursors:shake:effects" #define CONFIG_SHAKE_IPC "plugin:dynamic-cursors:shake:ipc" -#define CONFIG_LENGTH "plugin:dynamic-cursors:rotate:length" + +#define CONFIG_ROTATE_LENGTH "plugin:dynamic-cursors:rotate:length" #define CONFIG_ROTATE_OFFSET "plugin:dynamic-cursors:rotate:offset" -#define CONFIG_MASS "plugin:dynamic-cursors:tilt:limit" -#define CONFIG_FUNCTION "plugin:dynamic-cursors:tilt:function" + +#define CONFIG_TILT_LIMIT "plugin:dynamic-cursors:tilt:limit" +#define CONFIG_TILT_FUNCTION "plugin:dynamic-cursors:tilt:function" + #define CONFIG_STRETCH_LIMIT "plugin:dynamic-cursors:stretch:limit" #define CONFIG_STRETCH_FUNCTION "plugin:dynamic-cursors:stretch:function" -#define CONFIG_HW_DEBUG "plugin:dynamic-cursors:hw_debug" - inline HANDLE PHANDLE = nullptr; diff --git a/src/main.cpp b/src/main.cpp index a3ed0d7..a7f03a1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -91,13 +91,13 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) { HyprlandAPI::addConfigValue(PHANDLE, CONFIG_SHAKE_THRESHOLD, Hyprlang::FLOAT{4}); HyprlandAPI::addConfigValue(PHANDLE, CONFIG_SHAKE_FACTOR, Hyprlang::FLOAT{1.5}); - HyprlandAPI::addConfigValue(PHANDLE, CONFIG_FUNCTION, Hyprlang::STRING{"negative_quadratic"}); - HyprlandAPI::addConfigValue(PHANDLE, CONFIG_MASS, Hyprlang::INT{5000}); + HyprlandAPI::addConfigValue(PHANDLE, CONFIG_TILT_FUNCTION, Hyprlang::STRING{"negative_quadratic"}); + HyprlandAPI::addConfigValue(PHANDLE, CONFIG_TILT_LIMIT, Hyprlang::INT{5000}); HyprlandAPI::addConfigValue(PHANDLE, CONFIG_STRETCH_FUNCTION, Hyprlang::STRING{"negative_quadratic"}); HyprlandAPI::addConfigValue(PHANDLE, CONFIG_STRETCH_LIMIT, Hyprlang::INT{3000}); - HyprlandAPI::addConfigValue(PHANDLE, CONFIG_LENGTH, Hyprlang::INT{20}); + HyprlandAPI::addConfigValue(PHANDLE, CONFIG_ROTATE_LENGTH, Hyprlang::INT{20}); HyprlandAPI::addConfigValue(PHANDLE, CONFIG_ROTATE_OFFSET, Hyprlang::FLOAT{0}); HyprlandAPI::addConfigValue(PHANDLE, CONFIG_HW_DEBUG, Hyprlang::INT{0}); diff --git a/src/mode/ModeRotate.cpp b/src/mode/ModeRotate.cpp index d36b72e..da53e4a 100644 --- a/src/mode/ModeRotate.cpp +++ b/src/mode/ModeRotate.cpp @@ -6,7 +6,7 @@ EModeUpdate CModeRotate::strategy() { } SModeResult CModeRotate::update(Vector2D pos) { - static auto* const* PLENGTH = (Hyprlang::INT* const*)HyprlandAPI::getConfigValue(PHANDLE, CONFIG_LENGTH)->getDataStaticPtr(); + static auto* const* PLENGTH = (Hyprlang::INT* const*)HyprlandAPI::getConfigValue(PHANDLE, CONFIG_ROTATE_LENGTH)->getDataStaticPtr(); static auto* const* POFFSET = (Hyprlang::FLOAT* const*)HyprlandAPI::getConfigValue(PHANDLE, CONFIG_ROTATE_OFFSET)->getDataStaticPtr(); // translate to origin diff --git a/src/mode/ModeTilt.cpp b/src/mode/ModeTilt.cpp index 3019af3..c3bddeb 100644 --- a/src/mode/ModeTilt.cpp +++ b/src/mode/ModeTilt.cpp @@ -8,8 +8,8 @@ EModeUpdate CModeTilt::strategy() { } SModeResult CModeTilt::update(Vector2D pos) { - static auto const* PFUNCTION = (Hyprlang::STRING const*)HyprlandAPI::getConfigValue(PHANDLE, CONFIG_FUNCTION)->getDataStaticPtr(); - static auto* const* PMASS = (Hyprlang::INT* const*)HyprlandAPI::getConfigValue(PHANDLE, CONFIG_MASS)->getDataStaticPtr(); + static auto const* PFUNCTION = (Hyprlang::STRING const*)HyprlandAPI::getConfigValue(PHANDLE, CONFIG_TILT_FUNCTION)->getDataStaticPtr(); + static auto* const* PMASS = (Hyprlang::INT* const*)HyprlandAPI::getConfigValue(PHANDLE, CONFIG_TILT_LIMIT)->getDataStaticPtr(); // create samples array int max = g_pHyprRenderer->m_pMostHzMonitor->refreshRate / 10; // 100ms worth of history