提交: 898c61f1aee6aac352d49fdb25342a7bc61deb04 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: 898c61f1aee6aac352d49fdb25342a7bc61deb04 (tree)
• 时间: 2010-07-07 05:16:18
• 作者: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

support common setting of thresholds for doubleclick and misclick detection

更改概述

• 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

差异

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -23,8 +23,9 @@
 #include <algorithm>
 #include "calibrator.hh"
 
-Calibrator::Calibrator(const char* const device_name0, const XYinfo& axys0, const bool verbose0)
-  : device_name(device_name0), old_axys(axys0), verbose(verbose0), num_clicks(0), threshold_doubleclick(7), threshold_misclick(15)
+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)
 {
 }
 
@@ -66,7 +67,7 @@ bool Calibrator::add_click(int x, int y)
         bool misclick = true;
 
         if (num_clicks == 1) {
-            // check that along one axis of first pointV
+            // check that along one axis of first point
             if (along_axis(x,clicked_x[0],clicked_y[0]) ||
                 along_axis(y,clicked_x[0],clicked_y[0]))
                 misclick = false;
@@ -88,7 +89,12 @@ bool Calibrator::add_click(int x, int y)
 
         if (misclick) {
             if (verbose) {
-                printf("DEBUG: Mis-click detected, click %i (X=%i, Y=%i) not aligned with click 0 (X=%i, Y=%i) (threshold=%i)\n", num_clicks, x, y, clicked_x[0], clicked_y[0], threshold_misclick);
+                if (num_clicks == 1)
+                    printf("DEBUG: Mis-click detected, click %i (X=%i, Y=%i) not aligned with click 0 (X=%i, Y=%i) (threshold=%i)\n", num_clicks, x, y, clicked_x[0], clicked_y[0], threshold_misclick);
+                else if (num_clicks == 2)
+                    printf("DEBUG: Mis-click detected, click %i (X=%i, Y=%i) not aligned with click 0 (X=%i, Y=%i) or click 1 (X=%i, Y=%i) (threshold=%i)\n", num_clicks, x, y, clicked_x[0], clicked_y[0], clicked_x[1], clicked_y[1], threshold_misclick);
+                else if (num_clicks == 3)
+                    printf("DEBUG: Mis-click detected, click %i (X=%i, Y=%i) not aligned with click 1 (X=%i, Y=%i) or click 2 (X=%i, Y=%i) (threshold=%i)\n", num_clicks, x, y, clicked_x[1], clicked_y[1], clicked_x[2], clicked_y[2], threshold_misclick);
             }
 
             num_clicks = 0;

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -33,7 +33,8 @@ public:
      * The constructor will throw an exception,
      * if the touchscreen is not of the type it supports
      */
-    Calibrator(const char* const device_name, const XYinfo& axys, const bool verbose);
+    Calibrator(const char* const device_name, const XYinfo& axys,
+        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0);
     ~Calibrator() {}
 
     // set the doubleclick treshold
@@ -70,7 +71,8 @@ protected:
     int threshold_doubleclick;
 
     // Threshold to detect mis-clicks (clicks not along axes)
-    // Set to zero to ignore, lower is more precise calibration
+    // A lower value forces more precise calibration
+    // Set to zero if you don't want this check
     int threshold_misclick;
 };
 

--- a/src/calibrator/calibratorEvdev.cpp
+++ b/src/calibrator/calibratorEvdev.cpp
@@ -47,7 +47,8 @@ private:
 
     int old_swap_xy;
 public:
-    CalibratorEvdev(const char* const device_name, const XYinfo& axys, const bool verbose, XID device_id=(XID)-1);
+    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);
     ~CalibratorEvdev();
 
     virtual bool finish_data(const XYinfo new_axys, int swap_xy);
@@ -61,8 +62,8 @@ public:
     int xinput_do_set_prop(Display *display, Atom type, int format, int argc, char* argv[]);
 };
 
-CalibratorEvdev::CalibratorEvdev(const char* const device_name0, const XYinfo& axys0, const bool verbose0, XID device_id)
-  : Calibrator(device_name0, axys0, verbose0), 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)
+  : Calibrator(device_name0, axys0, verbose0, thr_misclick, thr_doubleclick), old_swap_xy(0)
 {
     // init
     display = XOpenDisplay(NULL);

--- a/src/calibrator/calibratorUsbtouchscreen.cpp
+++ b/src/calibrator/calibratorUsbtouchscreen.cpp
@@ -51,7 +51,8 @@ const char *p_swap_xy = "swap_xy";
 class CalibratorUsbtouchscreen: public Calibrator
 {
 public:
-    CalibratorUsbtouchscreen(const char* const device_name, const XYinfo& axys, const bool verbose);
+    CalibratorUsbtouchscreen(const char* const device_name, const XYinfo& axys,
+        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0);
     ~CalibratorUsbtouchscreen();
 
     virtual bool finish_data(const XYinfo new_axys, int swap_xy);
@@ -132,8 +133,8 @@ protected:
     }
 };
 
-CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const bool verbose0)
-  : Calibrator(device_name0, axys0, verbose0)
+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)
 {
     if (strcmp(device_name, "Usbtouchscreen") != 0)
         throw WrongCalibratorException("Not a usbtouchscreen device");

--- a/src/calibrator/calibratorXorgPrint.cpp
+++ b/src/calibrator/calibratorXorgPrint.cpp
@@ -27,13 +27,14 @@
 class CalibratorXorgPrint: public Calibrator
 {
 public:
-    CalibratorXorgPrint(const char* const device_name, const XYinfo& axys, const bool verbose);
+    CalibratorXorgPrint(const char* const device_name, const XYinfo& axys,
+        const bool verbose, const int thr_misclick=0, const int thr_doubleclick=0);
 
     virtual bool finish_data(const XYinfo new_axys, int swap_xy);
 };
 
-CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const bool verbose0)
-  : Calibrator(device_name0, axys0, verbose0)
+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)
 {
     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",

--- a/src/main_common.hpp
+++ b/src/main_common.hpp
@@ -240,6 +240,8 @@ Calibrator* main_common(int argc, char** argv)
     bool precalib = false;
     XYinfo pre_axys;
     const char* pre_device = NULL;
+    unsigned thr_misclick = 15;
+    unsigned thr_doubleclick = 7;
 
     // parse input
     if (argc > 1) {
@@ -363,7 +365,8 @@ Calibrator* main_common(int argc, char** argv)
     // Different device/driver, different ways to apply the calibration values
     try {
         // try Usbtouchscreen driver
-        return new CalibratorUsbtouchscreen(device_name, device_axys, verbose);
+        return new CalibratorUsbtouchscreen(device_name, device_axys,
+            verbose, thr_misclick, thr_doubleclick);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -372,7 +375,8 @@ Calibrator* main_common(int argc, char** argv)
 
     try {
         // next, try Evdev driver (with XID)
-        return new CalibratorEvdev(device_name, device_axys, verbose, device_id);
+        return new CalibratorEvdev(device_name, device_axys, verbose, device_id,
+            thr_misclick, thr_doubleclick);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -380,5 +384,6 @@ Calibrator* main_common(int argc, char** argv)
     }
 
     // lastly, presume a standard Xorg driver (evtouch, mutouch, ...)
-    return new CalibratorXorgPrint(device_name, device_axys, verbose);
+    return new CalibratorXorgPrint(device_name, device_axys,
+            verbose, thr_misclick, thr_doubleclick);
 }