Commit: d76117be4fb6032849130b97f1063684d8d83003 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Révision: d76117be4fb6032849130b97f1063684d8d83003 (tree)
• l'heure: 2010-08-16 06:52:23
• Auteur: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Message de Log

sysfs name detection, checks whether device name is sysfs name

Change Summary

• modified: src/calibrator.cpp
• modified: src/calibrator.hh

Modification

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -21,6 +21,12 @@
  * THE SOFTWARE.
  */
 #include <algorithm>
+#include <sys/types.h>
+#include <dirent.h>
+#include <iostream>
+#include <fstream>
+#include <string>
+
 #include "calibrator.hh"
 
 Calibrator::Calibrator(const char* const device_name0, const XYinfo& axys0,
@@ -160,3 +166,50 @@ bool Calibrator::finish(int width, int height)
     // finish the data, driver/calibrator specific
     return finish_data(axys, swap_xy);
 }
+
+const char* Calibrator::get_sysfs_name()
+{
+    if (is_sysfs_name(device_name))
+        return device_name;
+
+    // TODO: more mechanisms
+
+    return NULL;
+}
+
+bool Calibrator::is_sysfs_name(const char* name) {
+    const char* SYSFS_INPUT="/sys/class/input";
+    const char* SYSFS_DEVNAME="device/name";
+
+    DIR* dp = opendir(SYSFS_INPUT);
+    if (dp == NULL)
+        return false;
+
+    while (dirent* ep = readdir(dp)) {
+        if (strncmp(ep->d_name, "event", strlen("event")) == 0) {
+            // got event name, get its sysfs device name
+            char filename[40]; // actually 35, but hey...
+            (void) sprintf(filename, "%s/%s/%s", SYSFS_INPUT, ep->d_name, SYSFS_DEVNAME);
+
+            std::ifstream ifile(filename);
+            if (ifile.is_open()) {
+                if (!ifile.eof()) {
+                    std::string devname;
+                    std::getline(ifile, devname);
+                    if (devname == name) {
+                        if (verbose)
+                            printf("DEBUG: Found that '%s' is a sysfs name.\n", name);
+                        return true;
+                    }
+                }
+                ifile.close();
+            }
+        }
+    }
+    (void) closedir(dp);
+
+    if (verbose)
+        printf("DEBUG: Name '%s' does not match any in '%s/event*/%s'\n",
+                    name, SYSFS_INPUT, SYSFS_DEVNAME);
+    return false;
+}

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -51,6 +51,9 @@ public:
     bool add_click(int x, int y);
     // calculate and apply the calibration
     bool finish(int width, int height);
+    // get the sysfs name of the device,
+    // returns NULL if it can not be found
+    const char* get_sysfs_name();
 
 protected:
     // check whether the coordinates are along the respective axis
@@ -78,6 +81,9 @@ protected:
     // A lower value forces more precise calibration
     // Set to zero if you don't want this check
     int threshold_misclick;
+
+    // Check whether the given name is a sysfs device name
+    bool is_sysfs_name(const char* name);
 };
 
 #endif