kushidou/ktouchV2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加设备名关键词匹配

Browse Source
This commit is contained in:
tang1219
2026-06-16 13:57:42 +08:00
parent 8531b75edd
commit 98390053fd
5 changed files with 59 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opt/ktouch/src/touch_ds.c
+20 -1
View File
@@ -374,7 +374,26 @@ int is_touchscreen_device(const char* device_node, char* vid, char* pid, int buf
}
if (!is_touchscreen) {
// printf(" 未找到 ID_INPUT_TOUCHSCREEN=1 属性\n");
// 通过设备名称关键词匹配（fallback）
const char *dev_name = udev_device_get_property_value(dev, "NAME");
if (dev_name) {
char lower_name[256];
strncpy(lower_name, dev_name, sizeof(lower_name) - 1);
lower_name[sizeof(lower_name) - 1] = '\0';
for (int i = 0; lower_name[i]; i++) {
lower_name[i] = tolower(lower_name[i]);
}
if (strstr(lower_name, "ilitek") != NULL ||
strstr(lower_name, "touchscreen") != NULL ||
strstr(lower_name, "touch") != NULL ||
strstr(lower_name, "tablet") != NULL) {
is_touchscreen = 1;
const char *vendor_id = udev_device_get_property_value(dev, "ID_VENDOR_ID");
const char *model_id = udev_device_get_property_value(dev, "ID_MODEL_ID");
if (vendor_id) strncpy(vid, vendor_id, buffer_size);
if (model_id) strncpy(pid, model_id, buffer_size);
}
}
}
udev_device_unref(dev);
opt/ktouch/src/touch_set.c
+18 -1
View File
@@ -214,7 +214,24 @@ int get_input_devices(InputDeviceInfo result[]) {
if (is_touchscreen){
// 通过名称关键词匹配（fallback，针对无ID_INPUT_TOUCHSCREEN属性的设备）
int name_matched = 0;
if (!is_touchscreen) {
char lower_name[256];
strncpy(lower_name, dev->name, sizeof(lower_name) - 1);
lower_name[sizeof(lower_name) - 1] = '\0';
for (int i = 0; lower_name[i]; i++) {
lower_name[i] = tolower(lower_name[i]);
}
if (strstr(lower_name, "ilitek") != NULL ||
strstr(lower_name, "touchscreen") != NULL ||
strstr(lower_name, "touch") != NULL ||
strstr(lower_name, "tablet") != NULL) {
name_matched = 1;
}
}
if (is_touchscreen || name_matched){
// log_message("识别到触摸设备，添加到列表中\n name=%s", name);
// 初始化当前设备信息结构体
result[count].device_id = dev->deviceid;
opt/ktouch/src/touch_set.workfine.c
+18 -1
View File
@@ -212,7 +212,24 @@ int get_input_devices(InputDeviceInfo result[]) {
if (is_touchscreen){
// 通过名称关键词匹配（fallback，针对无ID_INPUT_TOUCHSCREEN属性的设备）
int name_matched = 0;
if (!is_touchscreen) {
char lower_name[256];
strncpy(lower_name, dev->name, sizeof(lower_name) - 1);
lower_name[sizeof(lower_name) - 1] = '\0';
for (int i = 0; lower_name[i]; i++) {
lower_name[i] = tolower(lower_name[i]);
}
if (strstr(lower_name, "ilitek") != NULL ||
strstr(lower_name, "touchscreen") != NULL ||
strstr(lower_name, "touch") != NULL ||
strstr(lower_name, "tablet") != NULL) {
name_matched = 1;
}
}
if (is_touchscreen || name_matched){
// log_message("识别到触摸设备，添加到列表中\n name=%s", name);
// 初始化当前设备信息结构体
result[count].device_id = dev->deviceid;
opt/ktouch/src/usb_ds.c
+1
View File
@@ -84,6 +84,7 @@ int is_touchscreen(struct udev_device *dev) {
if (strstr(lower_name, "touchscreen") != NULL ||
strstr(lower_name, "touch") != NULL ||
strstr(lower_name, "ilitek") != NULL ||
strstr(lower_name, "tablet") != NULL) {
return 1;
}