add sensitivity per device & reload mice on config

src/config/ConfigManager.cpp

@@ -108,6 +108,7 @@ void CConfigManager::setDefaultVars() {
     configValues["animations:workspaces_speed"].floatValue = 0.f;
     configValues["animations:workspaces"].intValue = 1;
 
+    configValues["input:sensitivity"].floatValue = 0.f;
     configValues["input:kb_layout"].strValue = "us";
     configValues["input:kb_variant"].strValue = STRVAL_EMPTY;
     configValues["input:kb_options"].strValue = STRVAL_EMPTY;
@@ -140,6 +141,7 @@ void CConfigManager::setDefaultVars() {
 void CConfigManager::setDeviceDefaultVars(const std::string& dev) {
     auto& cfgValues = deviceConfigs[dev];
 
+    cfgValues["sensitivity"].floatValue = 0.f;
     cfgValues["kb_layout"].strValue = "us";
     cfgValues["kb_variant"].strValue = STRVAL_EMPTY;
     cfgValues["kb_options"].strValue = STRVAL_EMPTY;
@@ -902,8 +904,10 @@ void CConfigManager::loadConfigLoadVars() {
         g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->ID);
 
     // Update the keyboard layout to the cfg'd one if this is not the first launch
-    if (!isFirstLaunch)
+    if (!isFirstLaunch) {
         g_pInputManager->setKeyboardLayout();
+        g_pInputManager->setMouseConfigs();
+    }
 
     // Calculate the internal vars
     configValues["general:main_mod_internal"].intValue = g_pKeybindManager->stringToModMask(configValues["general:main_mod"].strValue);

src/managers/input/InputManager.cpp

@@ -522,11 +522,34 @@ void CInputManager::newMouse(wlr_input_device* mouse, bool virt) {
         Debug::log(ERR, "Mouse had no name???"); // logic error
     }
 
-    const auto HASCONFIG = g_pConfigManager->deviceConfigExists(PMOUSE->name);
-
     if (wlr_input_device_is_libinput(mouse)) {
         const auto LIBINPUTDEV = (libinput_device*)wlr_libinput_get_device_handle(mouse);
 
+        Debug::log(LOG, "New mouse has libinput sens %.2f (%.2f) with accel profile %i (%i)", libinput_device_config_accel_get_speed(LIBINPUTDEV), libinput_device_config_accel_get_default_speed(LIBINPUTDEV), libinput_device_config_accel_get_profile(LIBINPUTDEV), libinput_device_config_accel_get_default_profile(LIBINPUTDEV));
+    }
+
+    setMouseConfigs();
+
+    PMOUSE->hyprListener_destroyMouse.initCallback(&mouse->events.destroy, &Events::listener_destroyMouse, PMOUSE, "Mouse");
+
+    wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, mouse);
+
+    g_pCompositor->m_sSeat.mouse = PMOUSE;
+
+    m_tmrLastCursorMovement.reset();
+
+    Debug::log(LOG, "New mouse created, pointer WLR: %x", mouse);
+}
+
+void CInputManager::setMouseConfigs() {
+    for (auto& m : m_lMice) {
+        const auto PMOUSE = &m;
+
+        const auto HASCONFIG = g_pConfigManager->deviceConfigExists(PMOUSE->name);
+
+        if (wlr_input_device_is_libinput(m.mouse)) {
+            const auto LIBINPUTDEV = (libinput_device*)wlr_libinput_get_device_handle(m.mouse);
+
             if ((HASCONFIG ? g_pConfigManager->getDeviceInt(PMOUSE->name, "clickfinger_behavior") : g_pConfigManager->getInt("input:touchpad:clickfinger_behavior")) == 0)  // toggle software buttons or clickfinger
                 libinput_device_config_click_set_method(LIBINPUTDEV, LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS);
             else
@@ -561,17 +584,15 @@ void CInputManager::newMouse(wlr_input_device* mouse, bool virt) {
                 const auto DWT = static_cast<enum libinput_config_dwt_state>((HASCONFIG ? g_pConfigManager->getDeviceInt(PMOUSE->name, "disable_while_typing") : g_pConfigManager->getInt("input:touchpad:disable_while_typing")) != 0);
                 libinput_device_config_dwt_set_enabled(LIBINPUTDEV, DWT);
             }
+
+            const auto LIBINPUTSENS = std::clamp((HASCONFIG ? g_pConfigManager->getDeviceFloat(PMOUSE->name, "sensitivity") : g_pConfigManager->getFloat("input:sensitivity")), -1.f, 1.f);
+
+            libinput_device_config_accel_set_profile(LIBINPUTDEV, LIBINPUT_CONFIG_ACCEL_PROFILE_NONE);
+            libinput_device_config_accel_set_speed(LIBINPUTDEV, LIBINPUTSENS);
+
+            Debug::log(LOG, "Applied config to mouse %s, sens %.2f", m.name.c_str(), LIBINPUTSENS);
+        }
     }
-
-    PMOUSE->hyprListener_destroyMouse.initCallback(&mouse->events.destroy, &Events::listener_destroyMouse, PMOUSE, "Mouse");
-
-    wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, mouse);
-
-    g_pCompositor->m_sSeat.mouse = PMOUSE;
-
-    m_tmrLastCursorMovement.reset();
-
-    Debug::log(LOG, "New mouse created, pointer WLR: %x", mouse);
 }
 
 void CInputManager::destroyKeyboard(SKeyboard* pKeyboard) {

src/managers/input/InputManager.hpp

@@ -32,6 +32,7 @@ public:
     void            refocus();
 
     void            setKeyboardLayout();
+    void            setMouseConfigs();
 
     void            updateDragIcon();
     void            updateCapabilities(wlr_input_device*);