CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-05-13 16:37:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add is_finger_based field to XIScrollDevice with detection logic

Browse source 
Fixes #9385
This commit is contained in:
copilot-swe-agent[bot] 2026-01-15 13:21:13 +00:00 • committed by Kovid Goyal
parent 9ef934cf54
commit 6436cda482
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
glfw/x11_init.c vendored
View file

@ -173,6 +173,40 @@ read_xi_scroll_devices(void) {
if (nitems > 1) is_highres = data[0] || data[1];
XFree(data);
}
// Detect if this is a finger-based device (touchpad/touchscreen)
bool is_finger_based = false;
// Method 1: Check for libinput tapping support (touchpads only)
Atom tapping_atom = XInternAtom(_glfw.x11.display, "libinput Tapping Enabled", False);
if (tapping_atom != None) {
Atom tapping_type;
int tapping_format;
unsigned long tapping_nitems, tapping_bytes;
unsigned char *tapping_data = NULL;
if (XIGetProperty(_glfw.x11.display, device->deviceid,
tapping_atom, 0, 1, False, AnyPropertyType,
&tapping_type, &tapping_format, &tapping_nitems,
&tapping_bytes, &tapping_data) == Success) {
if (tapping_data) {
if (tapping_nitems > 0) {
is_finger_based = true;
}
XFree(tapping_data);
}
}
}
// Method 2: Check for touch class (touchscreens/touchpads)
if (!is_finger_based) {
for (int j = 0; j < device->num_classes; j++) {
if (device->classes[j]->type == XITouchClass) {
is_finger_based = true;
break;
}
}
}
for (int j = 0; j < device->num_classes; j++) {
if (device->classes[j]->type != XIScrollClass) continue;
XIScrollClassInfo* scroll = (XIScrollClassInfo*)device->classes[j];
@ -185,7 +219,7 @@ read_xi_scroll_devices(void) {
if (_glfw.x11.xi.num_scroll_devices >= arraysz(_glfw.x11.xi.scroll_devices)) continue;
d = &_glfw.x11.xi.scroll_devices[_glfw.x11.xi.num_scroll_devices++];
*d = (XIScrollDevice){
.is_highres=is_highres, .deviceid=device->deviceid, .sourceid=scroll->sourceid,
.is_highres=is_highres, .is_finger_based=is_finger_based, .deviceid=device->deviceid, .sourceid=scroll->sourceid,
};
memcpy(d->name, device->name, MIN(sizeof(d->name)-1, strlen(device->name)));
}

1
glfw/x11_platform.h vendored
View file

@ -240,6 +240,7 @@ typedef struct XIScrollValuator {
typedef struct XIScrollDevice {
bool is_highres;
bool is_finger_based;
int deviceid, sourceid;
XIScrollValuator valuators[8];
unsigned num_valuators;