Add fallback support for thumbwheel via REL_HWHEEL

src/logid/CMakeLists.txt

@@ -1,120 +1,120 @@
-cmake_minimum_required(VERSION 3.12)
-project(logid)
-
-# C++20 is only needed for string literal template parameters
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/../CMake")
-
-find_package(Threads REQUIRED)
-find_package(PkgConfig REQUIRED)
-
-add_executable(logid
-        logid.cpp
-        util/log.cpp
-        config/config.cpp
-        InputDevice.cpp
-        DeviceManager.cpp
-        Device.cpp
-        Receiver.cpp
-        Configuration.cpp
-        features/DPI.cpp
-        features/SmartShift.cpp
-        features/HiresScroll.cpp
-        features/RemapButton.cpp
-        features/DeviceStatus.cpp
-        features/ThumbWheel.cpp
-        actions/Action.cpp
-        actions/NullAction.cpp
-        actions/KeypressAction.cpp
-        actions/ToggleHiresScroll.cpp
-        actions/ToggleSmartShift.cpp
-        actions/CycleDPI.cpp
-        actions/ChangeDPI.cpp
-        actions/GestureAction.cpp
-        actions/ChangeHostAction.cpp
-        actions/ChangeProfile.cpp
-        actions/gesture/Gesture.cpp
-        actions/gesture/ReleaseGesture.cpp
-        actions/gesture/ThresholdGesture.cpp
-        actions/gesture/IntervalGesture.cpp
-        actions/gesture/AxisGesture.cpp
-        actions/gesture/NullGesture.cpp
-        backend/Error.cpp
-        backend/raw/DeviceMonitor.cpp
-        backend/raw/RawDevice.cpp
-        backend/raw/IOMonitor.cpp
-        backend/hidpp10/Receiver.cpp
-        backend/hidpp10/ReceiverMonitor.cpp
-        backend/hidpp/Device.cpp
-        backend/hidpp/Report.cpp
-        backend/hidpp10/Error.cpp
-        backend/hidpp10/Device.cpp
-        backend/hidpp20/Device.cpp
-        backend/hidpp20/Error.cpp
-        backend/hidpp20/Feature.cpp
-        backend/hidpp20/EssentialFeature.cpp
-        backend/hidpp20/features/Root.cpp
-        backend/hidpp20/features/FeatureSet.cpp
-        backend/hidpp20/features/DeviceName.cpp
-        backend/hidpp20/features/Reset.cpp
-        backend/hidpp20/features/AdjustableDPI.cpp
-        backend/hidpp20/features/SmartShift.cpp
-        backend/hidpp20/features/ReprogControls.cpp
-        backend/hidpp20/features/HiresScroll.cpp
-        backend/hidpp20/features/ChangeHost.cpp
-        backend/hidpp20/features/WirelessDeviceStatus.cpp
-        backend/hidpp20/features/ThumbWheel.cpp
-        util/task.cpp
-        util/ExceptionHandler.cpp)
-
-set_target_properties(logid PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
-pkg_check_modules(PC_EVDEV libevdev REQUIRED)
-pkg_check_modules(SYSTEMD "systemd")
-pkg_check_modules(LIBCONFIG libconfig REQUIRED)
-pkg_check_modules(LIBUDEV libudev REQUIRED)
-
-find_path(EVDEV_INCLUDE_DIR libevdev/libevdev.h
-        HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR})
-find_library(EVDEV_LIBRARY
-        NAMES evdev libevdev)
-
-set(IPCGULL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ipcgull/src/include)
-message(${IPCGULL_INCLUDE_DIRS})
-
-include_directories(. ${EVDEV_INCLUDE_DIR} ${LIBUDEV_INCLUDE_DIRECTORIES} ${IPCGULL_INCLUDE_DIRS})
-
-target_link_libraries(logid ${CMAKE_THREAD_LIBS_INIT} ${EVDEV_LIBRARY} config++
-        ${LIBUDEV_LIBRARIES} ipcgull)
-
-install(TARGETS logid DESTINATION bin)
-
-if (SYSTEMD_FOUND)
-    if ("${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
-        execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
-                --variable=systemdsystemunitdir systemd
-                OUTPUT_VARIABLE SYSTEMD_SERVICES_INSTALL_DIR)
-        string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SERVICES_INSTALL_DIR
-                "${SYSTEMD_SERVICES_INSTALL_DIR}")
-    endif ()
-
-    # Install systemd service
-    configure_file(logid.service.in ${CMAKE_BINARY_DIR}/logid.service)
-    message(STATUS "systemd units will be installed at ${SYSTEMD_SERVICES_INSTALL_DIR}")
-    install(FILES ${CMAKE_BINARY_DIR}/logid.service
-            DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
-            COMPONENT cp)
-elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
-    message(FATAL_ERROR "systemd is not found w/ pkg-config but SYSTEMD_SERVICES_INSTALL_DIR is defined.")
-endif ()
-
-# Install DBus conf
-# TODO: Is there a better way of setting the system policy directory?
-set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d")
-configure_file(logiops-dbus.conf.in ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf)
-message(STATUS "dbus system policy will be installed at ${DBUS_SYSTEM_POLICY_INSTALL_DIR}")
-install(FILES ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf
-        DESTINATION ${DBUS_SYSTEM_POLICY_INSTALL_DIR}
-        COMPONENT cp)
+cmake_minimum_required(VERSION 3.12)
+project(logid)
+
+# C++20 is only needed for string literal template parameters
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/../CMake")
+
+find_package(Threads REQUIRED)
+find_package(PkgConfig REQUIRED)
+
+add_executable(logid
+        logid.cpp
+        util/log.cpp
+        config/config.cpp
+        InputDevice.cpp
+        DeviceManager.cpp
+        Device.cpp
+        Receiver.cpp
+        Configuration.cpp
+        features/DPI.cpp
+        features/SmartShift.cpp
+        features/HiresScroll.cpp
+        features/RemapButton.cpp
+        features/DeviceStatus.cpp
+        features/ThumbWheel.cpp
+        actions/Action.cpp
+        actions/NullAction.cpp
+        actions/KeypressAction.cpp
+        actions/ToggleHiresScroll.cpp
+        actions/ToggleSmartShift.cpp
+        actions/CycleDPI.cpp
+        actions/ChangeDPI.cpp
+        actions/GestureAction.cpp
+        actions/ChangeHostAction.cpp
+        actions/ChangeProfile.cpp
+        actions/gesture/Gesture.cpp
+        actions/gesture/ReleaseGesture.cpp
+        actions/gesture/ThresholdGesture.cpp
+        actions/gesture/IntervalGesture.cpp
+        actions/gesture/AxisGesture.cpp
+        actions/gesture/NullGesture.cpp
+        backend/Error.cpp
+        backend/raw/DeviceMonitor.cpp
+        backend/raw/RawDevice.cpp
+        backend/raw/IOMonitor.cpp
+        backend/hidpp10/Receiver.cpp
+        backend/hidpp10/ReceiverMonitor.cpp
+        backend/hidpp/Device.cpp
+        backend/hidpp/Report.cpp
+        backend/hidpp10/Error.cpp
+        backend/hidpp10/Device.cpp
+        backend/hidpp20/Device.cpp
+        backend/hidpp20/Error.cpp
+        backend/hidpp20/Feature.cpp
+        backend/hidpp20/EssentialFeature.cpp
+        backend/hidpp20/features/Root.cpp
+        backend/hidpp20/features/FeatureSet.cpp
+        backend/hidpp20/features/DeviceName.cpp
+        backend/hidpp20/features/Reset.cpp
+        backend/hidpp20/features/AdjustableDPI.cpp
+        backend/hidpp20/features/SmartShift.cpp
+        backend/hidpp20/features/ReprogControls.cpp
+        backend/hidpp20/features/HiresScroll.cpp
+        backend/hidpp20/features/ChangeHost.cpp
+        backend/hidpp20/features/WirelessDeviceStatus.cpp
+        backend/hidpp20/features/ThumbWheel.cpp
+        util/task.cpp
+        util/ExceptionHandler.cpp)
+
+set_target_properties(logid PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
+pkg_check_modules(PC_EVDEV libevdev REQUIRED)
+pkg_check_modules(SYSTEMD "systemd")
+pkg_check_modules(LIBCONFIG libconfig REQUIRED)
+pkg_check_modules(LIBUDEV libudev REQUIRED)
+
+find_path(EVDEV_INCLUDE_DIR libevdev/libevdev.h
+        HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR})
+find_library(EVDEV_LIBRARY
+        NAMES evdev libevdev)
+
+set(IPCGULL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ipcgull/src/include)
+message(${IPCGULL_INCLUDE_DIRS})
+
+include_directories(. ${EVDEV_INCLUDE_DIR} ${LIBUDEV_INCLUDE_DIRECTORIES} ${IPCGULL_INCLUDE_DIRS})
+
+target_link_libraries(logid ${CMAKE_THREAD_LIBS_INIT} ${EVDEV_LIBRARY} config++
+        ${LIBUDEV_LIBRARIES} ipcgull)
+
+install(TARGETS logid DESTINATION bin)
+
+if (SYSTEMD_FOUND)
+    if ("${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
+        execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
+                --variable=systemdsystemunitdir systemd
+                OUTPUT_VARIABLE SYSTEMD_SERVICES_INSTALL_DIR)
+        string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SERVICES_INSTALL_DIR
+                "${SYSTEMD_SERVICES_INSTALL_DIR}")
+    endif ()
+
+    # Install systemd service
+    configure_file(logid.service.in ${CMAKE_BINARY_DIR}/logid.service)
+    message(STATUS "systemd units will be installed at ${SYSTEMD_SERVICES_INSTALL_DIR}")
+    install(FILES ${CMAKE_BINARY_DIR}/logid.service
+            DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
+            COMPONENT cp)
+elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
+    message(FATAL_ERROR "systemd is not found w/ pkg-config but SYSTEMD_SERVICES_INSTALL_DIR is defined.")
+endif ()
+
+# Install DBus conf
+# TODO: Is there a better way of setting the system policy directory?
+set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d")
+configure_file(logiops-dbus.conf.in ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf)
+message(STATUS "dbus system policy will be installed at ${DBUS_SYSTEM_POLICY_INSTALL_DIR}")
+install(FILES ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf
+        DESTINATION ${DBUS_SYSTEM_POLICY_INSTALL_DIR}
+        COMPONENT cp)

