Commit: 9b8708970b199397b9af49ce5f2e4efeed6365dd - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: 9b8708970b199397b9af49ce5f2e4efeed6365dd (tree)
• Zeit: 2010-09-13 00:11:46
• Autor: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

add --output-type option to select output type (default: auto, automatically selects best option)

Ändern Zusammenfassung

• modified: src/calibrator.cpp
• modified: src/calibrator.hh
• modified: src/calibrator/calibratorEvdev.cpp
• modified: src/calibrator/calibratorUsbtouchscreen.cpp
• modified: src/calibrator/calibratorXorgPrint.cpp
• modified: src/main_common.hpp

Diff

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -30,8 +30,8 @@
 #include "calibrator.hh"
 
 Calibrator::Calibrator(const char* const device_name0, const XYinfo& axys0,
-    const bool verbose0, const int thr_misclick, const int thr_doubleclick)
-  : device_name(device_name0), old_axys(axys0), verbose(verbose0), num_clicks(0), threshold_doubleclick(thr_doubleclick), threshold_misclick(thr_misclick)
+    const bool verbose0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type0)
+  : device_name(device_name0), old_axys(axys0), verbose(verbose0), num_clicks(0), threshold_doubleclick(thr_doubleclick), threshold_misclick(thr_misclick), output_type(output_type0)
 {
 }
 

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -34,7 +34,7 @@ public:
      * if the touchscreen is not of the type it supports
      */
     Calibrator(const char* const device_name, const XYinfo& axys,
-        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0);
+        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0, const OutputType output_type=OUTYPE_AUTO);
     ~Calibrator() {}
 
     // set the doubleclick treshold
@@ -82,6 +82,9 @@ protected:
     // Set to zero if you don't want this check
     int threshold_misclick;
 
+    // Type of output
+    OutputType output_type;
+
     // Check whether the given name is a sysfs device name
     bool is_sysfs_name(const char* name);
 

--- a/src/calibrator/calibratorEvdev.cpp
+++ b/src/calibrator/calibratorEvdev.cpp
@@ -48,7 +48,8 @@ private:
     int old_swap_xy;
 public:
     CalibratorEvdev(const char* const device_name, const XYinfo& axys, const bool verbose,
-        XID device_id=(XID)-1, const int thr_misclick=0, const int thr_doubleclick=0);
+        XID device_id=(XID)-1, const int thr_misclick=0, const int thr_doubleclick=0,
+        const OutputType output_type=OUTYPE_AUTO);
     ~CalibratorEvdev();
 
     virtual bool finish_data(const XYinfo new_axys, int swap_xy);
@@ -65,8 +66,8 @@ protected:
     bool output_xinput(const XYinfo new_axys, int swap_xy, int new_swap_xy);
 };
 
-CalibratorEvdev::CalibratorEvdev(const char* const device_name0, const XYinfo& axys0, const bool verbose0, XID device_id, const int thr_misclick, const int thr_doubleclick)
-  : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick), old_swap_xy(0)
+CalibratorEvdev::CalibratorEvdev(const char* const device_name0, const XYinfo& axys0, const bool verbose0, XID device_id, const int thr_misclick, const int thr_doubleclick, const OutputType output_type)
+  : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick, output_type), old_swap_xy(0)
 {
     // init
     display = XOpenDisplay(NULL);
@@ -218,11 +219,24 @@ bool CalibratorEvdev::finish_data(const XYinfo new_axys, int swap_xy)
 
 
     printf("\n\n--> Making the calibration permanent <--\n");
-    // xorg.conf.d or alternatively xinput commands
-    if (has_xorgconfd_support()) {
-        success &= output_xorgconfd(new_axys, swap_xy, new_swap_xy);
-    } else {
-        success &= output_xinput(new_axys, swap_xy, new_swap_xy);
+    switch (output_type) {
+        case OUTYPE_AUTO:
+            // xorg.conf.d or alternatively xinput commands
+            if (has_xorgconfd_support()) {
+                success &= output_xorgconfd(new_axys, swap_xy, new_swap_xy);
+            } else {
+                success &= output_xinput(new_axys, swap_xy, new_swap_xy);
+            }
+            break;
+        case OUTYPE_XORGCONFD:
+            success &= output_xorgconfd(new_axys, swap_xy, new_swap_xy);
+            break;
+        case OUTYPE_XINPUT:
+            success &= output_xinput(new_axys, swap_xy, new_swap_xy);
+            break;
+        default:
+            fprintf(stderr, "ERROR: Evdev Calibrator does not support the supplied --output-type\n");
+            success = false;
     }
 
     return success;

--- a/src/calibrator/calibratorUsbtouchscreen.cpp
+++ b/src/calibrator/calibratorUsbtouchscreen.cpp
@@ -52,7 +52,8 @@ class CalibratorUsbtouchscreen: public Calibrator
 {
 public:
     CalibratorUsbtouchscreen(const char* const device_name, const XYinfo& axys,
-        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0);
+        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0,
+        const OutputType output_type=OUTYPE_AUTO);
     ~CalibratorUsbtouchscreen();
 
     virtual bool finish_data(const XYinfo new_axys, int swap_xy);
@@ -133,8 +134,8 @@ protected:
     }
 };
 
-CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const bool verbose0, const int thr_misclick, const int thr_doubleclick)
-  : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick)
+CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const bool verbose0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type)
+  : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick, output_type)
 {
     if (strcmp(device_name, "Usbtouchscreen") != 0)
         throw WrongCalibratorException("Not a usbtouchscreen device");
@@ -164,6 +165,11 @@ CalibratorUsbtouchscreen::~CalibratorUsbtouchscreen()
 
 bool CalibratorUsbtouchscreen::finish_data(const XYinfo new_axys, int swap_xy)
 {
+    if (output_type != OUTYPE_AUTO) {
+        fprintf(stderr, "ERROR: Usbtouchscreen Calibrator does not support the supplied --output-type\n");
+        return false;
+    }
+
     // New ranges
     const int range_x = (new_axys.x_max - new_axys.x_min);
     const int range_y = (new_axys.y_max - new_axys.y_min);

--- a/src/calibrator/calibratorXorgPrint.cpp
+++ b/src/calibrator/calibratorXorgPrint.cpp
@@ -28,7 +28,8 @@ class CalibratorXorgPrint: public Calibrator
 {
 public:
     CalibratorXorgPrint(const char* const device_name, const XYinfo& axys,
-        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0);
+        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0,
+        const OutputType output_type=OUTYPE_AUTO);
 
     virtual bool finish_data(const XYinfo new_axys, int swap_xy);
 protected:
@@ -36,8 +37,8 @@ protected:
     bool output_hal(const XYinfo new_axys, int swap_xy, int new_swap_xy);
 };
 
-CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const bool verbose0, const int thr_misclick, const int thr_doubleclick)
-  : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick)
+CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const bool verbose0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type)
+  : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick, output_type)
 {
     printf("Calibrating standard Xorg driver \"%s\"\n", device_name);
     printf("\tcurrent calibration values: min_x=%d, max_x=%d and min_y=%d, max_y=%d\n",
@@ -54,11 +55,24 @@ bool CalibratorXorgPrint::finish_data(const XYinfo new_axys, int swap_xy)
     int new_swap_xy = swap_xy;
 
     printf("\n\n--> Making the calibration permanent <--\n");
-    // xorg.conf.d or alternatively hal config
-    if (has_xorgconfd_support()) {
-        success &= output_xorgconfd(new_axys, swap_xy, new_swap_xy);
-    } else {
-        success &= output_hal(new_axys, swap_xy, new_swap_xy);
+    switch (output_type) {
+        case OUTYPE_AUTO:
+            // xorg.conf.d or alternatively hal config
+            if (has_xorgconfd_support()) {
+                success &= output_xorgconfd(new_axys, swap_xy, new_swap_xy);
+            } else {
+                success &= output_hal(new_axys, swap_xy, new_swap_xy);
+            }
+            break;
+        case OUTYPE_XORGCONFD:
+            success &= output_xorgconfd(new_axys, swap_xy, new_swap_xy);
+            break;
+        case OUTYPE_HAL:
+            success &= output_hal(new_axys, swap_xy, new_swap_xy);
+            break;
+        default:
+            fprintf(stderr, "ERROR: XorgPrint Calibrator does not support the supplied --output-type\n");
+            success = false;
     }
 
     return success;

--- a/src/main_common.hpp
+++ b/src/main_common.hpp
@@ -64,6 +64,14 @@ enum {
     LR = 3  // Lower-right
 };
 
+// Output types
+enum OutputType {
+    OUTYPE_AUTO,
+    OUTYPE_XORGCONFD,
+    OUTYPE_HAL,
+    OUTYPE_XINPUT
+};
+
 // struct to hold min/max info of the X and Y axis
 struct XYinfo {
     int x_min;
@@ -222,7 +230,7 @@ int find_device(const char* pre_device, bool verbose, bool list_devices,
 
 static void usage(char* cmd, unsigned thr_misclick)
 {
-    fprintf(stderr, "Usage: %s [-h|--help] [-v|--verbose] [--list] [--device <device name or id>] [--precalib <minx> <maxx> <miny> <maxy>] [--misclick <nr of pixels>] [--fake]\n", cmd);
+    fprintf(stderr, "Usage: %s [-h|--help] [-v|--verbose] [--list] [--device <device name or id>] [--precalib <minx> <maxx> <miny> <maxy>] [--misclick <nr of pixels>] [--output-type <auto|xorg.conf.d|hal|xinput>] [--fake]\n", 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--list: list calibratable input devices and quit\n");
@@ -230,6 +238,7 @@ static void usage(char* cmd, unsigned thr_misclick)
     fprintf(stderr, "\t--precalib: manually provide the current calibration setting (eg. the values in xorg.conf)\n");
     fprintf(stderr, "\t--misclick: set the misclick threshold (0=off, default: %i pixels)\n",
         thr_misclick);
+    fprintf(stderr, "\t--output-type <auto|xorg.conf.d|hal|xinput>: type of config to ouput (auto=automatically detect, default: auto)\n");
     fprintf(stderr, "\t--fake: emulate a fake device (for testing purposes)\n");
 }
 
@@ -244,6 +253,7 @@ Calibrator* main_common(int argc, char** argv)
     const char* pre_device = NULL;
     unsigned thr_misclick = 15;
     unsigned thr_doubleclick = 7;
+    OutputType output_type = OUTYPE_AUTO;
 
     // parse input
     if (argc > 1) {
@@ -302,6 +312,30 @@ Calibrator* main_common(int argc, char** argv)
                 }
             } else
 
+            // Get output type ?
+            if (strcmp("--output-type", argv[i]) == 0) {
+                if (argc > i+1) {
+                    i++; // eat it or exit
+                    if (strcmp("auto", argv[i]) == 0)
+                        output_type = OUTYPE_AUTO;
+                    else if (strcmp("xorg.conf.d", argv[i]) == 0)
+                        output_type = OUTYPE_XORGCONFD;
+                    else if (strcmp("hal", argv[i]) == 0)
+                        output_type = OUTYPE_HAL;
+                    else if (strcmp("xinput", argv[i]) == 0)
+                        output_type = OUTYPE_XINPUT;
+                    else {
+                        fprintf(stderr, "Error: --output-type needs one of auto|xorg.conf.d|hal|xinput.\n\n");
+                        usage(argv[0], thr_misclick);
+                        exit(1);
+                    }
+                } else {
+                    fprintf(stderr, "Error: --output-type needs one argument.\n\n");
+                    usage(argv[0], thr_misclick);
+                    exit(1);
+                }
+            } else
+
             // Fake calibratable device ?
             if (strcmp("--fake", argv[i]) == 0) {
                 fake = true;
@@ -379,7 +413,7 @@ Calibrator* main_common(int argc, char** argv)
     try {
         // try Usbtouchscreen driver
         return new CalibratorUsbtouchscreen(device_name, device_axys,
-            verbose, thr_misclick, thr_doubleclick);
+            verbose, thr_misclick, thr_doubleclick, output_type);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -389,7 +423,7 @@ Calibrator* main_common(int argc, char** argv)
     try {
         // next, try Evdev driver (with XID)
         return new CalibratorEvdev(device_name, device_axys, verbose, device_id,
-            thr_misclick, thr_doubleclick);
+            thr_misclick, thr_doubleclick, output_type);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -398,5 +432,5 @@ Calibrator* main_common(int argc, char** argv)
 
     // lastly, presume a standard Xorg driver (evtouch, mutouch, ...)
     return new CalibratorXorgPrint(device_name, device_axys,
-            verbose, thr_misclick, thr_doubleclick);
+            verbose, thr_misclick, thr_doubleclick, output_type);
 }