Skip to content

various fixes for scroll wheel #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glempi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

various fixes for scroll wheel #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions src/logid/actions/gesture/AxisGesture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,29 @@ AxisGesture::AxisGesture(Device* device, config::AxisGesture& config,
const auto& axis = std::get<std::string>(_config.axis.value());
try {
_input_axis = _device->virtualInput()->toAxisCode(axis);
logPrintf(INFO, "axis %d %s", _input_axis, axis.c_str());
} catch (InputDevice::InvalidEventCode& e) {
logPrintf(WARN, "Invalid axis %s.");
logPrintf(WARN, "Invalid axis %s.", axis.c_str());
}
}

}

if (_input_axis.has_value())
_device->virtualInput()->registerAxis(_input_axis.value());
registerAxis(_input_axis.value());
}

void AxisGesture::registerAxis(uint axis) {
_device->virtualInput()->registerAxis(axis);
int low_res_axis = InputDevice::getLowResAxis(axis);
if (low_res_axis != -1) {
_device->virtualInput()->registerAxis(low_res_axis);
}
}

void AxisGesture::press(bool init_threshold) {
std::shared_lock lock(_config_mutex);
logPrintf(RAWREPORT, "press %d %d\n", _axis, init_threshold);
if (init_threshold) {
_axis = (int32_t) (_config.threshold.value_or(defaults::gesture_threshold));
} else {
Expand All @@ -76,12 +86,14 @@ void AxisGesture::move(int16_t axis) {
if (!_input_axis.has_value())
return;


Copy link

@waldyrious waldyrious Jan 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are these blank new lines for? 🤔

Here, and in lines 96, 135, etc.

Copy link
Author

@glempi glempi Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The God told me put this line here 🤣. Actually i don't have a plan to make stylish fixes after 3 years

Copy link
Author

@glempi glempi Jan 21, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anyway without this PR wheel scrolling logic of logiops still is broken and do not work correct

const auto threshold = _config.threshold.value_or(
defaults::gesture_threshold);
int32_t new_axis = _axis + axis;
int low_res_axis = InputDevice::getLowResAxis(axis);
int low_res_axis = InputDevice::getLowResAxis(_input_axis.value());
int hires_remainder = _hires_remainder;


if (new_axis > threshold) {
double move = axis;
if (_axis < threshold)
Expand All @@ -102,21 +114,34 @@ void AxisGesture::move(int16_t axis) {
_axis_remainder -= int_remainder;
}

if (negative_multiplier)
move_floor = -move_floor;

if (low_res_axis != -1) {
int lowres_movement, hires_movement = (int) move_floor;
int lowres_movement = 0;
int hires_movement = (int) move_floor;
_device->virtualInput()->moveAxis(_input_axis.value(), hires_movement);
hires_remainder += hires_movement;
if (abs(hires_remainder) >= 60) {
if (abs(hires_remainder) >= 1) {
lowres_movement = hires_remainder / 120;
if (lowres_movement == 0)
if (lowres_movement == 0) {
lowres_movement = hires_remainder > 0 ? 1 : -1;
}
Comment on lines +124 to +126
Copy link

@waldyrious waldyrious Jan 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code style changes like these introduce unnecessary noise in the diff. I'd recommend removing them and keeping the diff focused on the actual behavior changes.


if ((lowres_movement > 0 && negative_multiplier) ||
(lowres_movement < 0 && !negative_multiplier))
{
lowres_movement = 0;
}

hires_remainder -= lowres_movement * 120;

_device->virtualInput()->moveAxis(low_res_axis, lowres_movement);
}

logPrintf(RAWREPORT, "move %ld [%.2f], l_mv:%d h_mv:%d code:%d/%d;"
" axis %d/%d; new_axis %d; hires_rem %d th %d neg %d mv %.1f\n",
time(NULL), _config.axis_multiplier.value_or(1), lowres_movement, hires_movement,
_input_axis.value(), low_res_axis, axis, _axis, new_axis, hires_remainder,
threshold, negative_multiplier, move);

_hires_remainder = hires_remainder;
} else {
_device->virtualInput()->moveAxis(_input_axis.value(), (int) move_floor);
Expand Down Expand Up @@ -164,7 +189,7 @@ void AxisGesture::setAxis(const std::string& axis) {
} else {
_input_axis = _device->virtualInput()->toAxisCode(axis);
_config.axis = axis;
_device->virtualInput()->registerAxis(_input_axis.value());
registerAxis(_input_axis.value());
}
setHiresMultiplier(_hires_multiplier);
}
Expand Down
3 changes: 3 additions & 0 deletions src/logid/actions/gesture/AxisGesture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ namespace logid::actions {

void setThreshold(int threshold);

protected:
void registerAxis(uint axis);

protected:
int32_t _axis{};
double _axis_remainder{};
Expand Down