src/logid/Configuration.cpp

@@ -1,76 +1,76 @@
-/*
- * Copyright 2019-2023 PixlOne
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <Configuration.h>
-#include <util/log.h>
-#include <utility>
-#include <filesystem>
-#include <ipc_defs.h>
-
-using namespace logid;
-using namespace libconfig;
-using namespace logid::config;
-
-Configuration::Configuration(std::string config_file) :
-        _config_file(std::move(config_file)) {
-    if (std::filesystem::exists(_config_file)) {
-        try {
-            _config.readFile(_config_file.c_str());
-        } catch (const FileIOException& e) {
-            logPrintf(ERROR, "I/O Error while reading %s: %s", _config_file.c_str(),
-                  e.what());
-            throw;
-        } catch (const ParseException& e) {
-            logPrintf(ERROR, "Parse error in %s, line %d: %s", e.getFile(),
-                  e.getLine(), e.getError());
-            throw;
-        }
-
-        Config::operator=(get<Config>(_config.getRoot()));
-    } else {
-        logPrintf(INFO, "Config file does not exist, using empty config.");
-    }
-
-    if (!devices.has_value())
-        devices.emplace();
-}
-
-Configuration::Configuration() {
-    devices.emplace();
-}
-
-void Configuration::save() {
-    config::set(_config.getRoot(), *this);
-    try {
-        _config.writeFile(_config_file.c_str());
-    } catch (const FileIOException& e) {
-        logPrintf(ERROR, "I/O Error while writing %s: %s",
-                  _config_file.c_str(), e.what());
-        throw;
-    } catch (const std::exception& e) {
-        logPrintf(ERROR, "Error while writing %s: %s",
-                  _config_file.c_str(), e.what());
-        throw;
-    }
-}
-
-Configuration::IPC::IPC(Configuration* config) :
-        ipcgull::interface(SERVICE_ROOT_NAME ".Config", {
-                {"Save", {config, &Configuration::save}}
-        }, {}, {}) {
-}
+/*
+ * Copyright 2019-2023 PixlOne
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <Configuration.h>
+#include <util/log.h>
+#include <utility>
+#include <filesystem>
+#include <ipc_defs.h>
+
+using namespace logid;
+using namespace libconfig;
+using namespace logid::config;
+
+Configuration::Configuration(std::string config_file) :
+        _config_file(std::move(config_file)) {
+    if (std::filesystem::exists(_config_file)) {
+        try {
+            _config.readFile(_config_file.c_str());
+        } catch (const FileIOException& e) {
+            logPrintf(ERROR, "I/O Error while reading %s: %s", _config_file.c_str(),
+                  e.what());
+            throw;
+        } catch (const ParseException& e) {
+            logPrintf(ERROR, "Parse error in %s, line %d: %s", e.getFile(),
+                  e.getLine(), e.getError());
+            throw;
+        }
+
+        Config::operator=(get<Config>(_config.getRoot()));
+    } else {
+        logPrintf(INFO, "Config file does not exist, using empty config.");
+    }
+
+    if (!devices.has_value())
+        devices.emplace();
+}
+
+Configuration::Configuration() {
+    devices.emplace();
+}
+
+void Configuration::save() {
+    config::set(_config.getRoot(), *this);
+    try {
+        _config.writeFile(_config_file.c_str());
+    } catch (const FileIOException& e) {
+        logPrintf(ERROR, "I/O Error while writing %s: %s",
+                  _config_file.c_str(), e.what());
+        throw;
+    } catch (const std::exception& e) {
+        logPrintf(ERROR, "Error while writing %s: %s",
+                  _config_file.c_str(), e.what());
+        throw;
+    }
+}
+
+Configuration::IPC::IPC(Configuration* config) :
+        ipcgull::interface(SERVICE_ROOT_NAME ".Config", {
+                {"Save", {config, &Configuration::save}}
+        }, {}, {}) {
+}