Skip to content

Correctly label pointing device as absolute, not relative #228

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

Merged
merged 2 commits into from
May 28, 2025
Merged

Correctly label pointing device as absolute, not relative #228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e391956
Correctly label pointing device as absolute, not relative
marmarek Apr 26, 2025
6898bf9
Add error checking on input device init
marmarek May 8, 2025
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
34 changes: 22 additions & 12 deletions xf86-input-mfndev/src/qubes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ static void QubesUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)

static int _qubes_init_kbd(DeviceIntPtr device)
{
InitKeyboardDeviceStruct(device, NULL, NULL, NULL);
if (!InitKeyboardDeviceStruct(device, NULL, NULL, NULL))
return BadAlloc;
return Success;
}

Expand Down Expand Up @@ -328,8 +329,8 @@ static void QubesInitAxesLabels(QubesDevicePtr pQubes, int natoms,
const char **labels;
int labels_len = 0;

labels = rel_labels;
labels_len = ArrayLength(rel_labels);
labels = abs_labels;
labels_len = ArrayLength(abs_labels);

memset(atoms, 0, natoms * sizeof(Atom));

Expand Down Expand Up @@ -360,22 +361,23 @@ static int _qubes_init_axes(DeviceIntPtr device)
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
atoms,
#endif
GetMotionHistorySize(), 0))
GetMotionHistorySize(),
Absolute))
return BadAlloc;

#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
pInfo->dev->valuator->mode = Relative;
pInfo->dev->valuator->mode = Absolute;
#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 13
if (!InitAbsoluteClassDeviceStruct(device))
return BadAlloc;
#endif

for (i = 0; i < pQubes->axes; i++) {
xf86InitValuatorAxisStruct(device, i, *pQubes->labels, -1,
-1, 1, 1, 1
xf86InitValuatorAxisStruct(device, i, atoms[i], 0,
32767, 1, 1, 1
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
, Relative
, Absolute
#endif
);
xf86InitValuatorDefaults(device, i);
Expand Down Expand Up @@ -484,14 +486,22 @@ static int QubesControl(DeviceIntPtr device, int what)
InputInfoPtr pInfo = device->public.devicePrivate;
QubesDevicePtr pQubes = pInfo->private;
DeviceIntPtr master_kbd = NULL;
int ret;

switch (what) {
case DEVICE_INIT:
device->public.on = FALSE;
_qubes_init_buttons(device);
_qubes_init_axes(device);
_qubes_init_kbd(device);
InitPtrFeedbackClassDeviceStruct(device, QubesPtrCtrlProc);
ret = _qubes_init_buttons(device);
if (ret != Success)
return ret;
ret = _qubes_init_axes(device);
if (ret != Success)
return ret;
ret = _qubes_init_kbd(device);
if (ret != Success)
return ret;
if (!InitPtrFeedbackClassDeviceStruct(device, QubesPtrCtrlProc))
return BadAlloc;
break;

/* Switch device on. Establish socket, start event delivery. */
Expand Down