Commit: a811614ae8d237084f32b8259165b55643f48f9d - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: a811614ae8d237084f32b8259165b55643f48f9d (tree)
• Time: 2010-02-01 01:01:37
• Author: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

rename driver to device as we are dealing with devices in the first place, and the drivers of the device only in the second place

Change Summary

• modified: src/main_common.hpp

Incremental Difference

--- a/src/main_common.hpp
+++ b/src/main_common.hpp
@@ -95,9 +95,9 @@ class WrongCalibratorException : public std::invalid_argument {
 
 // find a calibratable device (using XInput)
 // retuns number of devices found,
-// data of last driver is returned in the function parameters
-int find_driver(bool verbose, const char*& drivername, XYinfo& axys);
-int find_driver(bool verbose, const char*& drivername, XYinfo& axys)
+// data of last device is returned in the function parameters
+int find_device(bool verbose, const char*& device_name, XYinfo& device_axys);
+int find_device(bool verbose, const char*& device_name, XYinfo& device_axys)
 {
     int found = 0;
 
@@ -146,11 +146,11 @@ int find_driver(bool verbose, const char*& drivername, XYinfo& axys)
                     !(ax[1].min_value == -1 && ax[1].max_value == -1)) {
                     /* a calibratable device (no mouse etc) */
                     found++;
-                    drivername = strdup(list->name);
-                    axys.x_min = ax[0].min_value;
-                    axys.x_max = ax[0].max_value;
-                    axys.y_min = ax[1].min_value;
-                    axys.y_max = ax[1].max_value;
+                    device_name = strdup(list->name);
+                    device_axys.x_min = ax[0].min_value;
+                    device_axys.x_max = ax[0].max_value;
+                    device_axys.y_min = ax[1].min_value;
+                    device_axys.y_max = ax[1].max_value;
                 }
 
             }
@@ -177,7 +177,7 @@ static void usage(char* cmd)
     fprintf(stderr, "\t-h, --help: print this help message\n");
     fprintf(stderr, "\t-v, --verbose: print debug messages during the process\n");
     fprintf(stderr, "\t--precalib: manually provide the current calibration setting (eg the values in xorg.conf)\n");
-    fprintf(stderr, "\t--fake: emulate a fake driver (for testing purposes)\n");
+    fprintf(stderr, "\t--fake: emulate a fake device (for testing purposes)\n");
 }
 
 Calibrator* main_common(int argc, char** argv);
@@ -224,51 +224,53 @@ Calibrator* main_common(int argc, char** argv)
         }
     }
     
-    // find driver(s)
-    const char* drivername = NULL;
-    XYinfo axys;
+
+    // Choose the device to calibrate
+    const char* device_name = NULL;
+    XYinfo      device_axys;
     if (fake) {
         // Fake a calibratable device
-        drivername = "Fake_device";
-        axys = XYinfo(0,0,0,0);
+        device_name = "Fake_device";
+        device_axys = XYinfo(0,0,0,0);
 
         if (verbose) {
-            printf("DEBUG: Faking device: %s\n", drivername);
+            printf("DEBUG: Faking device: %s\n", device_name);
         }
     } else {
         // Find the right device
-        int nr_found = find_driver(verbose, drivername, axys);
+        int nr_found = find_device(verbose, device_name, device_axys);
 
         if (nr_found == 0) {
             fprintf (stderr, "Error: No calibratable devices found.\n");
             exit(1);
         } else if (nr_found > 1) {
-            printf ("Warning: multiple calibratable devices found, calibrating last one (%s)\n", drivername);
+            printf ("Warning: multiple calibratable devices found, calibrating last one (%s)\n", device_name);
         }
     }
 
     // override min/max XY from command line ?
     if (precalib) {
         if (pre_axys.x_min != -1)
-            axys.x_min = pre_axys.x_min;
+            device_axys.x_min = pre_axys.x_min;
         if (pre_axys.x_max != -1)
-            axys.x_max = pre_axys.x_max;
+            device_axys.x_max = pre_axys.x_max;
         if (pre_axys.y_min != -1)
-            axys.y_min = pre_axys.y_min;
+            device_axys.y_min = pre_axys.y_min;
         if (pre_axys.y_max != -1)
-            axys.y_max = pre_axys.y_max;
+            device_axys.y_max = pre_axys.y_max;
 
         if (verbose) {
             printf("DEBUG: Setting precalibration: %i, %i, %i, %i\n",
-                axys.x_min, axys.x_max, axys.y_min, axys.y_max);
+                device_axys.x_min, device_axys.x_max,
+                device_axys.y_min, device_axys.y_max);
         }
     }
 
 
-    // Different device/driver, different calibrator usage
+    // Different device/driver, different ways to apply the calibration values
     try {
-        // Usbtouchscreen driver
-        return new CalibratorUsbtouchscreen(drivername, axys, verbose);
+        // try Usbtouchscreen driver
+        return new CalibratorUsbtouchscreen(device_name, device_axys, verbose);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -277,7 +279,7 @@ Calibrator* main_common(int argc, char** argv)
 
     try {
         // next, try Evdev driver
-        return new CalibratorEvdev(drivername, axys, verbose);
+        return new CalibratorEvdev(device_name, device_axys, verbose);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -285,5 +287,5 @@ Calibrator* main_common(int argc, char** argv)
     }
 
     // lastly, presume a standard Xorg driver (evtouch, mutouch, ...)
-    return new CalibratorXorgPrint(drivername, axys, verbose);
+    return new CalibratorXorgPrint(device_name, device_axys, verbose);
 }