Thanks to visit codestin.com
Credit goes to github.com

Skip to content

X11 pen detection: fix misclassification due to improper init #2

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
creichen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

X11 pen detection: fix misclassification due to improper init #2

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
16 changes: 6 additions & 10 deletions src/video/x11/SDL_x11pen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ static void pen_atoms_ensure_initialized(SDL_VideoDevice *_this)
pen_atoms.device_product_id = X11_XInternAtom(data->display, "Device Product ID", False);
pen_atoms.wacom_serial_ids = X11_XInternAtom(data->display, "Wacom Serial IDs", False);
pen_atoms.wacom_tool_type = X11_XInternAtom(data->display, "Wacom Tool Type", False);
pen_atoms.abs_pressure = X11_XInternAtom(data->display, "Abs Pressure", True);
pen_atoms.abs_tilt_x = X11_XInternAtom(data->display, "Abs Tilt X", True);
pen_atoms.abs_tilt_y = X11_XInternAtom(data->display, "Abs Tilt Y", True);
pen_atoms.abs_pressure = X11_XInternAtom(data->display, "Abs Pressure", False);
pen_atoms.abs_tilt_x = X11_XInternAtom(data->display, "Abs Tilt X", False);
pen_atoms.abs_tilt_y = X11_XInternAtom(data->display, "Abs Tilt Y", False);

pen_atoms.initialized = 1;
}
Expand Down Expand Up @@ -175,8 +175,6 @@ static Uint32 xinput2_pen_evdevid(SDL_VideoDevice *_this, int deviceid)
#if !(SDL_PEN_DEBUG_NOID)
Sint32 ids[2];

pen_atoms_ensure_initialized(_this);

if (2 != xinput2_pen_get_int_property(_this, deviceid, pen_atoms.device_product_id, ids, 2)) {
return 0;
}
Expand Down Expand Up @@ -206,8 +204,6 @@ static SDL_bool xinput2_wacom_deviceid(SDL_VideoDevice *_this, int deviceid, Uin
Sint32 serial_id_buf[3];
int result;

pen_atoms_ensure_initialized(_this);

if ((result = xinput2_pen_get_int_property(_this, deviceid, pen_atoms.wacom_serial_ids, serial_id_buf, 3)) == 3) {
*wacom_devicetype_id = serial_id_buf[2];
*wacom_serial = serial_id_buf[1];
Expand All @@ -227,8 +223,6 @@ static SDL_bool xinput2_pen_is_eraser(SDL_VideoDevice *_this, int deviceid, char
char dev_name[PEN_ERASER_ID_MAXLEN];
int k;

pen_atoms_ensure_initialized(_this);

if (pen_atoms.wacom_tool_type != None) {
Atom type_return;
int format_return;
Expand Down Expand Up @@ -418,6 +412,8 @@ void X11_InitPen(SDL_VideoDevice *_this)
XIDeviceInfo *device_info;
int num_device_info;

pen_atoms_ensure_initialized(_this);

device_info = X11_XIQueryDevice(data->display, XIAllDevices, &num_device_info);
if (!device_info) {
return;
Expand Down Expand Up @@ -445,7 +441,7 @@ void X11_InitPen(SDL_VideoDevice *_this)
int old_num_pens_known = pen_map.num_pens_known;
int k;

/* Only track physical devices that are enabled */
/* Only track physical devices that are enabled and look like pens */
if (dev->use != XISlavePointer || dev->enabled == 0 || !xinput2_device_is_pen(dev)) {
continue;
}
Expand Down