hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-12-20 07:10:02 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge d5eba72cad into 6175ecd4c4

Browse source
This commit is contained in:
Marko Matovic 2025-12-19 01:45:14 +05:30 • committed by GitHub
commit e2c54933d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hyprtester/pointer-scroll.txt Normal file
View file

@ -0,0 +1 @@
Failed to connect to wayland display

24
src/config/ConfigDescriptions.hpp
View file

@ -490,6 +490,18 @@ inline static const std::vector<SConfigOptionDescription> CONFIG_OPTIONS = {
.type = CONFIG_OPTION_INT,
.data = SConfigOptionDescription::SRangeData{0, 0, 359},
},
SConfigOptionDescription{
.value = "input:flip_x",
.description = "Inverts the horizontal movement of the pointer device",
.type = CONFIG_OPTION_BOOL,
.data = SConfigOptionDescription::SBoolData{false},
},
SConfigOptionDescription{
.value = "input:flip_y",
.description = "Inverts the vertical movement of the pointer device",
.type = CONFIG_OPTION_BOOL,
.data = SConfigOptionDescription::SBoolData{false},
},
SConfigOptionDescription{
.value = "input:left_handed",
.description = "Switches RMB and LMB",
@ -647,18 +659,6 @@ inline static const std::vector<SConfigOptionDescription> CONFIG_OPTIONS = {
.type = CONFIG_OPTION_BOOL,
.data = SConfigOptionDescription::SBoolData{false},
},
SConfigOptionDescription{
.value = "input:touchpad:flip_x",
.description = "Inverts the horizontal movement of the touchpad",
.type = CONFIG_OPTION_BOOL,
.data = SConfigOptionDescription::SBoolData{false},
},
SConfigOptionDescription{
.value = "input:touchpad:flip_y",
.description = "Inverts the vertical movement of the touchpad",
.type = CONFIG_OPTION_BOOL,
.data = SConfigOptionDescription::SBoolData{false},
},
SConfigOptionDescription{
.value = "input:touchpad:drag_3fg",
.description = "Three Finger Drag 0 -> disabled, 1 -> 3 finger, 2 -> 4 finger",

8
src/config/ConfigManager.cpp
View file

@ -638,6 +638,8 @@ CConfigManager::CConfigManager() {
registerConfigVar("input:sensitivity", {0.f});
registerConfigVar("input:accel_profile", {STRVAL_EMPTY});
registerConfigVar("input:rotation", Hyprlang::INT{0});
registerConfigVar("input:flip_x", Hyprlang::INT{0});
registerConfigVar("input:flip_y", Hyprlang::INT{0});
registerConfigVar("input:kb_file", {STRVAL_EMPTY});
registerConfigVar("input:kb_layout", {"us"});
registerConfigVar("input:kb_variant", {STRVAL_EMPTY});
@ -667,8 +669,6 @@ CConfigManager::CConfigManager() {
registerConfigVar("input:touchpad:tap-and-drag", Hyprlang::INT{1});
registerConfigVar("input:touchpad:drag_lock", Hyprlang::INT{0});
registerConfigVar("input:touchpad:scroll_factor", {1.f});
registerConfigVar("input:touchpad:flip_x", Hyprlang::INT{0});
registerConfigVar("input:touchpad:flip_y", Hyprlang::INT{0});
registerConfigVar("input:touchpad:drag_3fg", Hyprlang::INT{0});
registerConfigVar("input:touchdevice:transform", Hyprlang::INT{-1});
registerConfigVar("input:touchdevice:output", {"[[Auto]]"});
@ -806,14 +806,14 @@ CConfigManager::CConfigManager() {
m_config->addSpecialConfigValue("device", "transform", Hyprlang::INT{-1});
m_config->addSpecialConfigValue("device", "output", {STRVAL_EMPTY});
m_config->addSpecialConfigValue("device", "enabled", Hyprlang::INT{1}); // only for mice, touchpads, and touchdevices
m_config->addSpecialConfigValue("device", "flip_x", Hyprlang::INT{0}); // only for mice, touchpads, and touchdevices
m_config->addSpecialConfigValue("device", "flip_y", Hyprlang::INT{0}); // only for mice, touchpads, and touchdevices
m_config->addSpecialConfigValue("device", "region_position", Hyprlang::VEC2{0, 0}); // only for tablets
m_config->addSpecialConfigValue("device", "absolute_region_position", Hyprlang::INT{0}); // only for tablets
m_config->addSpecialConfigValue("device", "region_size", Hyprlang::VEC2{0, 0}); // only for tablets
m_config->addSpecialConfigValue("device", "relative_input", Hyprlang::INT{0}); // only for tablets
m_config->addSpecialConfigValue("device", "active_area_position", Hyprlang::VEC2{0, 0}); // only for tablets
m_config->addSpecialConfigValue("device", "active_area_size", Hyprlang::VEC2{0, 0}); // only for tablets
m_config->addSpecialConfigValue("device", "flip_x", Hyprlang::INT{0}); // only for touchpads
m_config->addSpecialConfigValue("device", "flip_y", Hyprlang::INT{0}); // only for touchpads
m_config->addSpecialConfigValue("device", "drag_3fg", Hyprlang::INT{0}); // only for touchpads
m_config->addSpecialConfigValue("device", "keybinds", Hyprlang::INT{1}); // enable/disable keybinds
m_config->addSpecialConfigValue("device", "share_states", Hyprlang::INT{0}); // only for virtualkeyboards

6
src/managers/input/InputManager.cpp
View file

@ -116,7 +116,6 @@ void CInputManager::onMouseMoved(IPointer::SMotionEvent e) {
Vector2D unaccel = e.unaccel;
if (e.device) {
if (e.device->m_isTouchpad) {
if (e.device->m_flipX) {
delta.x = -delta.x;
unaccel.x = -unaccel.x;
@ -126,7 +125,6 @@ void CInputManager::onMouseMoved(IPointer::SMotionEvent e) {
unaccel.y = -unaccel.y;
}
}
}
const auto DELTA = *PNOACCEL == 1 ? unaccel : delta;
@ -1298,8 +1296,8 @@ void CInputManager::setPointerConfigs() {
libinput_device_config_rotation_set_angle(LIBINPUTDEV, ROTATION);
}
m->m_flipX = g_pConfigManager->getDeviceInt(devname, "flip_x", "input:touchpad:flip_x") != 0;
m->m_flipY = g_pConfigManager->getDeviceInt(devname, "flip_y", "input:touchpad:flip_y") != 0;
m->m_flipX = g_pConfigManager->getDeviceInt(devname, "flip_x", "input:flip_x") != 0;
m->m_flipY = g_pConfigManager->getDeviceInt(devname, "flip_y", "input:flip_y") != 0;
const auto ACCELPROFILE = g_pConfigManager->getDeviceString(devname, "accel_profile", "input:accel_profile");
const auto SCROLLPOINTS = g_pConfigManager->getDeviceString(devname, "scroll_points", "input:scroll_points");