添加设备名关键词匹配

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ---> C++
 # Prerequisites
 *.d
@@ -8,28 +7,11 @@
 *.lo
 *.o
 *.obj
-=======
-# ---> C
-# Prerequisites
-*.d
-
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Linker output
-*.ilk
-*.map
-*.exp
->>>>>>> 07cb496a46dea18227a9ad14f0f91254054d9285
 
 # Precompiled Headers
 *.gch
 *.pch
 
-<<<<<<< HEAD
 # Compiled Dynamic libraries
 *.so
 *.dylib
@@ -44,25 +26,11 @@
 *.la
 *.a
 *.lib
-=======
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
->>>>>>> 07cb496a46dea18227a9ad14f0f91254054d9285
 
 # Executables
 *.exe
 *.out
 *.app
-<<<<<<< HEAD
 
 .vscode
 
@@ -74,200 +42,6 @@ screen_ds_once
 touch_ds
 touch_set
 usb_ds
-=======
-*.i*86
-*.x86_64
-*.hex
 
-# Debug files
+.codewhale
-*.dSYM/
+.mimocode
-*.su
-*.idb
-*.pdb
-
-# Kernel Module Compile Results
-*.mod*
-*.cmd
-.tmp_versions/
-modules.order
-Module.symvers
-Mkfile.old
-dkms.conf
-
-# ---> Python
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# UV
-#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#uv.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
-.pdm.toml
-.pdm-python
-.pdm-build/
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-# Ruff stuff:
-.ruff_cache/
-
-# PyPI configuration file
-.pypirc
-
->>>>>>> 07cb496a46dea18227a9ad14f0f91254054d9285

opt/ktouch/src/touch_ds.c

@@ -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

@@ -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

@@ -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

@@ -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;
         }