提交: bb9537380e4000f8b371a9d23051d1682a31cc44 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: bb9537380e4000f8b371a9d23051d1682a31cc44 (tree)
• 时间: 2013-01-04 06:32:01
• 作者: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

Merge pull request #44 from felipelerena/master

no-timeout parameter

更改概述

• modified: src/calibrator.cpp
• modified: src/calibrator.hh
• modified: src/calibrator/Evdev.cpp
• modified: src/calibrator/Evdev.hpp
• modified: src/calibrator/Usbtouchscreen.cpp
• modified: src/calibrator/Usbtouchscreen.hpp
• modified: src/calibrator/XorgPrint.cpp
• modified: src/calibrator/XorgPrint.hpp
• modified: src/gui/gtkmm.cpp
• modified: src/main_common.cpp

差异

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -35,10 +35,12 @@
 bool Calibrator::verbose = false;
 
 Calibrator::Calibrator(const char* const device_name0, const XYinfo& axys0,
-    const int thr_misclick, const int thr_doubleclick, const OutputType output_type0, const char* geometry0)
+    const int thr_misclick, const int thr_doubleclick,
+    const OutputType output_type0, const char* geometry0,
+    const bool use_timeout0)
 : device_name(device_name0),
     threshold_doubleclick(thr_doubleclick), threshold_misclick(thr_misclick),
-    output_type(output_type0), geometry(geometry0)
+    output_type(output_type0), geometry(geometry0), use_timeout(use_timeout0)
 {
     old_axys = axys0;
 

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -144,7 +144,8 @@ public:
                const int thr_misclick=0,
                const int thr_doubleclick=0,
                const OutputType output_type=OUTYPE_AUTO,
-               const char* geometry=0);
+               const char* geometry=0,
+               const bool use_timeout=1);
 
     ~Calibrator() {}
 
@@ -176,6 +177,9 @@ public:
     /// returns NULL if it can not be found
     const char* get_sysfs_name();
 
+    const bool get_use_timeout() const
+    { return use_timeout; }
+
 protected:
     /// check whether the coordinates are along the respective axis
     bool along_axis(int xy, int x0, int y0);
@@ -224,6 +228,8 @@ protected:
 
     // manually specified geometry string
     const char* geometry;
+
+    const bool use_timeout;
 };
 
 // Interfance for a CalibratorTester

--- a/src/calibrator/Evdev.cpp
+++ b/src/calibrator/Evdev.cpp
@@ -46,8 +46,9 @@ CalibratorEvdev::CalibratorEvdev(const char* const device_name0,
                                  const int thr_misclick,
                                  const int thr_doubleclick,
                                  const OutputType output_type,
-                                 const char* geometry)
-  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry)
+                                 const char* geometry,
+                                 const bool use_timeout)
+  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout)
 {
     // init
     display = XOpenDisplay(NULL);
@@ -164,7 +165,8 @@ CalibratorEvdev::CalibratorEvdev(const char* const device_name0,
                                  const int thr_misclick,
                                  const int thr_doubleclick,
                                  const OutputType output_type,
-                                 const char* geometry)
+                                 const char* geometry,
+                                 const bool use_timeout)
   : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry) { }
 
 // Destructor

--- a/src/calibrator/Evdev.hpp
+++ b/src/calibrator/Evdev.hpp
@@ -46,7 +46,8 @@ protected:
                     const int thr_misclick=0,
                     const int thr_doubleclick=0,
                     const OutputType output_type=OUTYPE_AUTO,
-                    const char* geometry=0);
+                    const char* geometry=0,
+                    const bool use_timeout=false);
 
 public:
     CalibratorEvdev(const char* const device_name,
@@ -55,7 +56,8 @@ public:
                     const int thr_misclick=0,
                     const int thr_doubleclick=0,
                     const OutputType output_type=OUTYPE_AUTO,
-                    const char* geometry=0);
+                    const char* geometry=0,
+                    const bool use_timeout=false);
     ~CalibratorEvdev();
 
     /// calculate and apply the calibration

--- a/src/calibrator/Usbtouchscreen.cpp
+++ b/src/calibrator/Usbtouchscreen.cpp
@@ -48,8 +48,8 @@ static const char *p_flip_x = "flip_x";
 static const char *p_flip_y = "flip_y";
 static const char *p_swap_xy = "swap_xy";
 
-CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry)
-  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry)
+CalibratorUsbtouchscreen::CalibratorUsbtouchscreen(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry, const bool use_timeout)
+  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout)
 {
     if (strcmp(device_name, "Usbtouchscreen") != 0)
         throw WrongCalibratorException("Not a usbtouchscreen device");

--- a/src/calibrator/Usbtouchscreen.hpp
+++ b/src/calibrator/Usbtouchscreen.hpp
@@ -34,7 +34,8 @@ class CalibratorUsbtouchscreen: public Calibrator
 public:
     CalibratorUsbtouchscreen(const char* const device_name, const XYinfo& axys,
          const int thr_misclick=0, const int thr_doubleclick=0,
-        const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
+        const OutputType output_type=OUTYPE_AUTO, const char* geometry=0,
+        const bool use_timeout=false);
     ~CalibratorUsbtouchscreen();
 
     virtual bool finish_data(const XYinfo new_axys);

--- a/src/calibrator/XorgPrint.cpp
+++ b/src/calibrator/XorgPrint.cpp
@@ -24,8 +24,8 @@
 
 #include <cstdio>
 
-CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry)
-  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry)
+CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const XYinfo& axys0, const int thr_misclick, const int thr_doubleclick, const OutputType output_type, const char* geometry, const bool use_timeout)
+  : Calibrator(device_name0, axys0, thr_misclick, thr_doubleclick, output_type, geometry, use_timeout)
 {
     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/calibrator/XorgPrint.hpp
+++ b/src/calibrator/XorgPrint.hpp
@@ -34,7 +34,8 @@ class CalibratorXorgPrint: public Calibrator
 public:
     CalibratorXorgPrint(const char* const device_name, const XYinfo& axys,
         const int thr_misclick=0, const int thr_doubleclick=0,
-        const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
+        const OutputType output_type=OUTYPE_AUTO, const char* geometry=0,
+        const bool use_timeout=false);
 
     virtual bool finish_data(const XYinfo new_axys);
 

--- a/src/gui/gtkmm.cpp
+++ b/src/gui/gtkmm.cpp
@@ -66,8 +66,10 @@ CalibrationArea::CalibrationArea(Calibrator* calibrator0)
         set_display_size(get_width(), get_height());
 
     // Setup timer for animation
-    sigc::slot<bool> slot = sigc::mem_fun(*this, &CalibrationArea::on_timer_signal);
-    Glib::signal_timeout().connect(slot, time_step);
+    if(calibrator->get_use_timeout()){
+        sigc::slot<bool> slot = sigc::mem_fun(*this, &CalibrationArea::on_timer_signal);
+        Glib::signal_timeout().connect(slot, time_step);
+    }
 }
 
 void CalibrationArea::set_display_size(int width, int height) {
@@ -149,12 +151,13 @@ bool CalibrationArea::on_expose_event(GdkEventExpose *event)
             cr->arc(X[i], Y[i], cross_circle, 0.0, 2.0 * M_PI);
             cr->stroke();
         }
-
-        // Draw the clock background
-        cr->arc(display_width/2, display_height/2, clock_radius/2, 0.0, 2.0 * M_PI);
-        cr->set_source_rgb(0.5, 0.5, 0.5);
-        cr->fill_preserve();
-        cr->stroke();
+        if(calibrator->get_use_timeout()){
+            // Draw the clock background
+            cr->arc(display_width/2, display_height/2, clock_radius/2, 0.0, 2.0 * M_PI);
+            cr->set_source_rgb(0.5, 0.5, 0.5);
+            cr->fill_preserve();
+            cr->stroke();
+        }
 
         cr->set_line_width(clock_line_width);
         cr->arc(display_width/2, display_height/2, (clock_radius - clock_line_width)/2,

--- a/src/main_common.cpp
+++ b/src/main_common.cpp
@@ -168,7 +168,7 @@ int Calibrator::find_device(const char* pre_device, 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>] [--output-type <auto|xorg.conf.d|hal|xinput>] [--fake] [--geometry <w>x<h>]\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] [--geometry <w>x<h>] [--no-timeout]\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");
@@ -179,6 +179,7 @@ static void usage(char* cmd, unsigned 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");
     fprintf(stderr, "\t--geometry: manually provide the geometry (width and height) for the calibration window\n");
+    fprintf(stderr, "\t--no-timeout: turns off the timeout if parameter pressent\n");
 }
 
 Calibrator* Calibrator::make_calibrator(int argc, char** argv)
@@ -186,6 +187,7 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
     bool list_devices = false;
     bool fake = false;
     bool precalib = false;
+    bool use_timeout = true;
     XYinfo pre_axys;
     const char* pre_device = NULL;
     const char* geometry = NULL;
@@ -282,7 +284,12 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
             // Fake calibratable device ?
             if (strcmp("--fake", argv[i]) == 0) {
                 fake = true;
-            }
+            } else
+
+            // Disable timeout
+			if (strcmp("--no-timeout", argv[i]) == 0) {
+				use_timeout = false;
+			}
 
             // unknown option
             else {
@@ -356,7 +363,7 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
     try {
         // try Usbtouchscreen driver
         return new CalibratorUsbtouchscreen(device_name, device_axys,
-            thr_misclick, thr_doubleclick, output_type, geometry);
+            thr_misclick, thr_doubleclick, output_type, geometry, use_timeout);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -366,7 +373,7 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
     try {
         // next, try Evdev driver (with XID)
         return new CalibratorEvdev(device_name, device_axys, device_id,
-            thr_misclick, thr_doubleclick, output_type, geometry);
+            thr_misclick, thr_doubleclick, output_type, geometry, use_timeout);
 
     } catch(WrongCalibratorException& x) {
         if (verbose)
@@ -375,5 +382,5 @@ Calibrator* Calibrator::make_calibrator(int argc, char** argv)
 
     // lastly, presume a standard Xorg driver (evtouch, mutouch, ...)
     return new CalibratorXorgPrint(device_name, device_axys,
-            thr_misclick, thr_doubleclick, output_type, geometry);
+            thr_misclick, thr_doubleclick, output_type, geometry, use_timeout);
 }