tanner/logiops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support HiresScroll gesture remapping

Browse Source 
This commit allows HiresScroll (when target is true) to map the up and
down events to gestures that support it (i.e.AxisGesture/
IntervalGesture). This check is done by checking if wheelCompatibility()
is true.

This also allows hires scroll events to send low-res scroll events as
well.

TODO: Fix bug w/ Chromium (and some other programs?) where mapping
scroll wheel to REL_WHEEL_HI_RES will cause the program to skip events
occassionally. I have literally been stuck on this bug for a week and I
still don't know what causes it. evtest shows proper scroll events,
Firefox works fine, and libinput test-gui reports proper scrolling.
This commit is contained in:
pixl
2020-08-21 16:05:20 -04:00
parent 6ea65601f3
commit c1423e345e
14 changed files with 251 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logid/actions/gesture/AxisGesture.cpp
+49 -4
View File
@@ -27,10 +27,11 @@ AxisGesture::AxisGesture(Device *device, libconfig::Setting &root) :
{
}
void AxisGesture::press()
void AxisGesture::press(bool init_threshold)
{
_axis = 0;
_axis = init_threshold ? _config.threshold() : 0;
_axis_remainder = 0;
_hires_remainder = 0;
}
void AxisGesture::release(bool primary)
@@ -41,7 +42,10 @@ void AxisGesture::release(bool primary)
void AxisGesture::move(int16_t axis)
{
int16_t new_axis = _axis + axis;
int16_t new_axis = _axis+axis;
int low_res_axis = InputDevice::getLowResAxis(_config.axis());
int hires_remainder = _hires_remainder;
if(new_axis > _config.threshold()) {
double move = axis;
if(_axis < _config.threshold())
@@ -63,7 +67,22 @@ void AxisGesture::move(int16_t axis)
if(negative_multiplier)
move_floor = -move_floor;
virtual_input->moveAxis(_config.axis(), move_floor);
if(low_res_axis != -1) {
int lowres_movement = 0, hires_movement = move_floor;
virtual_input->moveAxis(_config.axis(), hires_movement);
hires_remainder += hires_movement;
if(abs(hires_remainder) >= 60) {
lowres_movement = hires_remainder/120;
if(lowres_movement == 0)
lowres_movement = hires_remainder > 0 ? 1 : -1;
hires_remainder -= lowres_movement*120;
virtual_input->moveAxis(low_res_axis, lowres_movement);
}
_hires_remainder = hires_remainder;
} else {
virtual_input->moveAxis(_config.axis(), move_floor);
}
}
_axis = new_axis;
}
@@ -73,6 +92,11 @@ bool AxisGesture::metThreshold() const
return _axis >= _config.threshold();
}
void AxisGesture::setHiresMultiplier(double multiplier)
{
_config.setHiresMultiplier(multiplier);
}
AxisGesture::Config::Config(Device *device, libconfig::Setting &setting) :
Gesture::Config(device, setting, false)
{
@@ -113,6 +137,9 @@ AxisGesture::Config::Config(Device *device, libconfig::Setting &setting) :
} catch(libconfig::SettingNotFoundException& e) {
// Ignore
}
if(InputDevice::getLowResAxis(_axis) != -1)
_multiplier *= 120;
}
unsigned int AxisGesture::Config::axis() const
@@ -123,4 +150,22 @@ unsigned int AxisGesture::Config::axis() const
double AxisGesture::Config::multiplier() const
{
return _multiplier;
}
bool AxisGesture::wheelCompatibility() const
{
return true;
}
void AxisGesture::Config::setHiresMultiplier(double multiplier)
{
if(_hires_multiplier == multiplier || multiplier == 0)
return;
if(InputDevice::getLowResAxis(_axis) != -1) {
_multiplier *= _hires_multiplier;
_multiplier /= multiplier;
}
_hires_multiplier = multiplier;
}